mesa: Changes to 'debian-unstable'
Makefile.am | 2
bin/.cherry-ignore | 6
bin/get-pick-list.sh | 2
configure.ac | 2
debian/changelog | 8
docs/relnotes-9.1.6.html | 6
docs/relnotes-9.1.7.html | 168 +++++++++++++
src/egl/main/Makefile.am | 2
src/egl/wayland/wayland-egl/wayland-egl.pc.in | 1
src/gallium/drivers/nouveau/nouveau_buffer.c | 2
src/gallium/drivers/nv30/nv30_format.c | 6
src/gallium/drivers/nv30/nv30_vbo.c | 4
src/gallium/drivers/nv50/nv50_vbo.c | 12
src/gallium/drivers/nvc0/codegen/nv50_ir_lowering_nvc0.cpp | 3
src/gallium/drivers/nvc0/nvc0_context.c | 1
src/gallium/drivers/nvc0/nvc0_context.h | 3
src/gallium/drivers/nvc0/nvc0_state_validate.c | 6
src/gallium/drivers/nvc0/nvc0_surface.c | 11
src/gallium/state_trackers/gbm/Makefile.am | 1
src/gallium/winsys/radeon/drm/radeon_drm_winsys.c | 2
src/glsl/ast_to_hir.cpp | 33 ++
src/glsl/link_uniform_blocks.cpp | 17 +
src/glsl/link_uniforms.cpp | 56 +++-
src/glsl/linker.h | 15 +
src/glx/dri2_glx.c | 8
src/glx/dri_common.c | 12
src/glx/drisw_glx.c | 8
src/mesa/drivers/common/meta.c | 30 +-
src/mesa/drivers/dri/i965/brw_fs_fp.cpp | 8
src/mesa/drivers/dri/i965/brw_fs_visitor.cpp | 8
src/mesa/main/extensions.c | 1
src/mesa/main/fbobject.c | 69 ++++-
src/mesa/main/get_hash_params.py | 7
src/mesa/main/glheader.h | 6
src/mesa/main/version.h | 4
src/mesa/vbo/vbo_exec_array.c | 82 ++++--
36 files changed, 495 insertions(+), 117 deletions(-)
New commits:
commit cab49f395eab68a7a379a2a87a62cc8e26aa5197
Author: Maarten Lankhorst <maarten.lankhorst@canonical.com>
Date: Mon Oct 7 11:34:48 2013 +0200
release to sid
diff --git a/debian/changelog b/debian/changelog
index 0852808..4dfce39 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-mesa (9.1.7-1) UNRELEASED; urgency=low
+mesa (9.1.7-1) unstable; urgency=low
[ Andreas Beckmann ]
* libgl1-mesa-glx: Add Breaks: glx-diversions (<< 0.4) because the old
@@ -7,7 +7,7 @@ mesa (9.1.7-1) UNRELEASED; urgency=low
[ Maarten Lankhorst ]
* New upstream release.
- -- Andreas Beckmann <anbe@debian.org> Sun, 18 Aug 2013 10:50:28 +0200
+ -- Maarten Lankhorst <maarten.lankhorst@ubuntu.com> Mon, 07 Oct 2013 11:34:34 +0200
mesa (9.1.6-2) unstable; urgency=low
commit 3db9084deaccafc0348a1d7ea2b63754c2d949b6
Author: Maarten Lankhorst <maarten.lankhorst@canonical.com>
Date: Mon Oct 7 11:30:15 2013 +0200
New upstream release.
diff --git a/debian/changelog b/debian/changelog
index 9d03373..0852808 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,12 @@
-mesa (9.1.6-3) UNRELEASED; urgency=low
+mesa (9.1.7-1) UNRELEASED; urgency=low
+ [ Andreas Beckmann ]
* libgl1-mesa-glx: Add Breaks: glx-diversions (<< 0.4) because the old
versions were not aware of libGL.so.1.2.0. (Closes: #720069)
+ [ Maarten Lankhorst ]
+ * New upstream release.
+
-- Andreas Beckmann <anbe@debian.org> Sun, 18 Aug 2013 10:50:28 +0200
mesa (9.1.6-2) unstable; urgency=low
commit 3d3cada9c1a00c75b82798cd424fcb01694e2fd7
Author: Carl Worth <cworth@cworth.org>
Date: Fri Oct 4 21:27:12 2013 -0700
docs: Add md5sums for 9.1.7 release files.
Now that they've been generated, we can do this.
diff --git a/docs/relnotes-9.1.7.html b/docs/relnotes-9.1.7.html
index 851c39b..57a786f 100644
--- a/docs/relnotes-9.1.7.html
+++ b/docs/relnotes-9.1.7.html
@@ -30,7 +30,9 @@ because GL_ARB_compatibility is not supported.
<h2>MD5 checksums</h2>
<pre>
-TBA
+9e4abf7b7a6db762012c3c9917a8e8c7 MesaLib-9.1.7.tar.bz2
+f1d4d479d6ce12b9566fdb379960a912 MesaLib-9.1.7.tar.gz
+abd612bfc5dd478d04fcc630dd7672f2 MesaLib-9.1.7.zip
</pre>
<h2>New features</h2>
commit 7d4a1f508b482f40a831c4e411b53a24e4a0c330
Author: Carl Worth <cworth@cworth.org>
Date: Fri Oct 4 21:19:29 2013 -0700
Revert "radeon/winsys: pad IBs to a multiple of 8 DWs"
This reverts commit 4a8d1c5ef2f9c57a3c2feb829be3534ac43b9077.
This commit causes compilation failures ("'SI' undeclared"), which,
embarrassingly enough, I failed to notice earlier.
diff --git a/src/gallium/winsys/radeon/drm/radeon_drm_cs.c b/src/gallium/winsys/radeon/drm/radeon_drm_cs.c
index 007d129..6a7115b 100644
--- a/src/gallium/winsys/radeon/drm/radeon_drm_cs.c
+++ b/src/gallium/winsys/radeon/drm/radeon_drm_cs.c
@@ -455,36 +455,6 @@ static void radeon_drm_cs_flush(struct radeon_winsys_cs *rcs, unsigned flags)
struct radeon_drm_cs *cs = radeon_drm_cs(rcs);
struct radeon_cs_context *tmp;
- switch (cs->base.ring_type) {
- case RING_DMA:
- /* pad DMA ring to 8 DWs */
- if (cs->ws->info.chip_class <= SI) {
- while (rcs->cdw & 7)
- OUT_CS(&cs->base, 0xf0000000); /* NOP packet */
- } else {
- while (rcs->cdw & 7)
- OUT_CS(&cs->base, 0x00000000); /* NOP packet */
- }
- break;
- case RING_GFX:
- /* pad DMA ring to 8 DWs to meet CP fetch alignment requirements
- * r6xx, requires at least 4 dw alignment to avoid a hw bug.
- */
- if (flags & RADEON_FLUSH_COMPUTE) {
- if (cs->ws->info.chip_class <= SI) {
- while (rcs->cdw & 7)
- OUT_CS(&cs->base, 0x80000000); /* type2 nop packet */
- } else {
- while (rcs->cdw & 7)
- OUT_CS(&cs->base, 0xffff1000); /* type3 nop packet */
- }
- } else {
- while (rcs->cdw & 7)
- OUT_CS(&cs->base, 0x80000000); /* type2 nop packet */
- }
- break;
- }
-
if (rcs->cdw > RADEON_MAX_CMDBUF_DWORDS) {
fprintf(stderr, "radeon: command stream overflowed\n");
}
commit 08ffe9c541850c7bc0716fe6cf8461448e9da8af
Author: Carl Worth <cworth@cworth.org>
Date: Fri Oct 4 21:10:59 2013 -0700
doc: Add releases notes for the upcoming 9.1.7 release.
Complete except for the md5sums, (which we cannot have generated yet).
diff --git a/docs/relnotes-9.1.7.html b/docs/relnotes-9.1.7.html
new file mode 100644
index 0000000..851c39b
--- /dev/null
+++ b/docs/relnotes-9.1.7.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.7 Release Notes / October 4, 2013</h1>
+
+<p>
+Mesa 9.1.7 is a bug fix release which fixes bugs found since the 9.1.6 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>
+TBA
+</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=55503";>Bug 55503</a> - Constant vertex attributes broken</li>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=61635";>Bug 61635</a> - glVertexAttribPointer(id, GL_UNSIGNED_BYTE, GL_FALSE,...) does not work</li>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=65958";>Bug 65958</a> - GPU Lockup on Trinity 7500G</li>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=66292";>Bug 66292</a> - [SNB/IVB/HSW Bisected]Ogles3conform GL3Tests_depth24_depth24_basic.test fail</li>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=67548";>Bug 67548</a> - glGetAttribLocation seems to be broken</li>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=68195";>Bug 68195</a> - piglit tests vs-struct-pad and fs-struct-pad both fail</li>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=68250";>Bug 68250</a> - Automatic mipmap generation with texture compression produces borders that fade to black</li>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=69525";>Bug 69525</a> - [GM45, bisected] Piglit tex-shadow2drect fails</li>
+
+</ul>
+
+
+<h2>Changes</h2>
+
+<p>Alex Deucher (2):</p>
+<ul>
+ <li>r600g: disable GPUVM by default</li>
+ <li>radeon/winsys: pad IBs to a multiple of 8 DWs</li>
+</ul>
+
+<p>Andreas Boll (2):</p>
+<ul>
+ <li>docs: Fix a typo in the 9.1.6 release notes</li>
+ <li>mesa: Fix MESA_PATCH version</li>
+</ul>
+
+<p>Anuj Phogat (1):</p>
+<ul>
+ <li>meta: Fix blitting a framebuffer with renderbuffer attachment</li>
+</ul>
+
+<p>Carl Worth (5):</p>
+<ul>
+ <li>docs: Add 9.1.6 release md5sums</li>
+ <li>Use -Bsymbolic when linking libEGL.so</li>
+ <li>Update get-pick-list to look specifically for "9.1" in NOTE</li>
+ <li>cherry-ignore: Ignore last two patches in current get-pick-list output</li>
+ <li>Bump version to 9.1.7</li>
+</ul>
+
+<p>Chris Forbes (1):</p>
+<ul>
+ <li>i965/fs: Gen4: Zero out extra coordinates when using shadow compare</li>
+</ul>
+
+<p>Emil Velikov (2):</p>
+<ul>
+ <li>nv50: handle pure integer vertex attributes</li>
+ <li>nouveau: initialise the nouveau_transfer maps</li>
+</ul>
+
+<p>Eric Anholt (1):</p>
+<ul>
+ <li>i965/gen4: Fix fragment program rectangle texture shadow compares.</li>
+</ul>
+
+<p>Ian Romanick (11):</p>
+<ul>
+ <li>mesa: Remove stray debug printfs in attachment completeness code</li>
+ <li>mesa: Validate the layer selection of an array texture too</li>
+ <li>mesa/vbo: Fix handling of attribute 0 in non-compatibilty contexts</li>
+ <li>glsl: Add new overload of program_resource_visitor::visit_field method</li>
+ <li>glsl: Use alignment of container record for its first field</li>
+ <li>mesa: Remove all traces of GL_OES_matrix_get</li>
+ <li>mesa: Don't call driver RenderTexture for really broken textures</li>
+ <li>mesa: Don't call driver RenderTexture for invalid zoffset</li>
+ <li>mesa: Generate a renderbuffer wrapper even if the texture has no image</li>
+ <li>glsl: Move and refine test for unsized arrays in GLSL ES</li>
+ <li>mesa: Don't return any data for GL_SHADER_BINARY_FORMATS</li>
+</ul>
+
+<p>Ilia Mirkin (2):</p>
+<ul>
+ <li>nv30: U8_USCALED only works for size 4</li>
+ <li>nv30: remove no-longer-used formats from table</li>
+</ul>
+
+<p>Joakim Sindholt (1):</p>
+<ul>
+ <li>nvc0: fix blitctx memory leak</li>
+</ul>
+
+<p>Johannes Obermayr (1):</p>
+<ul>
+ <li>st/gbm: Add $(WAYLAND_CFLAGS) for HAVE_EGL_PLATFORM_WAYLAND.</li>
+</ul>
+
+<p>Kenneth Graunke (1):</p>
+<ul>
+ <li>meta: Set correct viewport and projection in decompress_texture_image.</li>
+</ul>
+
+<p>Maarten Lankhorst (1):</p>
+<ul>
+ <li>nvc0: restore viewport after blit</li>
+</ul>
+
+<p>Rico Schüller (1):</p>
+<ul>
+ <li>glx: Initialize OpenGL version to 1.0</li>
+</ul>
+
+<p>Tiziano Bacocco (1):</p>
+<ul>
+ <li>nvc0/ir: fix use after free in texture barrier insertion pass</li>
+</ul>
+
+<p>Torsten Duwe (1):</p>
+<ul>
+ <li>wayland-egl.pc requires wayland-client.pc.</li>
+</ul>
+
+</div>
+</body>
+</html>
commit b91b957208a16d4b30d436f5a2a4664bb530b54f
Author: Carl Worth <cworth@cworth.org>
Date: Fri Oct 4 20:56:52 2013 -0700
Bump version to 9.1.7
Even remembering to fix MESA_PATCH this time, (which I had missed in the bump
to 9.1.6).
diff --git a/Makefile.am b/Makefile.am
index fba8556..5ac892a 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -36,7 +36,7 @@ check-local:
# Rules for making release tarballs
-PACKAGE_VERSION=9.1.6
+PACKAGE_VERSION=9.1.7
PACKAGE_DIR = Mesa-$(PACKAGE_VERSION)
PACKAGE_NAME = MesaLib-$(PACKAGE_VERSION)
diff --git a/configure.ac b/configure.ac
index 550ee05..06bd302 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.6],
+AC_INIT([Mesa], [9.1.7],
[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 27eb76d..c6d3f23 100644
--- a/src/mesa/main/version.h
+++ b/src/mesa/main/version.h
@@ -34,8 +34,8 @@ struct gl_context;
/* Mesa version */
#define MESA_MAJOR 9
#define MESA_MINOR 1
-#define MESA_PATCH 6
-#define MESA_VERSION_STRING "9.1.6"
+#define MESA_PATCH 7
+#define MESA_VERSION_STRING "9.1.7"
/* To make version comparison easy */
#define MESA_VERSION(a,b,c) (((a) << 16) + ((b) << 8) + (c))
commit ca2e6012ebd2c5904647a91ca690e5e05c9e649c
Author: Ian Romanick <ian.d.romanick@intel.com>
Date: Thu Sep 5 12:47:13 2013 -0700
mesa: Don't return any data for GL_SHADER_BINARY_FORMATS
We return 0 for GL_NUM_SHADER_BINARY_FORMATS, so
GL_SHADER_BINARY_FORMATS should not write any data to the application
buffer.
Fixes piglit test 'arb_get_program_binary-overrun shader'.
Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
Reviewed-by: Matt Turner <mattst88@gmail.com>
(cherry picked from commit 0667e2c969c0931a1feee530508f8441a11bda32)
diff --git a/src/mesa/main/get_hash_params.py b/src/mesa/main/get_hash_params.py
index bc710ec..1f4a069 100644
--- a/src/mesa/main/get_hash_params.py
+++ b/src/mesa/main/get_hash_params.py
@@ -303,7 +303,7 @@ descriptor=[
[ "MAX_VERTEX_UNIFORM_VECTORS", "LOC_CUSTOM, TYPE_INT, 0, extra_ARB_ES2_compatibility_api_es2" ],
[ "MAX_FRAGMENT_UNIFORM_VECTORS", "LOC_CUSTOM, TYPE_INT, 0, extra_ARB_ES2_compatibility_api_es2" ],
[ "NUM_SHADER_BINARY_FORMATS", "CONST(0), extra_ARB_ES2_compatibility_api_es2" ],
- [ "SHADER_BINARY_FORMATS", "CONST(0), extra_ARB_ES2_compatibility_api_es2" ],
+ [ "SHADER_BINARY_FORMATS", "LOC_CUSTOM, TYPE_INVALID, 0, extra_ARB_ES2_compatibility_api_es2" ],
# GL_ARB_get_program_binary / GL_OES_get_program_binary
[ "NUM_PROGRAM_BINARY_FORMATS", "CONST(0), extra_ARB_shader_objects" ],
commit 32b28b0c172abb14c8fe5b81b141865c5557653e
Author: Torsten Duwe <duwe@suse.de>
Date: Tue Sep 10 23:36:48 2013 +0200
wayland-egl.pc requires wayland-client.pc.
Mesa provides the wayland-egl libs and the pkgconfig file, but the headers
originate from the wayland package. Ensure everything matches, by requiring
application builds to look at the wayland headers as well.
Signed-off-by: Torsten Duwe <duwe@suse.de>
Signed-off-by: Johannes Obermayr <johannesobermayr@gmx.de>
(cherry picked from commit 3bc642cbf69b3ba71fc636d6120fc7ac0b83aecb)
diff --git a/src/egl/wayland/wayland-egl/wayland-egl.pc.in b/src/egl/wayland/wayland-egl/wayland-egl.pc.in
index f8a8df2..8a40cfa 100644
--- a/src/egl/wayland/wayland-egl/wayland-egl.pc.in
+++ b/src/egl/wayland/wayland-egl/wayland-egl.pc.in
@@ -6,5 +6,6 @@ includedir=@includedir@
Name: wayland-egl
Description: Mesa wayland-egl library
Version: @VERSION@
+Requires: wayland-client
Libs: -L${libdir} -lwayland-egl
Cflags: -I${includedir}
commit 15204c38404a1b4c1e89076ac0a55b0dd45982a3
Author: Johannes Obermayr <johannesobermayr@gmx.de>
Date: Tue Sep 10 23:36:47 2013 +0200
st/gbm: Add $(WAYLAND_CFLAGS) for HAVE_EGL_PLATFORM_WAYLAND.
(cherry picked from commit 87ebbe1270e203259f6036edc1d846f77fdfa61b)
diff --git a/src/gallium/state_trackers/gbm/Makefile.am b/src/gallium/state_trackers/gbm/Makefile.am
index 70c5f77..b113d0d 100644
--- a/src/gallium/state_trackers/gbm/Makefile.am
+++ b/src/gallium/state_trackers/gbm/Makefile.am
@@ -27,6 +27,7 @@ AM_CPPFLAGS = \
-I$(top_srcdir)/src/gbm/main \
-I$(top_srcdir)/include
if HAVE_EGL_PLATFORM_WAYLAND
+AM_CFLAGS += $(WAYLAND_CFLAGS)
AM_CPPFLAGS += -DHAVE_WAYLAND_PLATFORM
endif
commit d227751144548e9e32c6d20dfb69287696e8f655
Author: Kenneth Graunke <kenneth@whitecape.org>
Date: Thu Aug 22 01:29:11 2013 -0700
meta: Set correct viewport and projection in decompress_texture_image.
_mesa_meta_begin() sets up an orthographic project and initializes the
viewport based on the current drawbuffer's width and height. This is
likely the window size, since it occurs before the meta operation binds
any temporary buffers.
decompress_texture_image needs the viewport to be the size of the image
it's trying to draw. Otherwise, it may only draw part of the image.
v2: Actually set the projection properly too.
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=68250
Signed-off-by: Kenneth Graunke <kenneth@whitecape.org>
Cc: Mak Nazecic-Andrlon <owlberteinstein@gmail.com>
(cherry picked from commit 62411681da4d1b7f9417f34dbf92a3e79e24dc09)
diff --git a/src/mesa/drivers/common/meta.c b/src/mesa/drivers/common/meta.c
index 151da84..526c88f 100644
--- a/src/mesa/drivers/common/meta.c
+++ b/src/mesa/drivers/common/meta.c
@@ -3956,6 +3956,11 @@ decompress_texture_image(struct gl_context *ctx,
verts[3].x = 0.0F;
verts[3].y = height;
+ _mesa_MatrixMode(GL_PROJECTION);
+ _mesa_LoadIdentity();
+ _mesa_Ortho(0.0, width, 0.0, height, -1.0, 1.0);
+ _mesa_set_viewport(ctx, 0, 0, width, height);
+
/* upload new vertex data */
_mesa_BufferSubData(GL_ARRAY_BUFFER_ARB, 0, sizeof(verts), verts);
commit 8c753e01e4e2a9e78c6bbf831fb29619073597d8
Author: Carl Worth <cworth@cworth.org>
Date: Fri Oct 4 14:04:37 2013 -0700
cherry-ignore: Ignore last two patches in current get-pick-list output
Neither of these are suitable for 9.1 for now. For both patches, the original
authors of the patch have been emailed.
diff --git a/bin/.cherry-ignore b/bin/.cherry-ignore
index be95f17..c85e062 100644
--- a/bin/.cherry-ignore
+++ b/bin/.cherry-ignore
@@ -64,3 +64,9 @@ a3dcab43c6b6fed2f35aa0e802be6398985f100c clover: Pass corresponding module::argu
829caf410e2c2c6f79902199da5a7900abc16129 clover: Byte-swap kernel arguments when host and device endianness differ.
f64c0ca692d3e8c78dd9ae1f015f58f1dfc1c760 clover: Extend kernel arguments for differing host and device data types.
df530829f757a8968389427eb26f45a0d46623fa clover: Respect kernel argument alignment restrictions.
+
+# Memory leak being fixed doesn't exist in 9.1 (as far as I can tell)
+035bf2198368d3fa69387788a63039d71319f0bf i915,i965: Fix memory leak in try_pbo_upload (v2)
+
+# This commit depends on other, unspecified commits (does not compile alone)
+d38765f3c8fbd473b949177cc9698b2cd459902c mesa: Support GL_MAX_VERTEX_OUTPUT_COMPONENTS query with ES3
commit a6b6ad7d172700cd970fee12d83b72abf67f3e79
Author: Carl Worth <cworth@cworth.org>
Date: Fri Oct 4 13:52:46 2013 -0700
Update get-pick-list to look specifically for "9.1" in NOTE
We previously adjusted this script so that the new-style markup, (with CC)
would only trigger if it specifically mentioned "9.1", but the old-style
markup (with "NOTE:") was always triggering. Fix it to look for "9.1" as well.
This removes several patches from the current output.
diff --git a/bin/get-pick-list.sh b/bin/get-pick-list.sh
index 0409341..2a5c457 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:.*9\.1.*mesa-stable\)' HEAD..origin/master |\
+git log --reverse --pretty=%H -i --grep='^\([[:space:]]*NOTE: .*[Cc]andidate.*9\.1\|CC:.*9\.1.*mesa-stable\)' HEAD..origin/master |\
while read sha
do
# Check to see whether the patch is on the ignore list.
commit 68473d07d44835dad202597ee7957663f81808d2
Author: Rico Schüller <kgbricola@web.de>
Date: Sun Sep 1 21:30:19 2013 +0200
glx: Initialize OpenGL version to 1.0
The old code in dri2_glx suffered from a typographical error that caused
the default version to be 2.1 instead of 1.2 (minimum required by the
Linux OpenGL ABI). drisw_glx had a similar error resulting in a default
version of 0.1.
Some driver/card combinations (r200/RV280, i915/915G) don't support
OpenGL 2.1. These create in some corner cases an indirect context
instead of a direct context when calling glXCreateContextAttribsARB().
This happens because of a bad default value. To avoid this, just used
the default value specified by the GLX_ARB_create_context specification:
"The default values for GLX_CONTEXT_MAJOR_VERSION_ARB and
GLX_CONTEXT_MINOR_VERSION_ARB are 1 and 0 respectively. In this
case, implementations will typically return the most recent version
of OpenGL they support which is backwards compatible with OpenGL 1.0
(e.g. 3.0, 3.1 + GL_ARB_compatibility, or 3.2 compatibility
profile)"
Refactor all the default value setting to dri2_convert_glx_attribs, and
make sure the correct defaults are set in that one place.
Signed-off-by: Rico Schüller <kgbricola@web.de>
Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
Bugzilla http://bugs.winehq.org/show_bug.cgi?id=34238
Cc: "9.1 9.2" <mesa-stable@lists.freedesktop.org>
(cherry picked from commit 8b302e1635534bfc6ed3ad671f2428470b3a765d)
Conflicts:
src/glx/dri2_glx.c
src/glx/dri_common.c
src/glx/drisw_glx.c
diff --git a/src/glx/dri2_glx.c b/src/glx/dri2_glx.c
index 1b636cd..6853801 100644
--- a/src/glx/dri2_glx.c
+++ b/src/glx/dri2_glx.c
@@ -254,11 +254,11 @@ dri2_create_context_attribs(struct glx_screen *base,
__GLXDRIconfigPrivate *config = (__GLXDRIconfigPrivate *) config_base;
__DRIcontext *shared = NULL;
- uint32_t minor_ver = 1;
- uint32_t major_ver = 2;
- uint32_t flags = 0;
+ uint32_t minor_ver;
+ uint32_t major_ver;
+ uint32_t flags;
unsigned api;
- int reset = __DRI_CTX_RESET_NO_NOTIFICATION;
+ int reset;
uint32_t ctx_attribs[2 * 5];
unsigned num_ctx_attribs = 0;
diff --git a/src/glx/dri_common.c b/src/glx/dri_common.c
index 1bf20ec..37c72f4 100644
--- a/src/glx/dri_common.c
+++ b/src/glx/dri_common.c
@@ -465,8 +465,13 @@ dri2_convert_glx_attribs(unsigned num_attribs, const uint32_t *attribs,
uint32_t profile;
int render_type = GLX_RGBA_TYPE;
+ *major_ver = 1;
+ *minor_ver = 0;
+ *reset = __DRI_CTX_RESET_NO_NOTIFICATION;
+ *flags = 0;
+ *api = __DRI_API_OPENGL;
+
if (num_attribs == 0) {
- *api = __DRI_API_OPENGL;
return true;
}
@@ -477,10 +482,6 @@ dri2_convert_glx_attribs(unsigned num_attribs, const uint32_t *attribs,
return false;
}
- *major_ver = 1;
- *minor_ver = 0;
- *reset = __DRI_CTX_RESET_NO_NOTIFICATION;
-
for (i = 0; i < num_attribs; i++) {
switch (attribs[i * 2]) {
case GLX_CONTEXT_MAJOR_VERSION_ARB:
@@ -520,7 +521,6 @@ dri2_convert_glx_attribs(unsigned num_attribs, const uint32_t *attribs,
}
}
- *api = __DRI_API_OPENGL;
if (!got_profile) {
if (*major_ver > 3 || (*major_ver == 3 && *minor_ver >= 2))
*api = __DRI_API_OPENGL_CORE;
diff --git a/src/glx/drisw_glx.c b/src/glx/drisw_glx.c
index 832e964..1fd7ee9 100644
--- a/src/glx/drisw_glx.c
+++ b/src/glx/drisw_glx.c
@@ -427,11 +427,11 @@ drisw_create_context_attribs(struct glx_screen *base,
struct drisw_screen *psc = (struct drisw_screen *) base;
__DRIcontext *shared = NULL;
- uint32_t minor_ver = 1;
- uint32_t major_ver = 0;
- uint32_t flags = 0;
+ uint32_t minor_ver;
+ uint32_t major_ver;
+ uint32_t flags;
unsigned api;
- int reset = __DRI_CTX_RESET_NO_NOTIFICATION;
+ int reset;
uint32_t ctx_attribs[2 * 4];
unsigned num_ctx_attribs = 0;
commit 5bddd3f3921262923c145425a12cc3ae4f687ce9
Author: Ian Romanick <ian.d.romanick@intel.com>
Date: Thu Aug 8 17:23:01 2013 -0700
glsl: Move and refine test for unsized arrays in GLSL ES
GLSL ES does not allow unsized arrays, and GLSL ES 1.00 does not allow
array initializers. However, GLSL ES 3.00 allows array initializers,
and the initializer can explicitly size the array. The specification
even includes some examples of this:
float x[] = float[2] (1.0, 2.0); // declares an array of size 2
float y[] = float[] (1.0, 2.0, 3.0); // declares an array of size 3
float a[5];
float b[] = a;
Move the unsized array check to after the initializer has been
processed. If the array is still unsized, generate the error. This
should have no effect in GLSL ES 1.00 because, as previously mentioned,
array initializers are not allowed.
Fixes piglit "glsl-es-3.00 compiler array-sized-by-initializer.vert".
Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
Cc: "9.1 9.2" <mesa-stable@lists.freedesktop.org>
(cherry picked from commit 42624b1c8145375f987e380bb78456658f845a17)
Conflicts:
src/glsl/ast_to_hir.cpp
diff --git a/src/glsl/ast_to_hir.cpp b/src/glsl/ast_to_hir.cpp
index b40ce41..7c1b51a 100644
--- a/src/glsl/ast_to_hir.cpp
+++ b/src/glsl/ast_to_hir.cpp
@@ -1904,12 +1904,6 @@ process_array_type(YYLTYPE *loc, const glsl_type *base, ast_node *array_size,
}
}
}
- } else if (state->es_shader) {
- /* Section 10.17 of the GLSL ES 1.00 specification states that unsized
- * array declarations have been removed from the language.
- */
- _mesa_glsl_error(loc, state, "unsized array declarations are not "
- "allowed in GLSL ES 1.00.");
}
return glsl_type::get_array_instance(base, length);
@@ -3040,6 +3034,33 @@ ast_declarator_list::hir(exec_list *instructions,
decl->identifier);
}
+ if (state->es_shader) {
+ const glsl_type *const t = (earlier == NULL)
+ ? var->type : earlier->type;
+
+ if (t->is_array() && t->length == 0)
+ /* Section 10.17 of the GLSL ES 1.00 specification states that
+ * unsized array declarations have been removed from the language.
+ * Arrays that are sized using an initializer are still explicitly
+ * sized. However, GLSL ES 1.00 does not allow array
+ * initializers. That is only allowed in GLSL ES 3.00.
+ *
+ * Section 4.1.9 (Arrays) of the GLSL ES 3.00 spec says:
+ *
+ * "An array type can also be formed without specifying a size
+ * if the definition includes an initializer:
+ *
+ * float x[] = float[2] (1.0, 2.0); // declares an array of size 2
+ * float y[] = float[] (1.0, 2.0, 3.0); // declares an array of size 3
+ *
+ * float a[5];
+ * float b[] = a;"
+ */
+ _mesa_glsl_error(& loc, state,
+ "unsized array declarations are not allowed in "
+ "GLSL ES");
+ }
+
/* If the declaration is not a redeclaration, there are a few additional
* semantic checks that must be applied. In addition, variable that was
* created for the declaration should be added to the IR stream.
commit 64d3c2b7d5c6d81d0c83340bc53f9b17bd2170ac
Author: Ian Romanick <ian.d.romanick@intel.com>
Date: Sun Jul 28 13:08:27 2013 -0700
mesa: Generate a renderbuffer wrapper even if the texture has no image
This prevents a segfault in check_begin_texture_render when an FBO is
rebound while in this state. This fixes the piglit test
fbo-incomplete-invalid-texture.
Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
Acked-by: Kenneth Graunke <kenneth@whitecape.org>
Cc: "9.1 9.2" mesa-stable@lists.freedesktop.org
(cherry picked from commit 2f9fe2d80a35b8857682771fddbee628213da7b3)
Conflicts:
src/mesa/main/fbobject.c
diff --git a/src/mesa/main/fbobject.c b/src/mesa/main/fbobject.c
index 07bebe1..434e47a 100644
--- a/src/mesa/main/fbobject.c
+++ b/src/mesa/main/fbobject.c
@@ -385,8 +385,6 @@ _mesa_update_texture_renderbuffer(struct gl_context *ctx,
struct gl_renderbuffer *rb;
texImage = _mesa_get_attachment_teximage(att);
- if (!texImage)
- return;
rb = att->Renderbuffer;
if (!rb) {
@@ -405,6 +403,9 @@ _mesa_update_texture_renderbuffer(struct gl_context *ctx,
rb->NeedsFinishRenderTexture = ctx->Driver.FinishRenderTexture != NULL;
}
+ if (!texImage)
+ return;
+
if (driver_RenderTexture_is_safe(att))
ctx->Driver.RenderTexture(ctx, fb, att);
}
commit b10122ac03917f0e6edcecc8486d4de406e8849c
Author: Ian Romanick <ian.d.romanick@intel.com>
Date: Sat Jul 27 12:16:56 2013 -0700
mesa: Don't call driver RenderTexture for invalid zoffset
This fixes the segfault in the 'invalid slice of 3D texture' and
'invalid layer of an array texture' subtests of piglit's fbo-incomplete
test.
The 'invalid layer of an array texture' subtest still fails.
v2: Fix off-by-one comparison error noticed by Chris Forbes. Also,
1D_ARRAY textures have Depth == 1. Instead, compare against Height.
Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org> [v1]
Cc: "9.1 9.2" mesa-stable@lists.freedesktop.org
(cherry picked from commit 41485fea7c6061cca9d2706f39fa425da291b260)
diff --git a/src/mesa/main/fbobject.c b/src/mesa/main/fbobject.c
index 62a3728..07bebe1 100644
--- a/src/mesa/main/fbobject.c
+++ b/src/mesa/main/fbobject.c
@@ -355,6 +355,12 @@ driver_RenderTexture_is_safe(const struct gl_renderbuffer_attachment *att)
if (texImage->Width == 0 || texImage->Height == 0 || texImage->Depth == 0)
return false;
+ if ((texImage->TexObject->Target == GL_TEXTURE_1D_ARRAY
+ && att->Zoffset >= texImage->Height)
+ || (texImage->TexObject->Target != GL_TEXTURE_1D_ARRAY
+ && att->Zoffset >= texImage->Depth))
+ return false;
+
return true;
}
commit 398c705c3d75bb3b9223eb676ce84a296b302a5a
Author: Ian Romanick <ian.d.romanick@intel.com>
Date: Sat Jul 27 12:04:20 2013 -0700
mesa: Don't call driver RenderTexture for really broken textures
This fixes the segfault in the '0x0 texture' subtest of piglit's
fbo-incomplete test.
Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
Cc: "9.1 9.2" mesa-stable@lists.freedesktop.org
(cherry picked from commit fb49713f8ed099559d255403dc1065a06305e0d8)
Conflicts:
src/mesa/main/fbobject.c
diff --git a/src/mesa/main/fbobject.c b/src/mesa/main/fbobject.c
index 0701e85..62a3728 100644
--- a/src/mesa/main/fbobject.c
+++ b/src/mesa/main/fbobject.c
@@ -343,6 +343,22 @@ _mesa_remove_attachment(struct gl_context *ctx,
}
/**
+ * Verify a couple error conditions that will lead to an incomplete FBO and
+ * may cause problems for the driver's RenderTexture path.
+ */
+static bool
+driver_RenderTexture_is_safe(const struct gl_renderbuffer_attachment *att)
+{
+ const struct gl_texture_image *const texImage =
+ att->Texture->Image[att->CubeMapFace][att->TextureLevel];
+
+ if (texImage->Width == 0 || texImage->Height == 0 || texImage->Depth == 0)
+ return false;
+
+ return true;
+}
+
+/**
* Create a renderbuffer which will be set up by the driver to wrap the
* texture image slice.
*
@@ -383,7 +399,8 @@ _mesa_update_texture_renderbuffer(struct gl_context *ctx,
rb->NeedsFinishRenderTexture = ctx->Driver.FinishRenderTexture != NULL;
}
- ctx->Driver.RenderTexture(ctx, fb, att);
+ if (driver_RenderTexture_is_safe(att))
+ ctx->Driver.RenderTexture(ctx, fb, att);
}
/**
@@ -1785,7 +1802,8 @@ check_begin_texture_render(struct gl_context *ctx, struct gl_framebuffer *fb)
for (i = 0; i < BUFFER_COUNT; i++) {
struct gl_renderbuffer_attachment *att = fb->Attachment + i;
- if (att->Texture && _mesa_get_attachment_teximage(att)) {
+ if (att->Texture && _mesa_get_attachment_teximage(att)
+ && driver_RenderTexture_is_safe(att)) {
ctx->Driver.RenderTexture(ctx, fb, att);
}
}
commit c6d5d39147c39833480fb644a56e6e38cd1d9335
Author: Ian Romanick <ian.d.romanick@intel.com>
Date: Fri Sep 13 11:31:00 2013 -0500
mesa: Remove all traces of GL_OES_matrix_get
I believe this extension was enabled by accident. As far as I can tell,
there has never been any code in Mesa to actually support it. Not only
that, this extension is only useful in the common-lite profile, and Mesa
does the common profile.
This "fixes" the piglit test oes_matrix_get-api.
Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
Cc: "9.1 9.2" <mesa-stable@lists.freedesktop.org>
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
(cherry picked from commit 3e1fdf389918b3488f06116c1837594d469dbaa2)
diff --git a/src/mesa/main/extensions.c b/src/mesa/main/extensions.c
index a827832..bb2482f 100644
--- a/src/mesa/main/extensions.c
+++ b/src/mesa/main/extensions.c
@@ -257,7 +257,6 @@ static const struct extension extension_table[] = {
{ "GL_OES_framebuffer_object", o(EXT_framebuffer_object), ES1, 2005 },
{ "GL_OES_get_program_binary", o(ARB_shader_objects), ES2, 2008 },
{ "GL_OES_mapbuffer", o(dummy_true), ES1 | ES2, 2005 },
- { "GL_OES_matrix_get", o(dummy_true), ES1, 2004 },
{ "GL_OES_packed_depth_stencil", o(EXT_packed_depth_stencil), ES1 | ES2, 2007 },
{ "GL_OES_point_size_array", o(dummy_true), ES1, 2004 },
{ "GL_OES_point_sprite", o(ARB_point_sprite), ES1, 2004 },
diff --git a/src/mesa/main/get_hash_params.py b/src/mesa/main/get_hash_params.py
index 451d870..bc710ec 100644
--- a/src/mesa/main/get_hash_params.py
+++ b/src/mesa/main/get_hash_params.py
@@ -229,11 +229,6 @@ descriptor=[
{ "apis": ["GLES"], "params": [
-# XXX: OES_matrix_get
- [ "MODELVIEW_MATRIX_FLOAT_AS_INT_BITS_OES", "" ],
- [ "PROJECTION_MATRIX_FLOAT_AS_INT_BITS_OES", "" ],
- [ "TEXTURE_MATRIX_FLOAT_AS_INT_BITS_OES", "" ],
-
# OES_point_size_array
[ "POINT_SIZE_ARRAY_OES", "ARRAY_FIELD(VertexAttrib[VERT_ATTRIB_POINT_SIZE].Enabled, TYPE_BOOLEAN)" ],
[ "POINT_SIZE_ARRAY_TYPE_OES", "ARRAY_FIELD(VertexAttrib[VERT_ATTRIB_POINT_SIZE].Type, TYPE_ENUM)" ],
diff --git a/src/mesa/main/glheader.h b/src/mesa/main/glheader.h
index e93ca30..8c25899 100644
--- a/src/mesa/main/glheader.h
+++ b/src/mesa/main/glheader.h
@@ -119,12 +119,6 @@ typedef void *GLeglImageOES;
#define GL_PALETTE8_RGB5_A1_OES 0x8B99
#endif
-#ifndef GL_OES_matrix_get
-#define GL_MODELVIEW_MATRIX_FLOAT_AS_INT_BITS_OES 0x898D
-#define GL_PROJECTION_MATRIX_FLOAT_AS_INT_BITS_OES 0x898E
-#define GL_TEXTURE_MATRIX_FLOAT_AS_INT_BITS_OES 0x898F
-#endif
-
#ifndef GL_ES_VERSION_2_0
#define GL_SHADER_BINARY_FORMATS 0x8DF8
#define GL_NUM_SHADER_BINARY_FORMATS 0x8DF9
commit 66f8724ef4d3aecce2661fd79412bdc4f2090fdc
Author: Carl Worth <cworth@cworth.org>
Date: Fri Sep 27 14:01:48 2013 -0700
Use -Bsymbolic when linking libEGL.so
For some reason that I don't yet fully understand, Glaze does not work with
libEGL unless libEGL is linked with -Bsymbolic.[*]
Beyond that specific reason, all of the reasons for which libGL.so is linked
with -Bsymbolic, (see the commit history), should also apply here.
[*] The specific behavior I am seeing is that when Glaze calls dlopen for
libEGL.so, ifunc resolvers within Glaze for EGL functions are called before
the dlopen returns. These resolvers cannot succeed, as they need the return
value from dlopen in order to find the functions to resolve to. I don't know
what's causing these resolvers to be called, but I have verified that linking
libEGL with -Bsymbolic causes this problematic behavior to stop.
CC: "9.1 and 9.2" <mesa-stable@lists.freedesktop.org>
Reviewed-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Chad Versace <chad.versace@linux.intel.com>
(cherry picked from commit 9baf35de5cd4a0d832ee185afb709868fd55bc93)
diff --git a/src/egl/main/Makefile.am b/src/egl/main/Makefile.am
Reply to: