mesa: Changes to 'ubuntu'
Android.common.mk | 2
SConstruct | 2
configure.ac | 2
debian/changelog | 19 +-
docs/relnotes/9.2.1.html | 206 ++++++++++++++++++++++++++
src/egl/wayland/wayland-egl/wayland-egl.pc.in | 1
src/gallium/state_trackers/gbm/Makefile.am | 1
src/mesa/drivers/common/meta.c | 5
src/mesa/main/get_hash_params.py | 2
9 files changed, 228 insertions(+), 12 deletions(-)
New commits:
commit 9cf0f0fbeedd4ed2640f9263f3749c2c1afa060f
Author: Maarten Lankhorst <maarten.lankhorst@canonical.com>
Date: Mon Oct 7 11:09:52 2013 +0200
new upstream release
diff --git a/debian/changelog b/debian/changelog
index 0d2286e..253b2b6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,16 +1,19 @@
-mesa (9.2.1-1) experimental; urgency=low
-
- * New upstream release.
-
- -- Maarten Lankhorst <maarten.lankhorst@ubuntu.com> Mon, 07 Oct 2013 10:00:39 +0200
-
-mesa (9.2-1ubuntu4) UNRELEASED; urgency=low
+mesa (9.2.1-1ubuntu1) saucy; urgency=low
+ [ Robert Hooker ]
* Add i915-dont-default-to-2.1.patch: Stop defaulting to OpenGL 2.1 that is not
fully implemented in hardware on gen3 GPUs, the software fallbacks make Unity
unusably slow. (LP: #1222602)
+ [ Maarten Lankhorst ]
+ * New upstream bugfix release. (LP: #1232940)
+
+ -- Maarten Lankhorst <maarten.lankhorst@ubuntu.com> Mon, 07 Oct 2013 10:39:18 +0200
+
+mesa (9.2.1-1) experimental; urgency=low
- -- Robert Hooker <sarvatt@ubuntu.com> Tue, 01 Oct 2013 09:41:40 -0400
+ * New upstream release.
+
+ -- Maarten Lankhorst <maarten.lankhorst@ubuntu.com> Mon, 07 Oct 2013 10:00:39 +0200
mesa (9.2-1ubuntu3) saucy; urgency=low
commit 90d8635f644a2770ba58714b02152a7807d0c6fe
Author: Maarten Lankhorst <maarten.lankhorst@canonical.com>
Date: Mon Oct 7 10:00:49 2013 +0200
Release to experimental.
diff --git a/debian/changelog b/debian/changelog
index be49b4a..b33164c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,8 @@
-mesa (9.2.1-1) UNRELEASED; urgency=low
+mesa (9.2.1-1) experimental; urgency=low
* New upstream release.
- -- Maarten Lankhorst <maarten.lankhorst@ubuntu.com> Thu, 03 Oct 2013 12:21:49 +0200
+ -- Maarten Lankhorst <maarten.lankhorst@ubuntu.com> Mon, 07 Oct 2013 10:00:39 +0200
mesa (9.2-1) experimental; urgency=low
commit 78bb3ea8fb25027143a49c9b0dcf6505996fb4a9
Author: Maarten Lankhorst <maarten.lankhorst@canonical.com>
Date: Mon Oct 7 09:58:22 2013 +0200
New upstream release.
diff --git a/debian/changelog b/debian/changelog
index d26d403..be49b4a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,6 @@
mesa (9.2.1-1) UNRELEASED; urgency=low
- * Snapshot close to a new upstream release.
+ * New upstream release.
-- Maarten Lankhorst <maarten.lankhorst@ubuntu.com> Thu, 03 Oct 2013 12:21:49 +0200
commit fac3094fef8c58bc73173fafa524dae68d8cf5b2
Author: Brian Paul <brianp@vmware.com>
Date: Sat Oct 5 14:18:48 2013 -0600
docs: add missing <pre> tag
diff --git a/docs/relnotes/9.2.1.html b/docs/relnotes/9.2.1.html
index 6342fb4..f9909dd 100644
--- a/docs/relnotes/9.2.1.html
+++ b/docs/relnotes/9.2.1.html
@@ -30,6 +30,7 @@ because GL_ARB_compatibility is not supported.
<h2>MD5 checksums</h2>
+<pre>
e6cdfa84dfddd86e3d36ec7ff4b6478a MesaLib-9.2.1.tar.gz
dd4c82667d9c19c28a553b12eba3f8a0 MesaLib-9.2.1.tar.bz2
d9af0f5607f7d275793d293057ca9ac6 MesaLib-9.2.1.zip
commit 8c4c3d01ee4555d59aed6ab253c4aab4e265ceb0
Author: Carl Worth <cworth@cworth.org>
Date: Fri Oct 4 20:42:21 2013 -0700
docs: Add md5sums for 9.2.1 release
Which we could only do after creating the tar files, of course.
diff --git a/docs/relnotes/9.2.1.html b/docs/relnotes/9.2.1.html
index db08517..6342fb4 100644
--- a/docs/relnotes/9.2.1.html
+++ b/docs/relnotes/9.2.1.html
@@ -30,8 +30,9 @@ because GL_ARB_compatibility is not supported.
<h2>MD5 checksums</h2>
-<pre>
-TBA
+e6cdfa84dfddd86e3d36ec7ff4b6478a MesaLib-9.2.1.tar.gz
+dd4c82667d9c19c28a553b12eba3f8a0 MesaLib-9.2.1.tar.bz2
+d9af0f5607f7d275793d293057ca9ac6 MesaLib-9.2.1.zip
</pre>
commit 2c3aa1b4eec1e32a67a556e49fec7884421fd864
Author: Carl Worth <cworth@cworth.org>
Date: Fri Oct 4 17:01:00 2013 -0700
docs: Add release notes for 9.2.1 release
With the list of bugs fixed and a full list of changes.
diff --git a/docs/relnotes/9.2.1.html b/docs/relnotes/9.2.1.html
new file mode 100644
index 0000000..db08517
--- /dev/null
+++ b/docs/relnotes/9.2.1.html
@@ -0,0 +1,204 @@
+<!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.2.1 Release Notes / (October 4, 2013)</h1>
+
+<p>
+Mesa 9.2.1 is a bug fix release which fixes bugs found since the 9.2 release.
+</p>
+<p>
+Mesa 9.2 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=66779";>Bug 66779</a> - Use of uninitialized stack variable with brw_search_cache()</li>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=68233";>Bug 68233</a> - Valgrind errors in mesa</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=68637";>Bug 68637</a> - [Bisected IVB/HSW]Unigine demo crash</li>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=68753";>Bug 68753</a> - [regression bisected] GLSL ES: structs members can't have precision qualifiers anymore in 9.2</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>The full set of changes can be viewed by using the following GIT command:</p>
+
+<pre>
+ git log mesa-9.2..mesa-9.2.1
+</pre>
+
+
+<p>Alex Deucher (1):</p>
+<ul>
+ <li>radeon/winsys: pad IBs to a multiple of 8 DWs</li>
+</ul>
+
+<p>Andreas Boll (1):</p>
+<ul>
+ <li>os: First check for __GLIBC__ and then for PIPE_OS_BSD</li>
+</ul>
+
+<p>Anuj Phogat (1):</p>
+<ul>
+ <li>glsl: Allow precision qualifiers for sampler types</li>
+</ul>
+
+<p>Brian Paul (2):</p>
+<ul>
+ <li>docs: minor fixes for 9.2 release notes</li>
+ <li>mesa: check for bufSize > 0 in _mesa_GetSynciv()</li>
+</ul>
+
+<p>Carl Worth (3):</p>
+<ul>
+ <li>cherry-ignore: Ignore a commit which appeared twice on master</li>
+ <li>Use -Bsymbolic when linking libEGL.so</li>
+ <li>mesa: Bump version to 9.2.1</li>
+</ul>
+
+<p>Chris Forbes (3):</p>
+<ul>
+ <li>i965/fs: Gen4: Zero out extra coordinates when using shadow compare</li>
+ <li>i965: Fix cube array coordinate normalization</li>
+ <li>i965: fix bogus swizzle in brw_cubemap_normalize</li>
+</ul>
+
+<p>Christoph Bumiller (2):</p>
+<ul>
+ <li>nvc0/ir: add f32 long immediate cannot saturate</li>
+ <li>nvc0: delete compute object on screen destruction</li>
+</ul>
+
+<p>Dave Airlie (1):</p>
+<ul>
+ <li>st/mesa: don't dereference stObj->pt if NULL</li>
+</ul>
+
+<p>Dominik Behr (1):</p>
+<ul>
+ <li>glsl: propagate max_array_access through function calls</li>
+</ul>
+
+<p>Emil Velikov (1):</p>
+<ul>
+ <li>nouveau: initialise the nouveau_transfer maps</li>
+</ul>
+
+<p>Eric Anholt (4):</p>
+<ul>
+ <li>mesa: Rip out more extension checking from texformat.c.</li>
+ <li>mesa: Don't choose S3TC for generic compression if we can't compress.</li>
+ <li>i965/gen4: Fix fragment program rectangle texture shadow compares.</li>
+ <li>i965: Reenable glBitmap() after the sRGB winsys enabling.</li>
+</ul>
+
+<p>Ian Romanick (7):</p>
+<ul>
+ <li>docs: Add 9.2 release md5sums</li>
+ <li>Add .cherry-ignore file</li>
+ <li>mesa: Note that 89a665e should not be picked</li>
+ <li>glsl: Reallow precision qualifiers on structure members</li>
+ <li>mesa: Support GL_MAX_VERTEX_OUTPUT_COMPONENTS query with ES3</li>
+ <li>mesa: Remove all traces of GL_OES_matrix_get</li>
+ <li>mesa: Don't return any data for GL_SHADER_BINARY_FORMATS</li>
+</ul>
+
+<p>Ilia Mirkin (2):</p>
+<ul>
+ <li>nv30: find first unused texcoord rather than bailing if first is used</li>
+ <li>nv30: fix inconsistent setting of push->user_priv</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 (5):</p>
+<ul>
+ <li>i965/vs: Detect GRF sources in split_virtual_grfs send-from-GRF code.</li>
+ <li>i965/fs: Detect GRF sources in split_virtual_grfs send-from-GRF code.</li>
+ <li>i965/vec4: Only zero out unused message components when there are any.</li>
+ <li>i965: Fix brw_vs_prog_data_compare to actually check field members.</li>
+ <li>meta: Set correct viewport and projection in decompress_texture_image.</li>
+</ul>
+
+<p>Maarten Lankhorst (2):</p>
+<ul>
+ <li>st/dri: do not create a new context for msaa copy</li>
+ <li>nvc0: restore viewport after blit</li>
+</ul>
+
+<p>Marek Olšák (2):</p>
+<ul>
+ <li>r600g: fix constant buffer cache flushing</li>
+ <li>r600g: fix texture buffer object cache flushing</li>
+</ul>
+
+<p>Paul Berry (1):</p>
+<ul>
+ <li>i965: Initialize inout_offset parameter to brw_search_cache().</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 5377bc3e4086833ddf30b4e94c4d26b6fd946398
Author: Carl Worth <cworth@cworth.org>
Date: Fri Oct 4 15:25:44 2013 -0700
mesa: Bump version to 9.2.1
In preparation for the 9.2.1 release, of course.
diff --git a/Android.common.mk b/Android.common.mk
index e6b3b44..ba0e46b 100644
--- a/Android.common.mk
+++ b/Android.common.mk
@@ -35,7 +35,7 @@ LOCAL_C_INCLUDES += \
# define ANDROID_VERSION (e.g., 4.0.x => 0x0400)
LOCAL_CFLAGS += \
- -DPACKAGE_VERSION=\"9.2.0\" \
+ -DPACKAGE_VERSION=\"9.2.1\" \
-DPACKAGE_BUGREPORT=\"https://bugs.freedesktop.org/enter_bug.cgi?product=Mesa\"; \
-DANDROID_VERSION=0x0$(MESA_ANDROID_MAJOR_VERSION)0$(MESA_ANDROID_MINOR_VERSION)
diff --git a/SConstruct b/SConstruct
index b40a468..2e09d70 100644
--- a/SConstruct
+++ b/SConstruct
@@ -70,7 +70,7 @@ if env['gles']:
# Environment setup
env.Append(CPPDEFINES = [
- ('PACKAGE_VERSION', '\\"9.2.0\\"'),
+ ('PACKAGE_VERSION', '\\"9.2.1\\"'),
('PACKAGE_BUGREPORT', '\\"https://bugs.freedesktop.org/enter_bug.cgi?product=Mesa\\";'),
])
diff --git a/configure.ac b/configure.ac
index 10d5ad8..1384224 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.2.0],
+AC_INIT([Mesa], [9.2.1],
[https://bugs.freedesktop.org/enter_bug.cgi?product=Mesa])
AC_CONFIG_AUX_DIR([bin])
AC_CONFIG_MACRO_DIR([m4])
commit 486aecac7eb0542981ae1191e6eee2c7a9d305d5
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 b9000e6..0c6184d 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), NO_EXTRA" ],
commit 8fc8f38d94a71b7c62aea9a7f9137715b51d59a8
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 dfcc8caf2567a751019a7c7f3ba36e76dde8fdfd
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 c8ae770068ebc9466a7353fc4110ad6ac15e3f05
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 a81ffde..f818416 100644
--- a/src/mesa/drivers/common/meta.c
+++ b/src/mesa/drivers/common/meta.c
@@ -4022,6 +4022,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);
Reply to: