SHA256
1
0
forked from pool/Mesa

Accepting request 394650 from X11:XOrg

1

OBS-URL: https://build.opensuse.org/request/show/394650
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/Mesa?expand=0&rev=265
This commit is contained in:
Dominique Leuenberger 2016-05-17 15:07:06 +00:00 committed by Git OBS Bridge
commit e80ec49f14
8 changed files with 70 additions and 79 deletions

View File

@ -1,3 +1,68 @@
-------------------------------------------------------------------
Mon May 9 15:24:00 UTC 2016 - mimi.vx@gmail.com
- update to 11.2.2
- removed upstreamed patches:
+ u_dri2-Check-for-dummyContext-to-see-if-the-glx_context-is-valid.patch
+ u_dri3-Check-for-dummyContext-to-see-if-the-glx_contex.patch
* fdo#92850 - Segfault loading War Thunder
* fdo#93767 - Glitches with soft shadows and MSAA in Knights of the Old Republic 2
* fdo#94955 - Uninitialized variables leads to random segfaults (valgrind log,
apitrace attached)
* fdo#94994 - OSMesaGetProcAdress always fails on mangled OSMesa
* fdo#95026 - Alien Isolation segfault after initial loading screen/video
* fdo#95133 - X-COM Enemy Within crashes when entering tactical mission with Bonaire
* fdo#95164 - GLSL compiler (linker I think) emits assertion upon call to
glAttachShader
* fdo#95251 - vdpau decoder capabilities: not supported
* radeon/uvd: alignment fix for decode message buffer
* st/mesa: fix sampler view leak in st_DrawAtlasBitmaps()
* gallium/util: initialize pipe_framebuffer_state to zeros
* dri: Fix robust context creation via EGL attribute
* dri2: Check for dummyContext to see if the glx_context is valid
* cherry-ignore: remove duplicate commit
* cherry-ignore: ignore the GetSamplerParameterIuiv{EXT,OES} fixups
* vc4: Fix subimage accesses to LT textures.
* vc4: Add support for rendering to cube map surfaces.
* vc4: Fix tests for format supported with nr_samples == 1.
* vc4: Make sure we recompile when sample_mask changes.
* glapi: fix _glapi_get_proc_address() for mangled function names
* nvc0: fix retrieving query results into buffer for timestamps
* nouveau/video: properly detect the decoder class for availability checks
* i965/fs: Properly report regs_written from SAMPLEINFO
* egl/x11: authenticate before doing chipset id ioctls
* winsys/sw/xlib: use correct free function for xlib_dt->data
* i965: Fix clear code for ignoring colormask for XRGB formats on Gen9+.
* glsl: Convert lower_vec_index_to_swizzle to a rvalue visitor.
* glsl: Lower vector_extracts to swizzles after lower_vector_derefs.
* radeon/uvd: fix tonga feedback buffer size
* st/mesa: fix blit-based GetTexImage for non-finalized textures
* gallium/radeon: handle failure when mapping staging buffer
* st/glsl_to_tgsi: reduce stack explosion in recursive expression visitor
* gallium/radeon: fix crash in r600_set_streamout_targets
* radeonsi: correct NULL-pointer check in si_upload_const_buffer
* radeonsi: work around an MSAA fast stencil clear problem
* r600g/radeonsi: send endian info to format translation functions
* r600g: set endianess of 16/32-bit buffers according to do_endian_swap
* r600g: use do_endian_swap in color swapping functions
* r600g: use do_endian_swap in texture swapping function
* r600g: fix and optimize tgsi_cmp when using ABS and NEG modifier
* llvmpipe: (trivial) initialize src1_alpha var to NULL
* gallivm: fix bogus argument order to lp_build_sample_mipmap function
* gallivm: make sampling more robust against bogus coordinates
* gk110/ir: do not overwrite def value with zero for EXCH ops
* gk110/ir: make use of IMUL32I for all immediates
* nvc0/ir: fix wrong emission of (a OP b) OP c
* gk110/ir: add emission for (a OP b) OP c
* nvc0: reduce GL_MAX_3D_TEXTURE_SIZE to 2048 on Kepler+
* st/glsl_to_tgsi: fix potential crash when allocating temporaries
* dri3: Check for dummyContext to see if the glx_context is valid
* i965/blorp/gen7: Prepare re-using for gen8
* i965/blorp: Use 8k chunk size for urb allocation
* tgsi: initialize stack allocated struct
* winsys/sw/dri: use correct free function for dri_sw_dt->data
* android: enable dlopen() on all architectures
------------------------------------------------------------------- -------------------------------------------------------------------
Thu Apr 21 09:36:08 UTC 2016 - sndirsch@suse.com Thu Apr 21 09:36:08 UTC 2016 - sndirsch@suse.com

View File

@ -18,7 +18,7 @@
%define glamor 1 %define glamor 1
%define _name_archive mesa %define _name_archive mesa
%define _version 11.2.1 %define _version 11.2.2
%define with_opencl 0 %define with_opencl 0
%ifarch %ix86 x86_64 %arm ppc ppc64 ppc64le s390x %ifarch %ix86 x86_64 %arm ppc ppc64 ppc64le s390x
%define gallium_loader 1 %define gallium_loader 1
@ -42,7 +42,7 @@
%endif %endif
%endif %endif
Name: Mesa Name: Mesa
Version: 11.2.1 Version: 11.2.2
Release: 0 Release: 0
Summary: System for rendering interactive 3-D graphics Summary: System for rendering interactive 3-D graphics
License: MIT License: MIT
@ -57,8 +57,6 @@ Source6: %{name}-rpmlintrc
Source7: Mesa.keyring Source7: Mesa.keyring
# required for building against wayland of openSUSE 13.1 # required for building against wayland of openSUSE 13.1
Patch0: n_Fixed-build-against-wayland-1.2.1.patch Patch0: n_Fixed-build-against-wayland-1.2.1.patch
Patch1: u_dri2-Check-for-dummyContext-to-see-if-the-glx_context-is-valid.patch
Patch2: u_dri3-Check-for-dummyContext-to-see-if-the-glx_contex.patch
# to be upstreamed # to be upstreamed
Patch11: u_Fix-crash-in-swrast-when-setting-a-texture-for-a-pix.patch Patch11: u_Fix-crash-in-swrast-when-setting-a-texture-for-a-pix.patch
# Patch from Fedora, fix 16bpp in llvmpipe # Patch from Fedora, fix 16bpp in llvmpipe
@ -555,8 +553,6 @@ rm -rf docs/README.{VMS,WIN32,OS2}
# required for building against wayland of openSUSE 13.1 # required for building against wayland of openSUSE 13.1
%patch0 -p1 %patch0 -p1
%endif %endif
%patch1 -p1
%patch2 -p1
### disabled, but not dropped yet; these still need investigation in ### disabled, but not dropped yet; these still need investigation in
### order to figure out whether the issue is still reproducable and ### order to figure out whether the issue is still reproducable and
### hence a fix is required ### hence a fix is required

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:a65207e9ae5c5f1c29f863c6a2cc98a7ab99762a24b82a248337f0ea9cfce01b
size 7857308

Binary file not shown.

3
mesa-11.2.2.tar.xz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:40e148812388ec7c6d7b6657d5a16e2e8dabba8b97ddfceea5197947647bdfb4
size 7860932

BIN
mesa-11.2.2.tar.xz.sig Normal file

Binary file not shown.

View File

@ -1,30 +0,0 @@
From: Egbert Eich <eich@suse.de>
Date: Wed Jan 20 13:51:11 2016 +0100
Subject: [PATCH]dri2: Check for dummyContext to see if the glx_context is valid
Patch-mainline: to be upstreamed
References: boo#962609
Signed-off-by: Egbert Eich <eich@suse.com>
According to the comments in src/glx/glxcurrent.c __glXGetCurrentContext()
always returns a valid pointer. If no context is made current, it will
contain dummyContext. Thus a test for NULL will always fail.
Signed-off-by: Egbert Eich <eich@suse.de>
---
src/glx/dri2_glx.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/glx/dri2_glx.c b/src/glx/dri2_glx.c
index 27ea952..6a5f964 100644
--- a/src/glx/dri2_glx.c
+++ b/src/glx/dri2_glx.c
@@ -520,7 +520,7 @@ dri2GetCurrentContext()
struct glx_context *gc = __glXGetCurrentContext();
struct dri2_context *dri2Ctx = (struct dri2_context *)gc;
- return dri2Ctx ? dri2Ctx->driContext : NULL;
+ return (gc != &dummyContext) ? dri2Ctx->driContext : NULL;
}
/**

View File

@ -1,40 +0,0 @@
From 2be941ebf55e9533652634b180fdbdd0c24075ea Mon Sep 17 00:00:00 2001
From: Stefan Dirsch <sndirsch@suse.de>
Date: Thu, 21 Apr 2016 11:26:07 +0200
Subject: [PATCH] dri3: Check for dummyContext to see if the glx_context is
valid
According to the comments in src/glx/glxcurrent.c __glXGetCurrentContext()
always returns a valid pointer. If no context is made current, it will
contain dummyContext. Thus a test for NULL will always fail.
https://lists.freedesktop.org/archives/mesa-dev/2016-April/113962.html
Signed-off-by: Stefan Dirsch <sndirsch@suse.de>
---
src/glx/dri3_glx.c | 8 ++------
1 file changed, 2 insertions(+), 6 deletions(-)
diff --git a/src/glx/dri3_glx.c b/src/glx/dri3_glx.c
index 6054ffc..e7c2ec1 100644
--- a/src/glx/dri3_glx.c
+++ b/src/glx/dri3_glx.c
@@ -127,13 +127,9 @@ static __DRIcontext *
glx_dri3_get_dri_context(struct loader_dri3_drawable *draw)
{
struct glx_context *gc = __glXGetCurrentContext();
+ struct dri3_context *dri3Ctx = (struct dri3_context *) gc;
- if (gc) {
- struct dri3_context *dri3Ctx = (struct dri3_context *) gc;
- return dri3Ctx->driContext;
- }
-
- return NULL;
+ return (gc != &dummyContext) ? dri3Ctx->driContext : NULL;
}
static void
--
2.6.2