Android.common.mk | 3
VERSION | 2
debian/changelog | 31 +
debian/control | 3
debian/patches/i965-remove-early-release-of-dri2-miptree.patch | 25 +
debian/patches/series | 1
debian/rules | 2
docs/relnotes/11.0.0.html | 168
+++++++++-
src/gallium/auxiliary/Makefile.am | 29 +
src/gallium/drivers/nouveau/codegen/nv50_ir_emit_nv50.cpp | 11
src/gallium/drivers/nouveau/codegen/nv50_ir_lowering_nv50.cpp | 5
src/gallium/drivers/nouveau/codegen/nv50_ir_peephole.cpp | 4
src/gallium/drivers/nouveau/codegen/nv50_ir_print.cpp | 2
src/gallium/drivers/nouveau/codegen/nv50_ir_ra.cpp | 90 ++++-
src/gallium/drivers/nouveau/nouveau_buffer.c | 4
src/gallium/drivers/nouveau/nouveau_buffer.h | 2
src/gallium/drivers/nouveau/nouveau_context.h | 5
src/gallium/drivers/nouveau/nv30/nv30_miptree.c | 38 ++
src/gallium/drivers/nouveau/nv30/nv30_screen.c | 20 +
src/gallium/drivers/nouveau/nv30/nv30_screen.h | 2
src/gallium/drivers/nouveau/nv30/nv30_transfer.c | 4
src/gallium/drivers/nouveau/nv50/nv50_formats.c | 2
src/gallium/drivers/nouveau/nvc0/nvc0_context.h | 8
src/gallium/drivers/nouveau/nvc0/nvc0_program.c | 2
src/gallium/drivers/nouveau/nvc0/nvc0_state.c | 2
src/gallium/drivers/nouveau/nvc0/nvc0_state_validate.c | 3
src/gallium/drivers/nouveau/nvc0/nvc0_transfer.c | 46 ++
src/gallium/drivers/r600/evergreen_state.c | 4
src/gallium/drivers/r600/r600_shader.c | 19 -
src/gallium/drivers/r600/r600_state.c | 8
src/gallium/drivers/radeonsi/si_pipe.c | 4
src/gallium/state_trackers/clover/llvm/invocation.cpp | 2
src/gallium/winsys/amdgpu/drm/amdgpu_winsys.c | 15
src/glsl/Android.gen.mk | 22 -
src/glsl/Makefile.am | 53 +--
src/glsl/Makefile.sources | 3
src/glsl/opt_constant_propagation.cpp | 46 +-
src/glsl/opt_constant_variable.cpp | 39 +-
src/mapi/Makefile.am | 23 -
src/mapi/glapi/gen/Makefile.am | 38 +-
src/mesa/Makefile.am | 45 +-
src/mesa/drivers/common/meta_generate_mipmap.c | 9
src/mesa/drivers/dri/common/xmlpool/Makefile.am | 2
src/mesa/drivers/dri/i965/brw_blorp_blit.cpp | 4
src/mesa/drivers/dri/i965/brw_context.c | 9
src/mesa/drivers/dri/i965/brw_fs_vector_splitting.cpp | 44 +-
src/mesa/drivers/dri/i965/intel_tex_copy.c | 4
src/mesa/state_tracker/st_extensions.c | 9
src/mesa/state_tracker/st_format.c | 22 -
src/util/Makefile.am | 6
50 files changed, 688 insertions(+), 256 deletions(-)
New commits:
commit 3cb229c0d3473caaacdcc6fd01b737e6b60eafb1
Author: Timo Aaltonen <tjaal...@debian.org>
Date: Tue Sep 15 07:50:25 2015 +0300
close FFE bug
diff --git a/debian/changelog b/debian/changelog
index 7b8188d..8213e94 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,6 @@
mesa (11.0.0-1ubuntu1) UNRELEASED; urgency=medium
- * Merge from Debian.
+ * Merge from Debian. (LP: #1484279)
* egl-platform-mir.patch: Updated.
* i965-remove-early-release-of-dri2-miptree.patch: Add a workaround to
fix crashes in brw_meta_fast_clear. (LP: #1492037)
commit 6a5f73181528b78b9a86e98b9d562fa358eca996
Author: Timo Aaltonen <tjaal...@debian.org>
Date: Tue Sep 15 07:28:20 2015 +0300
control, rules: Default to llvm-3.6 again, because 3.7 won't be in main for
wily.
diff --git a/debian/changelog b/debian/changelog
index 66b0f53..7b8188d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,8 @@ mesa (11.0.0-1ubuntu1) UNRELEASED; urgency=medium
* egl-platform-mir.patch: Updated.
* i965-remove-early-release-of-dri2-miptree.patch: Add a workaround to
fix crashes in brw_meta_fast_clear. (LP: #1492037)
+ * control, rules: Default to llvm-3.6 again, because 3.7 won't be in
+ main for wily.
-- Timo Aaltonen <tjaal...@debian.org> Mon, 07 Sep 2015 16:27:37 +0300
diff --git a/debian/control b/debian/control
index 6400087..7a7f84d 100644
--- a/debian/control
+++ b/debian/control
@@ -39,7 +39,7 @@ Build-Depends:
libudev-dev [linux-any],
flex,
bison,
- llvm-3.7-dev (>= 1:3.7~+rc2) [amd64 i386 kfreebsd-amd64 kfreebsd-i386 armhf],
+ llvm-3.6-dev (>= 1:3.6) [amd64 i386 kfreebsd-amd64 kfreebsd-i386 armhf],
libelf-dev [amd64 i386 kfreebsd-amd64 kfreebsd-i386 armhf],
libwayland-dev (>= 1.2.0) [linux-any],
# libclang-3.7-dev (>= 1:3.7~+rc2) [amd64 i386 armhf],
diff --git a/debian/rules b/debian/rules
index 38f8432..1d3ac0e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -99,7 +99,7 @@ else
ifneq (,$(filter $(DEB_HOST_ARCH),amd64 i386 kfreebsd-amd64 kfreebsd-i386
armhf))
GALLIUM_DRIVERS += radeonsi
confflags_GALLIUM += --enable-gallium-llvm
- confflags_GALLIUM += ac_cv_path_LLVM_CONFIG=llvm-config-3.7
+ confflags_GALLIUM += ac_cv_path_LLVM_CONFIG=llvm-config-3.6
GALLIUM_DRIVERS += swrast
else
DRI_DRIVERS += swrast
commit 44bc8cd8ddba9e34730eaf1a34e6e8298ca74c46
Author: Timo Aaltonen <tjaal...@debian.org>
Date: Tue Sep 15 07:23:32 2015 +0300
i965-remove-early-release-of-dri2-miptree.patch: Add a workaround to fix
crashes in brw_meta_fast_clear. (LP: #1492037)
diff --git a/debian/changelog b/debian/changelog
index 3cf92a1..66b0f53 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,8 @@ mesa (11.0.0-1ubuntu1) UNRELEASED; urgency=medium
* Merge from Debian.
* egl-platform-mir.patch: Updated.
+ * i965-remove-early-release-of-dri2-miptree.patch: Add a workaround to
+ fix crashes in brw_meta_fast_clear. (LP: #1492037)
-- Timo Aaltonen <tjaal...@debian.org> Mon, 07 Sep 2015 16:27:37 +0300
diff --git a/debian/patches/i965-remove-early-release-of-dri2-miptree.patch
b/debian/patches/i965-remove-early-release-of-dri2-miptree.patch
new file mode 100644
index 0000000..e4abd6f
--- /dev/null
+++ b/debian/patches/i965-remove-early-release-of-dri2-miptree.patch
@@ -0,0 +1,25 @@
+From e2a696a4cd93c2dbe445243de48ed478fbdb8009 Mon Sep 17 00:00:00 2001
+From: Chris Wilson <ch...@chris-wilson.co.uk>
+Date: Fri, 10 Jul 2015 10:41:35 +0100
+Subject: i965: Remove early release of DRI2 miptree
+
+intel_update_winsys_renderbuffer_miptree() will release the existing
+miptree when wrapping a new DRI2 buffer, so we can remove the early
+release and so prevent a NULL mt dereference should importing the new
+DRI2 name fail for any reason. (Reusing the old DRI2 name will result
+in the rendering going astray, to a stale buffer, and not shown on the
+screen, but it allows us to issue a warning and not crash much later in
+innocent code.)
+
+Signed-off-by: Chris Wilson <ch...@chris-wilson.co.uk>
+
+--- a/src/mesa/drivers/dri/i965/brw_context.c
++++ b/src/mesa/drivers/dri/i965/brw_context.c
+@@ -1412,7 +1412,6 @@ intel_process_dri2_buffer(struct brw_con
+ buffer->cpp, buffer->pitch);
+ }
+
+- intel_miptree_release(&rb->mt);
+ bo = drm_intel_bo_gem_create_from_name(brw->bufmgr, buffer_name,
+ buffer->name);
+ if (!bo) {
diff --git a/debian/patches/series b/debian/patches/series
index af4c631..f590a99 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,3 +3,4 @@
# Ubuntu patches.
egl-platform-mir.patch
i915-dont-default-to-2.1.patch
+i965-remove-early-release-of-dri2-miptree.patch
commit e3032a02055e59f81a3749d5f0574aa4baaea2bc
Author: Timo Aaltonen <tjaal...@debian.org>
Date: Tue Sep 15 07:18:32 2015 +0300
update the changelog
diff --git a/debian/changelog b/debian/changelog
index 516a4d4..3cf92a1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,16 +1,16 @@
-mesa (11.0.0-1) experimental; urgency=medium
-
- * New upstream release.
-
- -- Timo Aaltonen <tjaal...@debian.org> Mon, 14 Sep 2015 14:23:13 +0300
-
-mesa (11.0.0~rc3-1ubuntu1) UNRELEASED; urgency=medium
+mesa (11.0.0-1ubuntu1) UNRELEASED; urgency=medium
* Merge from Debian.
* egl-platform-mir.patch: Updated.
-- Timo Aaltonen <tjaal...@debian.org> Mon, 07 Sep 2015 16:27:37 +0300
+mesa (11.0.0-1) experimental; urgency=medium
+
+ * New upstream release.
+
+ -- Timo Aaltonen <tjaal...@debian.org> Mon, 14 Sep 2015 14:23:13 +0300
+
mesa (11.0.0~rc3-1) experimental; urgency=medium
[ Andreas Boll ]
commit 269b4496cedd4257f634039048749df2fdb946f1
Author: Timo Aaltonen <tjaal...@debian.org>
Date: Mon Sep 14 17:30:19 2015 +0300
release to experimental
diff --git a/debian/changelog b/debian/changelog
index 11e6e78..7ec3995 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,8 @@
-mesa (11.0.0-1) UNRELEASED; urgency=medium
+mesa (11.0.0-1) experimental; urgency=medium
* New upstream release.
- -- Timo Aaltonen <tjaal...@debian.org> Mon, 14 Sep 2015 14:14:24 +0300
+ -- Timo Aaltonen <tjaal...@debian.org> Mon, 14 Sep 2015 14:23:13 +0300
mesa (11.0.0~rc3-1) experimental; urgency=medium
commit 9b73fa0c5292dffe12e4096bdc9e9088c5de444d
Author: Timo Aaltonen <tjaal...@debian.org>
Date: Mon Sep 14 14:15:18 2015 +0300
update the changelog
diff --git a/debian/changelog b/debian/changelog
index 24d854a..11e6e78 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+mesa (11.0.0-1) UNRELEASED; urgency=medium
+
+ * New upstream release.
+
+ -- Timo Aaltonen <tjaal...@debian.org> Mon, 14 Sep 2015 14:14:24 +0300
+
mesa (11.0.0~rc3-1) experimental; urgency=medium
[ Andreas Boll ]
commit 53e852db5ffc94ba59f0c4884971b1d56545282a
Author: Timo Aaltonen <tjaal...@debian.org>
Date: Mon Sep 14 11:29:59 2015 +0300
release to unstable
diff --git a/debian/changelog b/debian/changelog
index 6f4980f..c2abbff 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,8 @@
-mesa (10.6.7-1) UNRELEASED; urgency=medium
+mesa (10.6.7-1) unstable; urgency=medium
* New upstream release.
- -- Timo Aaltonen <tjaal...@debian.org> Mon, 14 Sep 2015 11:13:39 +0300
+ -- Timo Aaltonen <tjaal...@debian.org> Mon, 14 Sep 2015 11:15:23 +0300
mesa (10.6.5-1) unstable; urgency=medium
commit 29e6fc603bb86947511fe9891da93efcb93021a7
Author: Timo Aaltonen <tjaal...@debian.org>
Date: Mon Sep 14 11:15:15 2015 +0300
update the changelog
diff --git a/debian/changelog b/debian/changelog
index bd2fde3..6f4980f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+mesa (10.6.7-1) UNRELEASED; urgency=medium
+
+ * New upstream release.
+
+ -- Timo Aaltonen <tjaal...@debian.org> Mon, 14 Sep 2015 11:13:39 +0300
+
mesa (10.6.5-1) unstable; urgency=medium
[ Andreas Boll ]
commit 4f1e500150be2e82a2d7eb954f7198cc0c5cbec1
Author: Emil Velikov <emil.l.veli...@gmail.com>
Date: Sat Sep 12 10:33:49 2015 +0100
docs: Update 11.0.0 release notes
Signed-off-by: Emil Velikov <emil.l.veli...@gmail.com>
diff --git a/docs/relnotes/11.0.0.html b/docs/relnotes/11.0.0.html
index 537b883..875ff6e 100644
--- a/docs/relnotes/11.0.0.html
+++ b/docs/relnotes/11.0.0.html
@@ -14,7 +14,7 @@
<iframe src="../contents.html"></iframe>
<div class="content">
-<h1>Mesa 11.0.0 Release Notes / TBD</h1>
+<h1>Mesa 11.0.0 Release Notes / September 12, 2015</h1>
<p>
Mesa 11.0.0 is a new development release.
@@ -83,13 +83,175 @@ Note: some of the new features are only available with
certain drivers.
<li>EGL 1.5 on r600, radeonsi, nv50, nvc0</li>
</ul>
+
<h2>Bug fixes</h2>
-TBD.
+<p>This list is likely incomplete.</p>
+
+<ul>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=51658";>Bug 51658</a>
- r200 (& possibly radeon) DRI fixes for gnome shell on Mesa 8.0.3</li>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=65525";>Bug 65525</a>
- [llvmpipe] lp_scene.h:210:lp_scene_alloc: Assertion `size <= (64 * 1024)'
failed.</li>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=66346";>Bug 66346</a>
- shader_query.cpp:49: error: invalid conversion from 'void*' to 'GLuint'</li>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=73512";>Bug 73512</a>
- [clover] mesa.icd. should contain full path</li>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=73528";>Bug 73528</a>
- Deferred lighting in Second Life causes system hiccups and screen
flickering</li>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=74329";>Bug 74329</a>
- Please expose OES_texture_float and OES_texture_half_float on the ES3
context</li>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=80500";>Bug 80500</a>
- Flickering shadows in unreleased title trace</li>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=82186";>Bug 82186</a>
- [r600g] BARTS GPU lockup with minecraft shaders</li>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=84225";>Bug 84225</a>
- Allow constant-index-expression sampler array indexing with GLSL-ES <
300</li>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=84677";>Bug 84677</a>
- Triangle disappears with glPolygonMode GL_LINE</li>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=85252";>Bug 85252</a>
- Segfault in compiler while processing ternary operator with void
arguments</li>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=89131";>Bug 89131</a>
- [Bisected] Graphical corruption in Weston, shows old framebuffer pieces</li>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=90000";>Bug 90000</a>
- [i965 Bisected NIR] Piglit/gglean_fragprog1-z-write_test fail</li>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=90073";>Bug 90073</a>
- Leaks in xcb_dri3_open_reply_fds() and get_render_node_from_id_path_tag</li>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=90249";>Bug 90249</a>
- Fails to build egl_dri2 on osx</li>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=90310";>Bug 90310</a>
- Fails to build gallium_dri.so at linking stage with clang because of multiple
redefinitions</li>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=90347";>Bug 90347</a>
- [NVE0+] Failure to insert texbar under some circumstances (causing bad colors
in Terasology)</li>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=90466";>Bug 90466</a>
- arm: linker error ndefined reference to `nir_metadata_preserve'</li>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=90520";>Bug 90520</a>
- Register spilling clobbers registers used elsewhere in the shader</li>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=90537";>Bug 90537</a>
- radeonsi bo/va conflict on RADEON_GEM_VA
(rscreen->ws->buffer_from_handle returns NULL)</li>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=90547";>Bug 90547</a>
- [BDW/BSW/SKL
Bisected]Piglit/glean@vertprog1-rsq_test_2_(reciprocal_square_root_of_negative_value)
fais</li>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=90580";>Bug 90580</a>
- [HSW bisected] integer multiplication bug</li>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=90600";>Bug 90600</a>
- IOError: [Errno 2] No such file or directory: 'gl_API.xml'</li>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=90621";>Bug 90621</a>
- Mesa fail to build from git</li>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=90629";>Bug 90629</a>
- [i965] SIMD16 dual_source_blend assertion `src[i].file != GRF || src[i].width
== dst.width' failed</li>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=90691";>Bug 90691</a>
- [BSW]Piglit/spec/nv_conditional_render/dlist fails intermittently</li>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=90728";>Bug 90728</a>
- dvd playback with vlc and vdpau causes segmentation fault</li>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=90734";>Bug 90734</a>
- glBufferSubData is corrupting data when buffer is > 32k</li>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=90748";>Bug 90748</a>
- [BDW
Bisected]dEQP-GLES3.functional.fbo.completeness.renderable.texture.depth.rg_half_float_oes
fails</li>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=90749";>Bug 90749</a>
- [BDW
Bisected]dEQP-GLES3.functional.rasterization.fbo.rbo_multisample_max.primitives.lines_wide
fails</li>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=90751";>Bug 90751</a>
- [BDW
Bisected]dEQP-GLES3.functional.fbo.completeness.renderable.texture.stencil.stencil_index8
fails</li>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=90797";>Bug 90797</a>
- [ALL bisected] Mesa change cause performance case manhattan fail.</li>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=90817";>Bug 90817</a>
- swrast fails to load with certain remote X servers</li>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=90830";>Bug 90830</a>
- [bsw bisected regression] GPU hang for
spec.arb_gpu_shader5.execution.sampler_array_indexing.vs-nonzero-base</li>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=90839";>Bug 90839</a>
- [10.5.5/10.6 regression, bisected] PBO glDrawPixels no longer using blit
fastpath</li>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=90873";>Bug 90873</a>
- Kernel hang, TearFree On, Mate desktop environment</li>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=90887";>Bug 90887</a>
- PhiMovesPass in register allocator broken</li>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=90895";>Bug 90895</a>
- [IVB/HSW/BDW/BSW Bisected] GLB2.7 Egypt, GfxBench3.0 T-Rex & ALU and many
SynMark cases performance reduced by 10-23%</li>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=90902";>Bug 90902</a>
- [bsw][regression] dEQP: "Found invalid pixel values"</li>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=90903";>Bug 90903</a>
- egl_dri2.c:dri2_load fails to load libglapi on osx</li>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=90904";>Bug 90904</a>
- OSX: EXC_BAD_ACCESS when using translate_sse + gallium +
softpipe/llvmpipe</li>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=90905";>Bug 90905</a>
- mesa: Finish subdir-objects transition</li>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=90925";>Bug 90925</a>
- "high fidelity": Segfault in _mesa_program_resource_find_name</li>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=91022";>Bug 91022</a>
- [g45 g965 bisected] assertions generated from textureGrad cube samplers
fix</li>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=91047";>Bug 91047</a>
- [SNB Bisected] Messed up Fog in Super Smash Bros. Melee in Dolphin</li>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=91056";>Bug 91056</a>
- The Bard's Tale (2005, native) has rendering issues</li>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=91077";>Bug 91077</a>
- dri2_glx.c:1186: undefined reference to `loader_open_device'</li>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=91099";>Bug 91099</a>
- [llvmpipe] piglit glsl-max-varyings >max_varying_components regression</li>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=91101";>Bug 91101</a>
- [softpipe] piglit
glsl-1.50@execution@geometry@max-input-components regression</li>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=91117";>Bug 91117</a>
- Nimbus (running in wine) has rendering issues, objects are
semi-transparent</li>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=91124";>Bug 91124</a>
- Civilization V (in Wine) has rendering issues: text missing, menu bar
corrupted</li>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=91173";>Bug 91173</a>
- Oddworld: Stranger's Wrath HD: disfigured models in wrong colors</li>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=91193";>Bug 91193</a>
- [290x] Dota2 reborn ingame rendering breaks with git-af4b9c7</li>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=91222";>Bug 91222</a>
- lp_test_format regression on CentOS 7</li>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=91226";>Bug 91226</a>
- Crash in glLinkProgram (NEW)</li>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=91231";>Bug 91231</a>
- [NV92] Psychonauts (native) segfaults on start when DRI3 enabled</li>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=91254";>Bug 91254</a>
- (regresion) video using VA-API on Intel slow and freeze system with mesa 10.6
or 10.6.1</li>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=91290";>Bug 91290</a>
- SIGSEGV glcpp/glcpp-parse.y:1077</li>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=91292";>Bug 91292</a>
- [BDW+] glVertexAttribDivisor not working in combination with
glPolygonMode</li>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=91337";>Bug 91337</a>
- OSMesaGetProcAdress("OSMesaPixelStore") returns nil</li>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=91418";>Bug 91418</a>
- Visual Studio 2015 vsnprintf build error</li>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=91425";>Bug 91425</a>
- [regression, bisected] Piglit spec/ext_packed_float/
getteximage-invalid-format-for-packed-type fails</li>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=91441";>Bug 91441</a>
- make check DispatchSanity_test.GL30 regression</li>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=91444";>Bug 91444</a>
- regression bisected radeonsi: don't change pipe_resource in
resource_copy_region</li>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=91461";>Bug 91461</a>
- gl_TessLevel* writes have no effect for all but the last TCS invocation</li>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=91513";>Bug 91513</a>
- [IVB/HSW/BDW/SKL Bisected] Lightsmark performance reduced by 7%-10%</li>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=91526";>Bug 91526</a>
- World of Warcraft (on Wine) has UI corruption with nouveau</li>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=91544";>Bug 91544</a>
- [i965, regression, bisected] regression of several tests in
93977d3a151675946c03e</li>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=91551";>Bug 91551</a>
- DXTn compressed normal maps produce severe artifacts on all NV5x and NVDx
chipsets</li>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=91570";>Bug 91570</a>
- Upgrading mesa to 10.6 causes segfault in OpenGL applications with GeForce4
MX 440 / AGP 8X</li>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=91591";>Bug 91591</a>
- rounding.h:102:2: error: #error "Unsupported or undefined
LONG_BIT"</li>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=91610";>Bug 91610</a>
- [BSW] GPU hang for spec.shaders.point-vertex-id gl_instanceid divisor</li>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=91673";>Bug 91673</a>
- Segfault when calling glTexSubImage2D on storage texture to bound FBO</li>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=91726";>Bug 91726</a>
- R600 asserts in tgsi_cmp/make_src_for_op3</li>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=91847";>Bug 91847</a>
- glGenerateTextureMipmap not working (no errors) unless
glActiveTexture(GL_TEXTURE1) is called before</li>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=91857";>Bug 91857</a>
- Mesa 10.6.3 linker is slow</li>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=91881";>Bug 91881</a>
- regression: GPU lockups since mesa-11.0.0_rc1 on RV620 (r600) driver</li>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=91890";>Bug 91890</a>
- [nve7] witcher2: blurry image & DATA_ERRORs (class 0xa097 mthd
0x2380/0x238c)</li>
+
+</ul>
+
<h2>Changes</h2>
-TBD.
+<li>Removed the EGL loader from the Linux SCons build.</li>
</div>
</body>
commit bd460931037b4fc5c2b5ae9311aee4be3b261732
Author: Emil Velikov <emil.l.veli...@gmail.com>
Date: Sat Sep 12 10:21:51 2015 +0100
Update version to 11.0.0(final)
Signed-off-by: Emil Velikov <emil.l.veli...@gmail.com>
diff --git a/VERSION b/VERSION
index c4bfb78..275283a 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-11.0.0-rc3
+11.0.0
commit 766d11e8f07c3baf56d6398c14c8074313496ed1
Author: Kenneth Graunke <kenn...@whitecape.org>
Date: Tue Nov 11 23:16:13 2014 -0800
glsl: Use hash tables for opt_constant_propagation() kill sets.
Cuts compile/link time of the fragment shader in #91857 by 19%
(16.28 -> 13.05).
I didn't bother with the acp sets because they're smaller, but it
might be worth doing as well.
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=91857
Signed-off-by: Kenneth Graunke <kenn...@whitecape.org>
Reviewed-by: Thomas Helland <thomashellan...@gmail.com>
Reviewed-by: Timothy Arceri <t_arc...@yahoo.com.au>
Tested-by: Tapani Pälli <tapani.pa...@intel.com>
(cherry picked from commit 4654439fdd766f79a78fe0d812fd916f5815e7e6)
Nominated-by: Emil Velikov <emil.l.veli...@gmail.com>
diff --git a/src/glsl/opt_constant_propagation.cpp
b/src/glsl/opt_constant_propagation.cpp
index 5221417..184aaa1 100644
--- a/src/glsl/opt_constant_propagation.cpp
+++ b/src/glsl/opt_constant_propagation.cpp
@@ -40,6 +40,7 @@
#include "ir_basic_block.h"
#include "ir_optimization.h"
#include "glsl_types.h"
+#include "util/hash_table.h"
namespace {
@@ -95,7 +96,8 @@ public:
killed_all = false;
mem_ctx = ralloc_context(0);
this->acp = new(mem_ctx) exec_list;
- this->kills = new(mem_ctx) exec_list;
+ this->kills = _mesa_hash_table_create(mem_ctx, _mesa_hash_pointer,
+ _mesa_key_pointer_equal);
}
~ir_constant_propagation_visitor()
{
@@ -123,7 +125,7 @@ public:
* List of kill_entry: The masks of variables whose values were
* killed in this block.
*/
- exec_list *kills;
+ hash_table *kills;
bool progress;
@@ -263,11 +265,12 @@
ir_constant_propagation_visitor::visit_enter(ir_function_signature *ir)
* main() at link time, so they're irrelevant to us.
*/
exec_list *orig_acp = this->acp;
- exec_list *orig_kills = this->kills;
+ hash_table *orig_kills = this->kills;
bool orig_killed_all = this->killed_all;
this->acp = new(mem_ctx) exec_list;
- this->kills = new(mem_ctx) exec_list;
+ this->kills = _mesa_hash_table_create(mem_ctx, _mesa_hash_pointer,
+ _mesa_key_pointer_equal);
this->killed_all = false;
visit_list_elements(this, &ir->body);
@@ -352,11 +355,12 @@ void
ir_constant_propagation_visitor::handle_if_block(exec_list *instructions)
{
exec_list *orig_acp = this->acp;
- exec_list *orig_kills = this->kills;
+ hash_table *orig_kills = this->kills;
bool orig_killed_all = this->killed_all;
this->acp = new(mem_ctx) exec_list;
- this->kills = new(mem_ctx) exec_list;
+ this->kills = _mesa_hash_table_create(mem_ctx, _mesa_hash_pointer,
+ _mesa_key_pointer_equal);
this->killed_all = false;
/* Populate the initial acp with a constant of the original */
@@ -370,12 +374,14 @@
ir_constant_propagation_visitor::handle_if_block(exec_list *instructions)
orig_acp->make_empty();
}
- exec_list *new_kills = this->kills;
+ hash_table *new_kills = this->kills;
this->kills = orig_kills;
this->acp = orig_acp;
this->killed_all = this->killed_all || orig_killed_all;
- foreach_in_list(kill_entry, k, new_kills) {
+ hash_entry *htk;
+ hash_table_foreach(new_kills, htk) {
+ kill_entry *k = (kill_entry *) htk->data;
kill(k->var, k->write_mask);
}
}
@@ -397,7 +403,7 @@ ir_visitor_status
ir_constant_propagation_visitor::visit_enter(ir_loop *ir)
{
exec_list *orig_acp = this->acp;
- exec_list *orig_kills = this->kills;
+ hash_table *orig_kills = this->kills;
bool orig_killed_all = this->killed_all;
/* FINISHME: For now, the initial acp for loops is totally empty.
@@ -405,7 +411,8 @@ ir_constant_propagation_visitor::visit_enter(ir_loop *ir)
* cloned minus the killed entries after the first run through.
*/
this->acp = new(mem_ctx) exec_list;
- this->kills = new(mem_ctx) exec_list;
+ this->kills = _mesa_hash_table_create(mem_ctx, _mesa_hash_pointer,
+ _mesa_key_pointer_equal);
this->killed_all = false;
visit_list_elements(this, &ir->body_instructions);
@@ -414,12 +421,14 @@ ir_constant_propagation_visitor::visit_enter(ir_loop *ir)
orig_acp->make_empty();
}
- exec_list *new_kills = this->kills;
+ hash_table *new_kills = this->kills;
this->kills = orig_kills;
this->acp = orig_acp;
this->killed_all = this->killed_all || orig_killed_all;
- foreach_in_list(kill_entry, k, new_kills) {
+ hash_entry *htk;
+ hash_table_foreach(new_kills, htk) {
+ kill_entry *k = (kill_entry *) htk->data;
kill(k->var, k->write_mask);
}
@@ -448,14 +457,15 @@ ir_constant_propagation_visitor::kill(ir_variable *var,
unsigned write_mask)
/* Add this writemask of the variable to the list of killed
* variables in this block.
*/
- foreach_in_list(kill_entry, entry, this->kills) {
- if (entry->var == var) {
- entry->write_mask |= write_mask;
- return;
- }
+ hash_entry *kill_hash_entry = _mesa_hash_table_search(this->kills, var);
+ if (kill_hash_entry) {
+ kill_entry *entry = (kill_entry *) kill_hash_entry->data;
+ entry->write_mask |= write_mask;
+ return;
}
/* Not already in the list. Make new entry. */
- this->kills->push_tail(new(this->mem_ctx) kill_entry(var, write_mask));
+ _mesa_hash_table_insert(this->kills, var,
+ new(this->mem_ctx) kill_entry(var, write_mask));
}
/**
commit 5923bd6d782f20273827e482e3f6f73d5fd8af10
Author: Kenneth Graunke <kenn...@whitecape.org>
Date: Sat Sep 5 00:51:33 2015 -0700
i965: Use hash tables for brw_fs_vector_splitting().
Cuts compile/link time of the fragment shader in #91857 by 25%
(21.64 -> 16.28).
v2: Drop unnecessary _mesa_hash_table_destroy call, and use
refs.ht->entries == 0 rather than ad-hoc checking (suggested by
Timothy Arceri).
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=91857
Signed-off-by: Kenneth Graunke <kenn...@whitecape.org>
Reviewed-by: Thomas Helland <thomashellan...@gmail.com>
Reviewed-by: Timothy Arceri <t_arc...@yahoo.com.au>
Tested-by: Tapani Pälli <tapani.pa...@intel.com>
(cherry picked from commit e20f30eb5181cddf8286d2247cfaf7e0fac7e417)
Nominated-by: Emil Velikov <emil.l.veli...@gmail.com>
diff --git a/src/mesa/drivers/dri/i965/brw_fs_vector_splitting.cpp
b/src/mesa/drivers/dri/i965/brw_fs_vector_splitting.cpp
index 96d4f37..9e92ae8 100644
--- a/src/mesa/drivers/dri/i965/brw_fs_vector_splitting.cpp
+++ b/src/mesa/drivers/dri/i965/brw_fs_vector_splitting.cpp
@@ -43,6 +43,7 @@
#include "glsl/ir_visitor.h"
#include "glsl/ir_rvalue_visitor.h"
#include "glsl/glsl_types.h"
+#include "util/hash_table.h"
static bool debug = false;
@@ -72,7 +73,8 @@ public:
ir_vector_reference_visitor(void)
{
this->mem_ctx = ralloc_context(NULL);
- this->variable_list.make_empty();
+ this->ht = _mesa_hash_table_create(mem_ctx, _mesa_hash_pointer,
+ _mesa_key_pointer_equal);
}
~ir_vector_reference_visitor(void)
@@ -89,7 +91,7 @@ public:
variable_entry *get_variable_entry(ir_variable *var);
/* List of variable_entry */
- exec_list variable_list;
+ struct hash_table *ht;
void *mem_ctx;
};
@@ -119,13 +121,12 @@
ir_vector_reference_visitor::get_variable_entry(ir_variable *var)
break;
}
- foreach_in_list(variable_entry, entry, &variable_list) {
- if (entry->var == var)
- return entry;
- }
+ struct hash_entry *hte = _mesa_hash_table_search(ht, var);
+ if (hte)
+ return (struct variable_entry *) hte->data;
variable_entry *entry = new(mem_ctx) variable_entry(var);
- this->variable_list.push_tail(entry);
+ _mesa_hash_table_insert(ht, var, entry);
return entry;
}
@@ -195,9 +196,9 @@
ir_vector_reference_visitor::visit_enter(ir_function_signature *ir)
class ir_vector_splitting_visitor : public ir_rvalue_visitor {
public:
- ir_vector_splitting_visitor(exec_list *vars)
+ ir_vector_splitting_visitor(struct hash_table *vars)
{
- this->variable_list = vars;
+ this->ht = vars;
}
virtual ir_visitor_status visit_leave(ir_assignment *);
@@ -205,7 +206,7 @@ public:
void handle_rvalue(ir_rvalue **rvalue);
variable_entry *get_splitting_entry(ir_variable *var);
- exec_list *variable_list;
+ struct hash_table *ht;
};
variable_entry *
@@ -216,13 +217,8 @@
ir_vector_splitting_visitor::get_splitting_entry(ir_variable *var)
if (!var->type->is_vector())
return NULL;
- foreach_in_list(variable_entry, entry, variable_list) {
- if (entry->var == var) {
- return entry;
- }
- }
-
- return NULL;
+ struct hash_entry *hte = _mesa_hash_table_search(ht, var);
+ return hte ? (struct variable_entry *) hte->data : NULL;
}
void
@@ -329,12 +325,15 @@ ir_vector_splitting_visitor::visit_leave(ir_assignment
*ir)
bool
brw_do_vector_splitting(exec_list *instructions)
{
+ struct hash_entry *hte;
+
ir_vector_reference_visitor refs;
visit_list_elements(&refs, instructions);
/* Trim out variables we can't split. */
- foreach_in_list_safe(variable_entry, entry, &refs.variable_list) {
+ hash_table_foreach(refs.ht, hte) {
+ struct variable_entry *entry = (struct variable_entry *) hte->data;
if (debug) {
fprintf(stderr, "vector %s@%p: whole_access %d\n",
entry->var->name, (void *) entry->var,
@@ -342,11 +341,11 @@ brw_do_vector_splitting(exec_list *instructions)
}
if (entry->whole_vector_access) {
- entry->remove();
+ _mesa_hash_table_remove(refs.ht, hte);
}
}
- if (refs.variable_list.is_empty())
+ if (refs.ht->entries == 0)
return false;
void *mem_ctx = ralloc_context(NULL);
@@ -354,7 +353,8 @@ brw_do_vector_splitting(exec_list *instructions)
/* Replace the decls of the vectors to be split with their split
* components.
*/
- foreach_in_list(variable_entry, entry, &refs.variable_list) {
+ hash_table_foreach(refs.ht, hte) {
+ struct variable_entry *entry = (struct variable_entry *) hte->data;
const struct glsl_type *type;
type = glsl_type::get_instance(entry->var->type->base_type, 1, 1);
@@ -378,7 +378,7 @@ brw_do_vector_splitting(exec_list *instructions)
entry->var->remove();
}
- ir_vector_splitting_visitor split(&refs.variable_list);
+ ir_vector_splitting_visitor split(refs.ht);
visit_list_elements(&split, instructions);
ralloc_free(mem_ctx);
commit d0cf5100b5564c2c8b06c733329248398e9ca6a3
Author: Kenneth Graunke <kenn...@whitecape.org>
Date: Sat Sep 5 00:22:57 2015 -0700
glsl: Use hash tables in opt_constant_variable().
Cuts compile/link time of the fragment shader in bug #91857 by 31%
(31.79 -> 21.64). It has over 8,000 variables so linked lists are
terrible.
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=91857
Signed-off-by: Kenneth Graunke <kenn...@whitecape.org>
Reviewed-by: Thomas Helland <thomashellan...@gmail.com>
Reviewed-by: Timothy Arceri <t_arc...@yahoo.com.au>
Tested-by: Tapani Pälli <tapani.pa...@intel.com>
(cherry picked from commit 2fc0ce293ac58237f02cc5dd2eee4e35abea06b5)
Nominated-by: Emil Velikov <emil.l.veli...@gmail.com>
diff --git a/src/glsl/opt_constant_variable.cpp
b/src/glsl/opt_constant_variable.cpp
index 7aaaeed..cdfbc34 100644
--- a/src/glsl/opt_constant_variable.cpp
+++ b/src/glsl/opt_constant_variable.cpp
@@ -36,11 +36,11 @@
#include "ir_visitor.h"
#include "ir_optimization.h"
#include "glsl_types.h"
+#include "util/hash_table.h"
namespace {
struct assignment_entry {
- exec_node link;
int assignment_count;
ir_variable *var;
ir_constant *constval;
@@ -54,31 +54,32 @@ public:
virtual ir_visitor_status visit_enter(ir_assignment *);
virtual ir_visitor_status visit_enter(ir_call *);
- exec_list list;
+ struct hash_table *ht;
};
} /* unnamed namespace */
static struct assignment_entry *
-get_assignment_entry(ir_variable *var, exec_list *list)
+get_assignment_entry(ir_variable *var, struct hash_table *ht)
{
+ struct hash_entry *hte = _mesa_hash_table_search(ht, var);
struct assignment_entry *entry;
- foreach_list_typed(struct assignment_entry, entry, link, list) {
- if (entry->var == var)
- return entry;
+ if (hte) {
+ entry = (struct assignment_entry *) hte->data;
+ } else {
+ entry = (struct assignment_entry *) calloc(1, sizeof(*entry));
+ entry->var = var;
+ _mesa_hash_table_insert(ht, var, entry);
}
- entry = (struct assignment_entry *)calloc(1, sizeof(*entry));
- entry->var = var;
- list->push_head(&entry->link);
return entry;
}
ir_visitor_status
ir_constant_variable_visitor::visit(ir_variable *ir)
{
- struct assignment_entry *entry = get_assignment_entry(ir, &this->list);
+ struct assignment_entry *entry = get_assignment_entry(ir, this->ht);
entry->our_scope = true;
return visit_continue;
}
@@ -97,7 +98,7 @@ ir_constant_variable_visitor::visit_enter(ir_assignment *ir)
ir_constant *constval;
struct assignment_entry *entry;
- entry = get_assignment_entry(ir->lhs->variable_referenced(), &this->list);
+ entry = get_assignment_entry(ir->lhs->variable_referenced(), this->ht);
assert(entry);
entry->assignment_count++;
@@ -150,7 +151,7 @@ ir_constant_variable_visitor::visit_enter(ir_call *ir)
struct assignment_entry *entry;
assert(var);
- entry = get_assignment_entry(var, &this->list);
+ entry = get_assignment_entry(var, this->ht);
entry->assignment_count++;
}
}
@@ -161,7 +162,7 @@ ir_constant_variable_visitor::visit_enter(ir_call *ir)
struct assignment_entry *entry;
assert(var);
- entry = get_assignment_entry(var, &this->list);
+ entry = get_assignment_entry(var, this->ht);
entry->assignment_count++;
}
@@ -177,20 +178,22 @@ do_constant_variable(exec_list *instructions)
bool progress = false;
ir_constant_variable_visitor v;
+ v.ht = _mesa_hash_table_create(NULL, _mesa_hash_pointer,
+ _mesa_key_pointer_equal);
v.run(instructions);
- while (!v.list.is_empty()) {
-
- struct assignment_entry *entry;
- entry = exec_node_data(struct assignment_entry, v.list.head, link);
+ struct hash_entry *hte;
+ hash_table_foreach(v.ht, hte) {
+ struct assignment_entry *entry = (struct assignment_entry *) hte->data;
if (entry->assignment_count == 1 && entry->constval && entry->our_scope)
{
entry->var->constant_value = entry->constval;
progress = true;
}
- entry->link.remove();
+ hte->data = NULL;
free(entry);
}
+ _mesa_hash_table_destroy(v.ht, NULL);
return progress;
}
commit e36ca8c2bb04eb6be6b6a378ed7990baa041e71b
Author: Ian Romanick <ian.d.roman...@intel.com>
Date: Wed Sep 2 16:06:58 2015 -0700
meta: Always bind the texture
We may have been called from glGenerateTextureMipmap with CurrentUnit
still set to 0, so we don't know when we can skip binding the texture.
Assume that _mesa_BindTexture will be fast if we're rebinding the same
texture.
v2: Remove currentTexUnitSave because it is now unused. Suggested by
both Neil and Anuj.
Signed-off-by: Ian Romanick <ian.d.roman...@intel.com>
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=91847
Cc: "11.0" <mesa-sta...@lists.freedesktop.org>
Reviewed-by: Neil Roberts <n...@linux.intel.com>
Reviewed-by: Anuj Phogat <anuj.pho...@gmail.com>
(cherry picked from commit 767c33e88138afa64443417860b264a494eba33d)
diff --git a/src/mesa/drivers/common/meta_generate_mipmap.c
b/src/mesa/drivers/common/meta_generate_mipmap.c
index 0655f05..5dc40a2 100644
--- a/src/mesa/drivers/common/meta_generate_mipmap.c
+++ b/src/mesa/drivers/common/meta_generate_mipmap.c
@@ -163,7 +163,6 @@ _mesa_meta_GenerateMipmap(struct gl_context *ctx, GLenum
target,
const GLuint maxLevel = texObj->MaxLevel;
const GLint maxLevelSave = texObj->MaxLevel;
const GLboolean genMipmapSave = texObj->GenerateMipmap;
- const GLuint currentTexUnitSave = ctx->Texture.CurrentUnit;
const GLboolean use_glsl_version = ctx->Extensions.ARB_vertex_shader &&
ctx->Extensions.ARB_fragment_shader;
GLenum faceTarget;
@@ -202,8 +201,12 @@ _mesa_meta_GenerateMipmap(struct gl_context *ctx, GLenum
target,
samplerSave = ctx->Texture.Unit[ctx->Texture.CurrentUnit].Sampler ?
ctx->Texture.Unit[ctx->Texture.CurrentUnit].Sampler->Name : 0;
