mesa: Changes to 'ubuntu'
Makefile.am | 2
bin/.cherry-ignore | 34 ++
bin/get-pick-list.sh | 2
configure.ac | 6
debian/changelog | 40 ++-
debian/control | 2
debian/patches/fix-osmesa-exports.diff | 41 ---
debian/patches/series | 1
debian/rules | 20 -
docs/relnotes-9.1.4.html | 4
docs/relnotes-9.1.5.html | 140 ++++++++++
docs/relnotes-9.1.6.html | 166 +++++++++++++
src/egl/drivers/dri2/platform_wayland.c | 9
src/egl/drivers/dri2/platform_x11.c | 14 +
src/gallium/auxiliary/vl/vl_winsys_dri.c | 20 +
src/gallium/drivers/nv50/nv50_stateobj.h | 2
src/gallium/drivers/nvc0/nvc0_stateobj.h | 2
src/gallium/drivers/nvc0/nvc0_video.c | 2
src/gallium/drivers/r300/r300_context.c | 6
src/gallium/drivers/r300/r300_render.c | 70 ++---
src/gallium/drivers/r300/r300_screen_buffer.c | 7
src/gallium/drivers/r300/r300_texture_desc.c | 1
src/gallium/drivers/r600/evergreen_state.c | 10
src/gallium/drivers/r600/r600_shader.c | 2
src/gallium/drivers/r600/r600_shader.h | 4
src/gallium/drivers/r600/r600_state.c | 10
src/gallium/drivers/svga/svga_tgsi_insn.c | 6
src/gallium/state_trackers/dri/sw/drisw.c | 5
src/gallium/state_trackers/egl/wayland/native_shm.c | 2
src/gallium/state_trackers/glx/xlib/xm_api.c | 11
src/glsl/ast_to_hir.cpp | 18 +
src/glsl/builtin_variables.cpp | 2
src/glsl/builtins/profiles/ARB_texture_cube_map_array.frag | 6
src/glsl/builtins/profiles/ARB_texture_cube_map_array.glsl | 3
src/glsl/glsl_lexer.ll | 2
src/glsl/link_uniforms.cpp | 14 +
src/glsl/loop_analysis.cpp | 3
src/glx/apple/apple_glx.c | 2
src/mesa/drivers/common/meta.c | 23 +
src/mesa/drivers/dri/i965/brw_draw_upload.c | 18 +
src/mesa/drivers/dri/i965/brw_fs.cpp | 10
src/mesa/drivers/dri/i965/brw_fs_emit.cpp | 4
src/mesa/drivers/dri/i965/brw_fs_visitor.cpp | 7
src/mesa/drivers/dri/i965/brw_vec4.cpp | 12
src/mesa/drivers/dri/i965/brw_vec4_visitor.cpp | 4
src/mesa/drivers/dri/i965/brw_vs.c | 8
src/mesa/drivers/dri/i965/brw_vs_state.c | 27 +-
src/mesa/drivers/dri/i965/brw_wm.c | 8
src/mesa/drivers/dri/i965/brw_wm.h | 2
src/mesa/drivers/dri/swrast/swrast.c | 1
src/mesa/drivers/osmesa/Makefile.am | 6
src/mesa/main/mipmap.c | 68 +++--
src/mesa/main/mtypes.h | 15 +
src/mesa/main/shaderobj.c | 1
src/mesa/main/texgetimage.c | 52 +---
src/mesa/main/uniform_query.cpp | 2
src/mesa/main/uniforms.c | 2
src/mesa/main/uniforms.h | 14 -
src/mesa/main/version.h | 4
src/mesa/program/prog_execute.c | 6
src/mesa/program/register_allocate.c | 46 +++
src/mesa/state_tracker/st_glsl_to_tgsi.cpp | 2
62 files changed, 794 insertions(+), 239 deletions(-)
New commits:
commit 516474fb3dc4920ef6755bf4cb305f0ac7764001
Author: Maarten Lankhorst <maarten.lankhorst@canonical.com>
Date: Tue Aug 13 15:40:09 2013 +0200
release to saucy
diff --git a/debian/changelog b/debian/changelog
index 5f5cc23..8461471 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-mesa (9.1.6-2ubuntu1) UNRELEASED; urgency=low
+mesa (9.1.6-2ubuntu1) saucy; urgency=low
* New upstream release.
* Merge from RELEASED debian-unstable. \o/
@@ -8,7 +8,7 @@ mesa (9.1.6-2ubuntu1) UNRELEASED; urgency=low
- Linking against shared dricore/gallium.
* Drop fix-osmesa-exports.diff, upstreamed.
- -- Maarten Lankhorst <maarten.lankhorst@ubuntu.com> Tue, 13 Aug 2013 14:16:42 +0200
+ -- Maarten Lankhorst <maarten.lankhorst@ubuntu.com> Tue, 13 Aug 2013 15:39:43 +0200
mesa (9.1.6-2) unstable; urgency=low
commit 34aef1a8f488e55ecebdd83cd8096e91347a0887
Author: Maarten Lankhorst <maarten.lankhorst@canonical.com>
Date: Tue Aug 13 14:20:42 2013 +0200
New upstream release.
Merge from RELEASED debian-unstable. \o/
Remaining changes:
- Building mir.
- Add support for aarch64.
- Linking against shared dricore/gallium.
Drop fix-osmesa-exports.diff, upstreamed.
diff --git a/debian/changelog b/debian/changelog
index eb2556a..5f5cc23 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,15 @@
+mesa (9.1.6-2ubuntu1) UNRELEASED; urgency=low
+
+ * New upstream release.
+ * Merge from RELEASED debian-unstable. \o/
+ * Remaining changes:
+ - Building mir.
+ - Add support for aarch64.
+ - Linking against shared dricore/gallium.
+ * Drop fix-osmesa-exports.diff, upstreamed.
+
+ -- Maarten Lankhorst <maarten.lankhorst@ubuntu.com> Tue, 13 Aug 2013 14:16:42 +0200
+
mesa (9.1.6-2) unstable; urgency=low
* Don't run 'make -j' if DEB_BUILD_OPTIONS doesn't set parallel. Oops.
@@ -25,7 +37,7 @@ mesa (9.1.4-0ubuntu6) saucy; urgency=low
mesa (9.1.4-0ubuntu5) saucy; urgency=low
* Fix the build on Aarch64, disabling most of the acceleration
- packages.
+ packages.
-- Matthias Klose <doko@ubuntu.com> Mon, 22 Jul 2013 14:29:24 +0200
diff --git a/debian/patches/fix-osmesa-exports.diff b/debian/patches/fix-osmesa-exports.diff
deleted file mode 100644
index f5be2ea..0000000
--- a/debian/patches/fix-osmesa-exports.diff
+++ /dev/null
@@ -1,41 +0,0 @@
-From e790e2489535538ac0a7d1486ca6bb1f002c7700 Mon Sep 17 00:00:00 2001
-From: Maarten Lankhorst <maarten.lankhorst@canonical.com>
-Date: Tue, 16 Jul 2013 10:18:38 +0200
-Subject: [PATCH] osmesa: link against static libglapi library too to get the
- gl exports
-
-This should fix missing symbols in a osmesa built against shared glapi
-osmesa build. All opengl exports were missing that are defined in the
-static glapi, so link against both to fix this.
-
-This is a candidate for the stable series.
-
-Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=47824
-Signed-off-by: Maarten Lankhorst <maarten.lankhorst@canonical.com>
-(cherry picked from commit b20b2b6dc8b72fc099afb9690f61596e1d0b0902)
----
- src/mesa/drivers/osmesa/Makefile.am | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/src/mesa/drivers/osmesa/Makefile.am b/src/mesa/drivers/osmesa/Makefile.am
-index 2503401..4bde617 100644
---- a/src/mesa/drivers/osmesa/Makefile.am
-+++ b/src/mesa/drivers/osmesa/Makefile.am
-@@ -40,11 +40,11 @@ lib@OSMESA_LIB@_la_SOURCES = osmesa.c
-
- lib@OSMESA_LIB@_la_LDFLAGS = -module -version-number @OSMESA_VERSION@ -no-undefined
-
--if HAVE_SHARED_GLAPI
--GLAPI_LIB = $(top_builddir)/src/mapi/shared-glapi/libglapi.la
--else
- GLAPI_LIB = $(top_builddir)/src/mapi/glapi/libglapi.la
-+if HAVE_SHARED_GLAPI
-+GLAPI_LIB += $(top_builddir)/src/mapi/shared-glapi/libglapi.la
- endif
-+
- lib@OSMESA_LIB@_la_LIBADD = \
- $(top_builddir)/src/mesa/libmesa.la \
- $(GLAPI_LIB) \
---
-1.8.3.2
-
diff --git a/debian/patches/series b/debian/patches/series
index 5bc8763..fad6f0e 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -6,7 +6,6 @@
#11-hurd-ftbfs-again.diff
# Ubuntu patches.
-fix-osmesa-exports.diff
101_ubuntu_hidden_glname.patch
117-static-gallium.patch
118-dricore-gallium.patch
commit 4d2cc8c91c286593fd96cc8df7282c77bbd65a57
Author: Julien Cristau <jcristau@debian.org>
Date: Mon Aug 12 08:00:33 2013 +0200
Upload to unstable
diff --git a/debian/changelog b/debian/changelog
index 465961a..f68dc77 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,8 @@
-mesa (9.1.6-2) UNRELEASED; urgency=low
+mesa (9.1.6-2) unstable; urgency=low
* Don't run 'make -j' if DEB_BUILD_OPTIONS doesn't set parallel. Oops.
- -- Julien Cristau <jcristau@debian.org> Mon, 12 Aug 2013 07:59:51 +0200
+ -- Julien Cristau <jcristau@debian.org> Mon, 12 Aug 2013 08:00:21 +0200
mesa (9.1.6-1) unstable; urgency=low
commit a447fb22e944a6bcb8d9b1b3dd022bda8df90bf5
Author: Julien Cristau <jcristau@debian.org>
Date: Mon Aug 12 08:00:20 2013 +0200
Don't run 'make -j' if DEB_BUILD_OPTIONS doesn't set parallel. Oops.
diff --git a/debian/changelog b/debian/changelog
index 9dcc2f0..465961a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+mesa (9.1.6-2) UNRELEASED; urgency=low
+
+ * Don't run 'make -j' if DEB_BUILD_OPTIONS doesn't set parallel. Oops.
+
+ -- Julien Cristau <jcristau@debian.org> Mon, 12 Aug 2013 07:59:51 +0200
+
mesa (9.1.6-1) unstable; urgency=low
[ Andreas Boll ]
diff --git a/debian/rules b/debian/rules
index 4c6ad2c..983f97f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -181,7 +181,7 @@ $(STAMP)-build-%: configure
--localstatedir=/var --disable-silent-rules \
$(confflags) $(confflags-$*) \
ac_cv_path_LLVM_CONFIG=llvm-config-3.2
- cd $(DEB_BUILD_DIR)/$* && $(MAKE) -j$(NUMJOBS)
+ cd $(DEB_BUILD_DIR)/$* && $(MAKE) $(if $(NUMJOBS),-j$(NUMJOBS))
>$@
install: build
commit 3863dab57783d960781fe57655c2db535f2413e8
Author: Julien Cristau <jcristau@debian.org>
Date: Sun Aug 11 18:16:12 2013 +0200
Upload to unstable
diff --git a/debian/changelog b/debian/changelog
index 42a84a3..9dcc2f0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-mesa (9.1.6-1) UNRELEASED; urgency=low
+mesa (9.1.6-1) unstable; urgency=low
[ Andreas Boll ]
* New upstream release. (Closes: #717410)
@@ -8,7 +8,7 @@ mesa (9.1.6-1) UNRELEASED; urgency=low
[ Julien Cristau ]
* Don't run configure for different builds in parallel.
- -- Andreas Boll <andreas.boll.dev@gmail.com> Fri, 02 Aug 2013 12:04:47 +0200
+ -- Julien Cristau <jcristau@debian.org> Sun, 11 Aug 2013 18:15:58 +0200
mesa (9.1.4-1) unstable; urgency=low
commit 4082fc253e44eb3f846517ac6a36c3e1b8be3e27
Author: Julien Cristau <jcristau@debian.org>
Date: Tue Jul 9 20:23:15 2013 +0200
Don't run configure for different builds in parallel.
Some files get built in $srcdir, which means they're shared between our
build variants. If variant A tries to use a file while it's being
generated by variant B, things explode.
diff --git a/debian/changelog b/debian/changelog
index 2ef33bb..42a84a3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,13 @@
mesa (9.1.6-1) UNRELEASED; urgency=low
+ [ Andreas Boll ]
* New upstream release. (Closes: #717410)
* Cherry-pick commit 0dbbfa0 (mesa: Fix MESA_PATCH version) from
upstream.
+ [ Julien Cristau ]
+ * Don't run configure for different builds in parallel.
+
-- Andreas Boll <andreas.boll.dev@gmail.com> Fri, 02 Aug 2013 12:04:47 +0200
mesa (9.1.4-1) unstable; urgency=low
diff --git a/debian/rules b/debian/rules
index fe26287..4c6ad2c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -7,7 +7,6 @@
ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
NUMJOBS = $(patsubst parallel=%,%,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
- MAKEFLAGS += -j$(NUMJOBS)
endif
DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
@@ -182,7 +181,7 @@ $(STAMP)-build-%: configure
--localstatedir=/var --disable-silent-rules \
$(confflags) $(confflags-$*) \
ac_cv_path_LLVM_CONFIG=llvm-config-3.2
- cd $(DEB_BUILD_DIR)/$* && $(MAKE)
+ cd $(DEB_BUILD_DIR)/$* && $(MAKE) -j$(NUMJOBS)
>$@
install: build
commit d483ad18f36de0d9088943ccd0eee2d5e8308f33
Author: Andreas Boll <andreas.boll.dev@gmail.com>
Date: Fri Aug 2 12:14:09 2013 +0200
debian/changelog: Add changelog entry
diff --git a/debian/changelog b/debian/changelog
index 87709bf..2ef33bb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
mesa (9.1.6-1) UNRELEASED; urgency=low
* New upstream release. (Closes: #717410)
+ * Cherry-pick commit 0dbbfa0 (mesa: Fix MESA_PATCH version) from
+ upstream.
-- Andreas Boll <andreas.boll.dev@gmail.com> Fri, 02 Aug 2013 12:04:47 +0200
commit a4921e7ba7916addf224e188ca73a897ff19c7a6
Author: Andreas Boll <andreas.boll.dev@gmail.com>
Date: Fri Aug 2 09:51:24 2013 +0200
mesa: Fix MESA_PATCH version
(cherry picked from commit 0dbbfa054c91980a093c0146bd281624cc74695d)
diff --git a/src/mesa/main/version.h b/src/mesa/main/version.h
index 6eab691..27eb76d 100644
--- a/src/mesa/main/version.h
+++ b/src/mesa/main/version.h
@@ -34,7 +34,7 @@ struct gl_context;
/* Mesa version */
#define MESA_MAJOR 9
#define MESA_MINOR 1
-#define MESA_PATCH 4
+#define MESA_PATCH 6
#define MESA_VERSION_STRING "9.1.6"
/* To make version comparison easy */
commit 86a52b857f578a14d81ffc094a9c1dcffb129431
Author: Andreas Boll <andreas.boll.dev@gmail.com>
Date: Fri Aug 2 12:08:46 2013 +0200
New upstream release
diff --git a/debian/changelog b/debian/changelog
index 66d4421..87709bf 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,8 @@
-mesa (9.1.5-1) UNRELEASED; urgency=low
+mesa (9.1.6-1) UNRELEASED; urgency=low
- * New upstream release.
- * Cherry-pick commit b20b2b6 (osmesa: link against static libglapi
- library too to get the gl exports) from upstream (Closes: #717410).
+ * New upstream release. (Closes: #717410)
- -- Andreas Boll <andreas.boll.dev@gmail.com> Thu, 18 Jul 2013 18:32:24 +0200
+ -- Andreas Boll <andreas.boll.dev@gmail.com> Fri, 02 Aug 2013 12:04:47 +0200
mesa (9.1.4-1) unstable; urgency=low
commit 1ed76d697fccba03e72b1a48f3ce866984fa3899
Author: Carl Worth <cworth@cworth.org>
Date: Thu Aug 1 14:21:21 2013 -0700
docs: Add release notes for 9.1.6 release
diff --git a/docs/relnotes-9.1.6.html b/docs/relnotes-9.1.6.html
new file mode 100644
index 0000000..1e55b8e
--- /dev/null
+++ b/docs/relnotes-9.1.6.html
@@ -0,0 +1,166 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd";>
+<html lang="en">
+<head>
+ <meta http-equiv="content-type" content="text/html; charset=utf-8">
+ <title>Mesa Release Notes</title>
+ <link rel="stylesheet" type="text/css" href="mesa.css">
+</head>
+<body>
+
+<div class="header">
+ <h1>The Mesa 3D Graphics Library</h1>
+</div>
+
+<iframe src="contents.html"></iframe>
+<div class="content">
+
+<h1>Mesa 9.1.6 Release Notes / August 1, 2013</h1>
+
+<p>
+Mesa 9.1.6 is a bug fix release which fixes bugs found since the 9.1.5 release.
+</p>
+<p>
+Mesa 9.1 implements the OpenGL 3.1 API, but the version reported by
+glGetString(GL_VERSION) or glGetIntegerv(GL_MAJOR_VERSION) /
+glGetIntegerv(GL_MINOR_VERSION) depends on the particular driver being used.
+Some drivers don't support all the features required in OpenGL 3.1. OpenGL
+3.1 is <strong>only</strong> available if requested at context creation
+because GL_ARB_compatibility is not supported.
+</p>
+
+<h2>MD5 checksums</h2>
+<pre>
+TBD
+</pre>
+
+<h2>New features</h2>
+<p>None.</p>
+
+<h2>Bug fixes</h2>
+
+<p>This list is likely incomplete.</p>
+
+<ul>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=47824";>Bug 47824</a> - osmesa using --enable-shared-glapi depends on libgl</li>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=62362";>Bug 62362</a> - Crash when using Wayland EGL platform</li>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=63435";>Bug 63435</a> - [Regression since 9.0] Flickering in EGL OpenGL full-screen window with swap interval 1</li>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=64087";>Bug 64087</a> - Webgl conformance shader-with-non-reserved-words crash when mesa is compiled without --enable-debug</li>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=64330";>Bug 64330</a> - WebGL snake demo crash in loop_analysis.cpp:506: bool is_loop_terminator(ir_if*): assertion „inst != __null“ failed.</li>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=65236";>Bug 65236</a> - [i965] Rendering artifacts in VDrift/GL2</li>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=66558";>Bug 66558</a> - RS690: 3D artifacts when playing SuperTuxKart</li>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=66847";>Bug 66847</a> - compilation broken with llvm 3.3</li>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=66850";>Bug 66850</a> - glGenerateMipmap crashes when using GL_TEXTURE_2D_ARRAY with compressed internal format</li>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=66921";>Bug 66921</a> - [r300g] Heroes of Newerth: HiZ related corruption</li>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=67283";>Bug 67283</a> - VDPAU doesn't work on hybrid laptop through DRI_PRIME</li>
+
+</ul>
+
+<h2>Changes</h2>
+<p>The full set of changes can be viewed by using the following GIT command:</p>
+
+<pre>
+ git log mesa-9.1.4..mesa-9.1.5
+</pre>
+
+<p>Andreas Boll (1):</p>
+<ul>
+ <li>configure.ac: Require llvm-3.2 for r600g/radeonsi llvm backends</li>
+</ul>
+
+<p>Brian Paul (4):</p>
+<ul>
+ <li>mesa: handle 2D texture arrays in get_tex_rgba_compressed()</li>
+ <li>meta: handle 2D texture arrays in decompress_texture_image()</li>
+ <li>mesa: implement mipmap generation for compressed 2D array textures</li>
+ <li>mesa: improve free() cleanup in generate_mipmap_compressed()</li>
+</ul>
+
+<p>Carl Worth (7):</p>
+<ul>
+ <li>docs: Add 9.1.5 release md5sums</li>
+ <li>Merge 'origin/9.1' into stable</li>
+ <li>cherry-ignore: Drop 13 patches from the pick list</li>
+ <li>get-pick-list.sh: Include commits mentionining "CC: mesa-stable..." in pick list</li>
+ <li>get-pick-list: Allow for non-whitespace between "CC:" and "mesa-stable"</li>
+ <li>get-pick-list: Ignore commits which CC mesa-stable unless they say "9.1"</li>
+ <li>Bump version to 9.1.6</li>
+</ul>
+
+<p>Chris Forbes (5):</p>
+<ul>
+ <li>i965/Gen4: Zero extra coordinates for ir_tex</li>
+ <li>i965/vs: Fix flaky texture swizzling</li>
+ <li>i965/vs: set up sampler state pointer for Gen4/5.</li>
+ <li>i965/vs: Put lod parameter in the correct place for Gen4</li>
+ <li>i965/vs: Gen4/5: enable front colors if back colors are written</li>
+</ul>
+
+<p>Christoph Bumiller (1):</p>
+<ul>
+ <li>nv50,nvc0: s/uint16/uint32 for constant buffer offset</li>
+</ul>
+
+<p>Dave Airlie (1):</p>
+<ul>
+ <li>gallium/vl: add prime support</li>
+</ul>
+
+<p>Eric Anholt (1):</p>
+<ul>
+ <li>egl: Restore "bogus" DRI2 invalidate event code.</li>
+</ul>
+
+<p>Jeremy Huddleston Sequoia (1):</p>
+<ul>
+ <li>Apple: glFlush() is not needed with CGLFlushDrawable()</li>
+</ul>
+
+<p>Kenneth Graunke (1):</p>
+<ul>
+ <li>glsl: Classify "layout" like other identifiers.</li>
+</ul>
+
+<p>Kristian Høgsberg (1):</p>
+<ul>
+ <li>egl-wayland: Fix left-over wl_display_roundtrip() usage</li>
+</ul>
+
+<p>Maarten Lankhorst (2):</p>
+<ul>
+ <li>osmesa: link against static libglapi library too to get the gl exports</li>
+ <li>nvc0: force use of correct firmware file</li>
+</ul>
+
+<p>Marek Olšák (4):</p>
+<ul>
+ <li>r300g/swtcl: fix geometry corruption by uploading indices to a buffer</li>
+ <li>r300g/swtcl: fix a lockup in MSAA resolve</li>
+ <li>Revert "r300g: allow HiZ with a 16-bit zbuffer"</li>
+ <li>r600g: increase array size for shader inputs and outputs</li>
+</ul>
+
+<p>Matt Turner (2):</p>
+<ul>
+ <li>i965: NULL check prog on shader compilation failure.</li>
+ <li>i965/vs: Print error if vertex shader fails to compile.</li>
+</ul>
+
+<p>Paul Berry (1):</p>
+<ul>
+ <li>glsl: Handle empty if statement encountered during loop analysis.</li>
+</ul>
+
+</div>
+</body>
+</html>
commit 985e25402f4fb86ebd03741a0bc554e399a7b974
Author: Carl Worth <cworth@cworth.org>
Date: Thu Aug 1 14:15:38 2013 -0700
Bump version to 9.1.6
diff --git a/Makefile.am b/Makefile.am
index 9c03dd8..fba8556 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -36,7 +36,7 @@ check-local:
# Rules for making release tarballs
-PACKAGE_VERSION=9.1.5
+PACKAGE_VERSION=9.1.6
PACKAGE_DIR = Mesa-$(PACKAGE_VERSION)
PACKAGE_NAME = MesaLib-$(PACKAGE_VERSION)
diff --git a/configure.ac b/configure.ac
index 452b24f..550ee05 100644
--- a/configure.ac
+++ b/configure.ac
@@ -6,7 +6,7 @@ dnl Tell the user about autoconf.html in the --help output
m4_divert_once([HELP_END], [
See docs/autoconf.html for more details on the options for Mesa.])
-AC_INIT([Mesa], [9.1.5],
+AC_INIT([Mesa], [9.1.6],
[https://bugs.freedesktop.org/enter_bug.cgi?product=Mesa])
AC_CONFIG_AUX_DIR([bin])
AC_CONFIG_MACRO_DIR([m4])
diff --git a/src/mesa/main/version.h b/src/mesa/main/version.h
index a069798..6eab691 100644
--- a/src/mesa/main/version.h
+++ b/src/mesa/main/version.h
@@ -35,7 +35,7 @@ struct gl_context;
#define MESA_MAJOR 9
#define MESA_MINOR 1
#define MESA_PATCH 4
-#define MESA_VERSION_STRING "9.1.5"
+#define MESA_VERSION_STRING "9.1.6"
/* To make version comparison easy */
#define MESA_VERSION(a,b,c) (((a) << 16) + ((b) << 8) + (c))
commit a33ecd80749902ca72f4a42feadb509eae551e1b
Author: Carl Worth <cworth@cworth.org>
Date: Thu Aug 1 13:34:30 2013 -0700
get-pick-list: Ignore commits which CC mesa-stable unless they say "9.1"
With the recent creation of the 9.2 branch, we're now seeing a steady flow of
new patches to mesa-stable@ intended for that branch. To avoid wasting effort
trying to apply these to 9.1, we now require developers to specifically
mention "9.1" to target the 9.1 branch.
diff --git a/bin/get-pick-list.sh b/bin/get-pick-list.sh
index 0902fd0..0409341 100755
--- a/bin/get-pick-list.sh
+++ b/bin/get-pick-list.sh
@@ -14,7 +14,7 @@ git log --reverse --grep="cherry picked from commit" origin/master..HEAD |\
sed -e 's/^[[:space:]]*(cherry picked from commit[[:space:]]*//' -e 's/)//' > already_picked
# Grep for commits that were marked as a candidate for the stable tree.
-git log --reverse --pretty=%H -i --grep='^\([[:space:]]*NOTE: .*[Cc]andidate\|CC:.*mesa-stable\)' HEAD..origin/master |\
+git log --reverse --pretty=%H -i --grep='^\([[:space:]]*NOTE: .*[Cc]andidate\|CC:.*9\.1.*mesa-stable\)' HEAD..origin/master |\
while read sha
do
# Check to see whether the patch is on the ignore list.
commit 4f26ea56120cffaa1a0c2337423cf08b835dffb8
Author: Chris Forbes <chrisf@ijw.co.nz>
Date: Sun Jul 7 23:13:07 2013 +1200
i965/vs: Gen4/5: enable front colors if back colors are written
Fixes undefined results if a back color is written, but the
corresponding front color is not, and only backfacing primitives are
drawn. Results are still undefined if a frontfacing primitive is drawn,
but that's OK.
The other reasonable way to fix this would have been to just pick
the one color slot that was populated, but that dilutes the value of
the tests.
On Gen6+, the fixed function clipper and triangle setup already take
care of this.
Fixes 11 piglits:
spec/glsl-1.10/execution/interpolation/interpolation-none-gl_Back*Color-*
NOTE: This is a candidate for stable branches.
Signed-off-by: Chris Forbes <chrisf@ijw.co.nz>
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
(cherry picked from commit 1ec66f2fb2fea0497efebc1db83c75ec95a816a4)
diff --git a/src/mesa/drivers/dri/i965/brw_vs.c b/src/mesa/drivers/dri/i965/brw_vs.c
index 0234ebb..950fca4 100644
--- a/src/mesa/drivers/dri/i965/brw_vs.c
+++ b/src/mesa/drivers/dri/i965/brw_vs.c
@@ -271,6 +271,14 @@ do_vs_prog(struct brw_context *brw,
c.prog_data.outputs_written |= BITFIELD64_BIT(VERT_RESULT_TEX0 + i);
}
+ if (intel->gen < 6) {
+ /* if back colors are written, allocate slots for front colors too */
+ if (c.prog_data.outputs_written & BITFIELD64_BIT(VERT_RESULT_BFC0))
+ c.prog_data.outputs_written |= BITFIELD64_BIT(VERT_RESULT_COL0);
+ if (c.prog_data.outputs_written & BITFIELD64_BIT(VERT_RESULT_BFC1))
+ c.prog_data.outputs_written |= BITFIELD64_BIT(VERT_RESULT_COL1);
+ }
+
brw_compute_vue_map(brw, &c);
if (0) {
commit 4cedc45a1facc86b62e1dfd1a8693042f7200e21
Author: Carl Worth <cworth@cworth.org>
Date: Wed Jul 31 15:49:48 2013 -0700
get-pick-list: Allow for non-whitespace between "CC:" and "mesa-stable"
We recently proposed a new syntax for stable-patch nominations such as:
CC: "9.2 and 9.1" <mesa-stable@lists.freedesktop.org>
and this has already appeared in the wild.
So we extend the regular expression to pick this up as well.
diff --git a/bin/get-pick-list.sh b/bin/get-pick-list.sh
index b9def6b..0902fd0 100755
--- a/bin/get-pick-list.sh
+++ b/bin/get-pick-list.sh
@@ -14,7 +14,7 @@ git log --reverse --grep="cherry picked from commit" origin/master..HEAD |\
sed -e 's/^[[:space:]]*(cherry picked from commit[[:space:]]*//' -e 's/)//' > already_picked
# Grep for commits that were marked as a candidate for the stable tree.
-git log --reverse --pretty=%H -i --grep='^\([[:space:]]*NOTE: .*[Cc]andidate\|CC:[[:space:]]*mesa-stable\)' HEAD..origin/master |\
+git log --reverse --pretty=%H -i --grep='^\([[:space:]]*NOTE: .*[Cc]andidate\|CC:.*mesa-stable\)' HEAD..origin/master |\
while read sha
do
# Check to see whether the patch is on the ignore list.
commit e6cf672b1af19fe9ef2d8462f9d5a92aa211ed65
Author: Chris Forbes <chrisf@ijw.co.nz>
Date: Tue Jul 30 16:03:58 2013 +1200
i965/vs: Put lod parameter in the correct place for Gen4
This was never visible before due to the bogus sampler state pointer.
Fixes remaining vertex texturing breakage on Gen4.
Signed-off-by: Chris Forbes <chrisf@ijw.co.nz>
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
Cc: mesa-stable@lists.freedesktop.org
(cherry picked from commit cace82b0cdd9b93a21adbb5857f1f69ee0a2f925)
diff --git a/src/mesa/drivers/dri/i965/brw_vec4_visitor.cpp b/src/mesa/drivers/dri/i965/brw_vec4_visitor.cpp
index 86f9a33..c270a67 100644
--- a/src/mesa/drivers/dri/i965/brw_vec4_visitor.cpp
+++ b/src/mesa/drivers/dri/i965/brw_vec4_visitor.cpp
@@ -2215,7 +2215,7 @@ vec4_visitor::visit(ir_texture *ir)
}
} else /* intel->gen == 4 */ {
mrf = param_base;
- writemask = WRITEMASK_Z;
+ writemask = WRITEMASK_W;
}
emit(MOV(dst_reg(MRF, mrf, lod_type, writemask), lod));
} else if (ir->op == ir_txf) {
commit 185c1aa1d80dfb09361d483de0907b004564864f
Author: Chris Forbes <chrisf@ijw.co.nz>
Date: Tue Jul 30 06:12:24 2013 +1200
i965/vs: set up sampler state pointer for Gen4/5.
Fixes broken filter and lod selection for vertex texturing.
(txs/txf only worked properly because they ignore the sampler state
completely)
Signed-off-by: Chris Forbes <chrisf@ijw.co.nz>
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
Cc: mesa-stable@lists.freedesktop.org
(cherry picked from commit 97676032c28e20b4c4150c3632794f5bdaa9efad)
Backported-by: Carl Worth <cworth@cworth.org> to compile on 9.1 branch.
diff --git a/src/mesa/drivers/dri/i965/brw_vs_state.c b/src/mesa/drivers/dri/i965/brw_vs_state.c
index a72a283..16bd56e 100644
--- a/src/mesa/drivers/dri/i965/brw_vs_state.c
+++ b/src/mesa/drivers/dri/i965/brw_vs_state.c
@@ -130,11 +130,13 @@ brw_upload_vs_unit(struct brw_context *brw)
vs->thread4.max_threads = CLAMP(brw->urb.nr_vs_entries / 2,
1, brw->max_vs_threads) - 1;
- /* No samplers for ARB_vp programs:
- */
- /* It has to be set to 0 for Ironlake
- */
- vs->vs5.sampler_count = 0;
+ if (intel->gen == 5)
+ vs->vs5.sampler_count = 0; /* hardware requirement */
+ else {
+ /* CACHE_NEW_SAMPLER */
+ vs->vs5.sampler_count = (brw->sampler.count + 3) / 4;
+ }
+
if (unlikely(INTEL_DEBUG & DEBUG_STATS))
vs->thread4.stats_enable = 1;
@@ -143,6 +145,19 @@ brw_upload_vs_unit(struct brw_context *brw)
*/
vs->vs6.vs_enable = 1;
+ /* Set the sampler state pointer, and its reloc
+ */
+ if (brw->sampler.count) {
+ vs->vs5.sampler_state_pointer =
+ (intel->batch.bo->offset + brw->sampler.offset) >> 5;
+ drm_intel_bo_emit_reloc(intel->batch.bo,
+ brw->vs.state_offset +
+ offsetof(struct brw_vs_unit_state, vs5),
+ intel->batch.bo,
+ brw->sampler.offset | vs->vs5.sampler_count,
+ I915_GEM_DOMAIN_INSTRUCTION, 0);
+ }
+
/* Emit scratch space relocation */
if (brw->vs.prog_data->total_scratch != 0) {
drm_intel_bo_emit_reloc(intel->batch.bo,
@@ -164,7 +179,7 @@ const struct brw_tracked_state brw_vs_unit = {
BRW_NEW_CURBE_OFFSETS |
BRW_NEW_URB_FENCE |
BRW_NEW_VERTEX_PROGRAM),
- .cache = CACHE_NEW_VS_PROG
+ .cache = CACHE_NEW_VS_PROG | CACHE_NEW_SAMPLER
},
.emit = brw_upload_vs_unit,
};
commit d37c09c18fa565e1898f6bde2277ecb394c44aa3
Author: Eric Anholt <eric@anholt.net>
Date: Fri Jun 21 15:34:52 2013 -0700
egl: Restore "bogus" DRI2 invalidate event code.
I had removed it in commit 1e7776ca2bc59a6978d9b933d23852d47078dfa8
because it was obviously wrong -- why do we care whether the server is a
version that emits events, if we're not watching for the server's events,
anyway? And why would you only invalidate on a server that emits
invalidate events, when the comment said to emit invalidates if the server
*doesn't*? Only, I missed that we otherwise don't flag that our buffers
might have changed at swap time at all, so the driver was only checking
for new buffers when triggered by the Viewport hack. Of course you don't
expect Viewport to be called after a swap.
So, this is effectively a revert of the previous commit, except that I
dropped the check for only emitting invalidates on a new server -- we
*always* need to invalidate if we're doing a SwapBuffers.
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=63435
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
Cc: "9.1 and 9.2" <mesa-stable@lists.freedesktop.org>
(cherry picked from commit eed0a80137dfac641adfd39ce316938dbcf2be10)
diff --git a/src/egl/drivers/dri2/platform_x11.c b/src/egl/drivers/dri2/platform_x11.c
index ccb097f..ec76aec 100644
--- a/src/egl/drivers/dri2/platform_x11.c
+++ b/src/egl/drivers/dri2/platform_x11.c
@@ -743,6 +743,20 @@ dri2_swap_buffers_msc(_EGLDriver *drv, _EGLDisplay *disp, _EGLSurface *draw,
free(reply);
}
+ /* Since we aren't watching for the server's invalidate events like we're
+ * supposed to (due to XCB providing no mechanism for filtering the events
+ * the way xlib does), and SwapBuffers is a common cause of invalidate
+ * events, just shove one down to the driver, even though we haven't told
+ * the driver that we're the kind of loader that provides reliable
+ * invalidate events. This causes the driver to request buffers again at
+ * its next draw, so that we get the correct buffers if a pageflip
+ * happened. The driver should still be using the viewport hack to catch
+ * window resizes.
+ */
+ if (dri2_dpy->flush &&
+ dri2_dpy->flush->base.version >= 3 && dri2_dpy->flush->invalidate)
+ (*dri2_dpy->flush->invalidate)(dri2_surf->dri_drawable);
+
return swap_count;
}
commit 868087f137fac48a5e19038e8752cb24ffe1749e
Author: Brian Paul <brianp@vmware.com>
Date: Fri Jul 26 09:50:36 2013 -0600
mesa: improve free() cleanup in generate_mipmap_compressed()
Free all our temporary buffers in one place at the end of the
function. Fixes memory leak detected by Coverity.
Note: This is a candidate for the 9.x branches
Cc: mesa-stable@lists.freedesktop.org
Reviewed-by: José Fonseca <jfonseca@vmware.com>
(cherry picked from commit e5f32a0b3a9f8541f0c8ffc5f303612ac9963bb1)
diff --git a/src/mesa/main/mipmap.c b/src/mesa/main/mipmap.c
index 887830c..88f5b72 100644
--- a/src/mesa/main/mipmap.c
+++ b/src/mesa/main/mipmap.c
@@ -2024,7 +2024,7 @@ generate_mipmap_compressed(struct gl_context *ctx, GLenum target,
GLubyte *temp_src = NULL, *temp_dst = NULL;
GLenum temp_datatype;
GLenum temp_base_format;
- GLubyte **temp_src_slices, **temp_dst_slices;
+ GLubyte **temp_src_slices = NULL, **temp_dst_slices = NULL;
/* only two types of compressed textures at this time */
assert(texObj->Target == GL_TEXTURE_2D ||
@@ -2063,11 +2063,8 @@ generate_mipmap_compressed(struct gl_context *ctx, GLenum target,
temp_dst_slices = malloc(srcImage->Depth * sizeof(GLubyte *));
if (!temp_src || !temp_src_slices || !temp_dst_slices) {
- free(temp_src);
- free(temp_src_slices);
- free(temp_dst_slices);
_mesa_error(ctx, GL_OUT_OF_MEMORY, "generate mipmaps");
- return;
+ goto end;
}
/* decompress base image to the temporary src buffer */
@@ -2119,7 +2116,7 @@ generate_mipmap_compressed(struct gl_context *ctx, GLenum target,
temp_dst = malloc(temp_dst_img_stride * dstDepth);
if (!temp_dst) {
_mesa_error(ctx, GL_OUT_OF_MEMORY, "generate mipmaps");
- break;
+ goto end;
}
}
@@ -2127,8 +2124,7 @@ generate_mipmap_compressed(struct gl_context *ctx, GLenum target,
dstImage = _mesa_get_tex_image(ctx, texObj, target, level + 1);
if (!dstImage) {
_mesa_error(ctx, GL_OUT_OF_MEMORY, "generating mipmaps");
- free(temp_dst);
- return;
+ goto end;
}
/* for 2D arrays, setup array[depth] of slice pointers */
@@ -2153,8 +2149,8 @@ generate_mipmap_compressed(struct gl_context *ctx, GLenum target,
dstWidth, dstHeight, dstDepth,
border, srcImage->InternalFormat,
srcImage->TexFormat)) {
- free(temp_dst);
- return;
+ /* all done */
+ goto end;
}
/* The image space was allocated above so use glTexSubImage now */
@@ -2173,6 +2169,7 @@ generate_mipmap_compressed(struct gl_context *ctx, GLenum target,
}
} /* loop over mipmap levels */
+end:
free(temp_src);
free(temp_dst);
free(temp_src_slices);
commit d2700c1a05cebdd3aa47b3350b33860a3c10d215
Author: Carl Worth <cworth@cworth.org>
Date: Tue Jul 30 12:36:37 2013 -0700
get-pick-list.sh: Include commits mentionining "CC: mesa-stable..." in pick list
We recently adopted a new convention that patches can be nominated for the
stable branch by including a line in the commit message as follows:
CC: mesa-stable@lists.freedesktop.org
This is a convenient syntax as "git send-email" will notice this line and
automatically copy the resulting patch email to the mesa-stable mailing list.
Here we extend the regular expression in the get-pick-list.sh script to also
notice this pattern, (as well as the traditional "NOTE: This patch is a
candidate..." form.
diff --git a/bin/get-pick-list.sh b/bin/get-pick-list.sh
index d2b76e7..b9def6b 100755
--- a/bin/get-pick-list.sh
+++ b/bin/get-pick-list.sh
@@ -14,7 +14,7 @@ git log --reverse --grep="cherry picked from commit" origin/master..HEAD |\
sed -e 's/^[[:space:]]*(cherry picked from commit[[:space:]]*//' -e 's/)//' > already_picked
# Grep for commits that were marked as a candidate for the stable tree.
-git log --reverse --pretty=%H -i --grep='^[[:space:]]*NOTE: .*[Cc]andidate' HEAD..origin/master |\
+git log --reverse --pretty=%H -i --grep='^\([[:space:]]*NOTE: .*[Cc]andidate\|CC:[[:space:]]*mesa-stable\)' HEAD..origin/master |\
while read sha
do
# Check to see whether the patch is on the ignore list.
commit 30fc154945c0e6f78b3bc91a697577a985b84b1c
Author: Carl Worth <cworth@cworth.org>
Date: Tue Jul 30 12:35:00 2013 -0700
cherry-ignore: Drop 13 patches from the pick list
Each of these have recently been discussed with the original patch authors
(see posts to the mesa-stable@lists.freedesktop.org mailing list).
diff --git a/bin/.cherry-ignore b/bin/.cherry-ignore
index 15a8e95..be95f17 100644
--- a/bin/.cherry-ignore
+++ b/bin/.cherry-ignore
@@ -39,3 +39,28 @@ fcaa48d9cc8937e0ceb59dfd22ef5b6e6fd1a273 glsl: Disallow return with a void argum
# Rejected at author's request (attempted backport did not fix piglit test)
4c3ed795662974a1c2ad2326fc74bef608a34f31 r600g: Workaround for a harware bug with nested loops on Cayman
+
+# These do not apply and the author has confirmed they should be dropped.
+49c1fc7044eaaa5c2dca05ff4a709be8e3636871 r600g: don't emit SQ_DYN_GPR_RESOURCE_LIMIT_1 on cayman
+4539f8e20af286d1f521eb016c89c6d9af0b801c r600g: don't emit surface_sync after FLUSH_AND_INV_EVENT
+
Reply to: