mesa: Changes to 'upstream-experimental'
Makefile.am | 62 +++
bin/.cherry-ignore | 10
bin/get-pick-list.sh | 29 +
configs/default | 2
configure.ac | 16 -
docs/news.html | 10
docs/relnotes-9.0.1.html | 157 +++++++++
docs/relnotes-9.0.html | 4
docs/relnotes.html | 1
src/egl/drivers/dri2/egl_dri2.h | 4
src/egl/drivers/dri2/platform_wayland.c | 252 +++++-----------
src/egl/drivers/dri2/platform_x11.c | 2
src/egl/main/eglcontext.c | 17 -
src/egl/wayland/wayland-drm/wayland-drm.c | 26 -
src/egl/wayland/wayland-egl/wayland-egl-priv.h | 11
src/egl/wayland/wayland-egl/wayland-egl.c | 33 --
src/gallium/drivers/nv30/nv30_miptree.c | 3
src/gallium/drivers/nv50/nv50_miptree.c | 3
src/gallium/state_trackers/egl/wayland/native_drm.c | 40 +-
src/gallium/state_trackers/egl/wayland/native_shm.c | 34 +-
src/gallium/state_trackers/egl/wayland/native_wayland.c | 161 ++--------
src/gallium/state_trackers/egl/wayland/native_wayland.h | 9
src/gbm/backends/dri/gbm_dri.c | 120 ++++---
src/gbm/backends/dri/gbm_driint.h | 8
src/glsl/linker.cpp | 1
src/glsl/ralloc.c | 8
src/glsl/ralloc.h | 9
src/glsl/tests/Makefile.am | 5
src/glx/dri2_glx.c | 2
src/glx/glxext.c | 3
src/mapi/glapi/gen/gl_API.xml | 3
src/mesa/drivers/dri/i965/brw_misc_state.c | 6
src/mesa/drivers/dri/intel/intel_screen.c | 1
src/mesa/main/context.c | 5
src/mesa/main/get.c | 107 +++---
src/mesa/main/mtypes.h | 2
src/mesa/main/tests/enum_strings.cpp | 2
src/mesa/main/teximage.c | 20 -
src/mesa/main/version.h | 4
src/mesa/state_tracker/st_cb_texture.c | 9
40 files changed, 657 insertions(+), 544 deletions(-)
New commits:
commit 2d85170eb79bc8950feff2fdc6a8af374195dbd1
Author: Ian Romanick <ian.d.romanick@intel.com>
Date: Wed Nov 14 10:46:47 2012 -0800
docs: Add 9.0.1 release notes
Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
diff --git a/docs/relnotes-9.0.1.html b/docs/relnotes-9.0.1.html
index 544990c..8a354b0 100644
--- a/docs/relnotes-9.0.1.html
+++ b/docs/relnotes-9.0.1.html
@@ -7,7 +7,7 @@
</head>
<body>
-<h1>Mesa 9.0.1 Release Notes / TBD</h1>
+<h1>Mesa 9.0.1 Release Notes / November 14th, 2012</h1>
<p>
Mesa 9.0.1 is a bug fix release which fixes bugs found since the 9.0 release.
@@ -34,8 +34,15 @@ TBD.
<p>This list is likely incomplete.</p>
<ul>
-<!-- <li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=";>Bug </a> - </li> -->
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=44912";>Bug 44912</a> - [bisected] WebGL conformance/textures/texture-mips tests fails</li>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=55856";>Bug 55856</a> - kwin with gles window content is not updating (gen4)</li>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=56057";>Bug 56057</a> - INTEL_swap_event not correctly listed</li>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=56211";>Bug 56211</a> - src/mesa/state_tracker/st_cb_texture.c:1123:copy_image_data_to_texture: Assertion `u_minify(stImage->pt->height0, src_level) == stImage->base.Height' failed.</li>
+<!-- <li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=";>Bug </a> - </li> -->
</ul>
@@ -43,8 +50,108 @@ TBD.
<p>The full set of changes can be viewed by using the following GIT command:</p>
<pre>
- git log mesa-9.0..
+ git log mesa-9.0..mesa-9.0.1
</pre>
+<p>Adam Jackson (1):</p>
+<ul>
+ <li>glx: Add GLXBadProfileARB to the error string list</li>
+</ul>
+
+<p>Andreas Boll (7):</p>
+<ul>
+ <li>docs: add news item for 9.0 release</li>
+ <li>mesa: add get-pick-list.sh script into bin/</li>
+ <li>mesa: add initial .cherry-ignore file for the 9.0 branch</li>
+ <li>mesa: use .cherry-ignore in the get-pick-list.sh script</li>
+ <li>build: add config.sub and config.guess to tarballs target</li>
+ <li>build: add missing Makefile.in files to tarballs target</li>
+ <li>build: add missing files to tarballs target</li>
+</ul>
+
+<p>Brian Paul (2):</p>
+<ul>
+ <li>mesa: don't call TexImage driver hooks for zero-sized images</li>
+ <li>mesa: fix error check for zero-sized compressed subtexture</li>
+</ul>
+
+<p>Fredrik Höglund (1):</p>
+<ul>
+ <li>egl_dri2/x11: Fix eglPostSubBufferNV()</li>
+</ul>
+
+<p>Ian Romanick (5):</p>
+<ul>
+ <li>docs: Add 9.0 release md5sums</li>
+ <li>i965: Fix regression in depth texture rendering on pre-SNB</li>
+ <li>glx: Set sRGBCapable to a default value</li>
+ <li>docs: Add 9.0.1 release notes</li>
+ <li>mesa: Bump version to 9.0.1</li>
+</ul>
+
+<p>Imre Deak (7):</p>
+<ul>
+ <li>mesa: glGet: fix indentation of _mesa_init_get_hash</li>
+ <li>mesa: glGet: fix indentation of find_value</li>
+ <li>mesa: glGet: fix indentation of print_table_stats</li>
+ <li>mesa: glGet: fix API check for EGL_image_external enums</li>
+ <li>glapi: rename/move GL_POLYGON_OFFSET_BIAS to its extension section</li>
+ <li>mesa: glGet: fix parameter lookup for apps using multiple APIs</li>
+ <li>glget: fix make check for glGet GL_POLYGON_OFFSET_BIAS</li>
+</ul>
+
+<p>Jonas Ådahl (1):</p>
+<ul>
+ <li>wayland: Destroy frame callback when destroying surface</li>
+</ul>
+
+<p>Kenneth Graunke (1):</p>
+<ul>
+ <li>glsl: Allow ir_if in the linker's move_non_declarations function.</li>
+</ul>
+
+<p>Kristian Høgsberg (5):</p>
+<ul>
+ <li>gbm: Reject buffers that are not wl_drm buffers in gbm_bo_import()</li>
+ <li>gbm: Use the kms dumb ioctls for cursor instead of libkms</li>
+ <li>egl/wayland: Update to Wayland 0.99 API</li>
+ <li>wayland: Remove 0.85 compatibility #ifdefs</li>
+ <li>wayland: Drop support for ill-defined, unused wl_egl_pixmap</li>
+</ul>
+
+<p>Marcin Slusarz (1):</p>
+<ul>
+ <li>nouveau: use pre-calculated stride for resource_get_handle</li>
+</ul>
+
+<p>Matt Turner (4):</p>
+<ul>
+ <li>egl: Return EGL_BAD_MATCH for invalid profile attributes</li>
+ <li>Re-add HAVE_PTHREADS preprocessor macro</li>
+ <li>build: Ship install-sh in the tarball</li>
+ <li>ralloc: Annotate printf functions with PRINTFLIKE(...)</li>
+</ul>
+
+<p>Michel Dänzer (2):</p>
+<ul>
+ <li>st/mesa: Fix source miptree level for copying data to finalized miptree.</li>
+ <li>st/mesa: Fix assertions for copying texture image to finalized miptree.</li>
+</ul>
+
+<p>Owen W. Taylor (1):</p>
+<ul>
+ <li>glx: Fix listing of INTEL_swap_event in glXQueryExtensionsString()</li>
+</ul>
+
+<p>Quentin Glidic (1):</p>
+<ul>
+ <li>intel: Add missing #include <time.h></li>
+</ul>
+
+<p>Tomeu Vizoso (1):</p>
+<ul>
+ <li>mesa/es: Define GL_MAX_TEXTURE_MAX_ANISOTROPY_EXT enum for all GLs</li>
+</ul>
+
</body>
</html>
commit d4540c5f3d045f0871f0050b0c845b2ae6b94c5b
Author: Andreas Boll <andreas.boll.dev@gmail.com>
Date: Wed Nov 14 21:43:31 2012 +0100
build: add missing files to tarballs target
fixes errors ./configure and make was complaining about
NOTE: This is a candidate for the 9.0 branch.
Reviewed-by: Matt Turner <mattst88@gmail.com>
(cherry picked from commit 8a9f0fdeabdf51fbb7db91e419827fd47910a401)
diff --git a/Makefile.am b/Makefile.am
index 73bf598..f72fa40 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -61,9 +61,15 @@ PACKAGE_NAME = MesaLib-$(PACKAGE_VERSION)
EXTRA_FILES = \
aclocal.m4 \
configure \
+ bin/ar-lib \
+ bin/compile \
bin/config.sub \
bin/config.guess \
+ bin/depcomp \
bin/install-sh \
+ bin/ltmain.sh \
+ bin/missing \
+ bin/ylwrap \
src/glsl/glsl_parser.cc \
src/glsl/glsl_parser.h \
src/glsl/glsl_lexer.cc \
commit fcb9f25989499359df884d9d094d811948ec70a8
Author: Andreas Boll <andreas.boll.dev@gmail.com>
Date: Wed Nov 14 21:39:15 2012 +0100
build: add missing Makefile.in files to tarballs target
fixes errors ./configure was complaining about
NOTE: This is a candidate for the 9.0 branch.
Reviewed-by: Matt Turner <mattst88@gmail.com>
(cherry picked from commit bc08f26485c77b3ef3ee7b07d67fd43f2644f1ac)
diff --git a/Makefile.am b/Makefile.am
index d098e40..73bf598 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -78,7 +78,56 @@ EXTRA_FILES = \
src/mesa/main/api_exec_es2_remap_helper.h \
src/mesa/program/lex.yy.c \
src/mesa/program/program_parse.tab.c \
- src/mesa/program/program_parse.tab.h
+ src/mesa/program/program_parse.tab.h \
+ src/gallium/drivers/r600/Makefile.in \
+ src/gallium/drivers/r300/Makefile.in \
+ src/gallium/drivers/Makefile.in \
+ src/gallium/Makefile.in \
+ src/gallium/auxiliary/pipe-loader/Makefile.in \
+ src/gallium/targets/opencl/Makefile.in \
+ src/gallium/state_trackers/clover/Makefile.in \
+ src/mapi/glapi/tests/Makefile.in \
+ src/mapi/glapi/Makefile.in \
+ src/mapi/glapi/gen/Makefile.in \
+ src/mapi/es1api/Makefile.in \
+ src/mapi/shared-glapi/tests/Makefile.in \
+ src/mapi/shared-glapi/Makefile.in \
+ src/mapi/vgapi/Makefile.in \
+ src/mapi/es2api/Makefile.in \
+ src/glsl/tests/Makefile.in \
+ src/glsl/glcpp/Makefile.in \
+ src/glsl/Makefile.in \
+ src/gtest/Makefile.in \
+ src/egl/drivers/Makefile.in \
+ src/egl/drivers/glx/Makefile.in \
+ src/egl/drivers/dri2/Makefile.in \
+ src/egl/Makefile.in \
+ src/egl/main/Makefile.in \
+ src/egl/wayland/Makefile.in \
+ src/egl/wayland/wayland-drm/Makefile.in \
+ src/egl/wayland/wayland-egl/Makefile.in \
+ src/Makefile.in \
+ src/glx/tests/Makefile.in \
+ src/glx/Makefile.in \
+ src/gbm/Makefile.in \
+ src/mesa/drivers/Makefile.in \
+ src/mesa/drivers/dri/common/Makefile.in \
+ src/mesa/drivers/dri/i965/Makefile.in \
+ src/mesa/drivers/dri/r200/Makefile.in \
+ src/mesa/drivers/dri/Makefile.in \
+ src/mesa/drivers/dri/radeon/Makefile.in \
+ src/mesa/drivers/dri/swrast/Makefile.in \
+ src/mesa/drivers/dri/nouveau/Makefile.in \
+ src/mesa/drivers/dri/i915/Makefile.in \
+ src/mesa/drivers/osmesa/Makefile.in \
+ src/mesa/drivers/x11/Makefile.in \
+ src/mesa/Makefile.in \
+ src/mesa/libdricore/Makefile.in \
+ src/mesa/x86-64/Makefile.in \
+ src/mesa/main/tests/Makefile.in \
+ src/mesa/x86/Makefile.in \
+ Makefile.in
+
IGNORE_FILES = \
-x autogen.sh
commit d0533029ce19821dae2c3be39d558daa4c574374
Author: Andreas Boll <andreas.boll.dev@gmail.com>
Date: Wed Nov 14 21:34:44 2012 +0100
build: add config.sub and config.guess to tarballs target
fixes errors ./configure was complaining about
NOTE: This is a candidate for the 9.0 branch.
Reviewed-by: Matt Turner <mattst88@gmail.com>
(cherry picked from commit a0a90ea92034dc24170364d6d52df01ce623e835)
diff --git a/Makefile.am b/Makefile.am
index 7736492..d098e40 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -61,6 +61,8 @@ PACKAGE_NAME = MesaLib-$(PACKAGE_VERSION)
EXTRA_FILES = \
aclocal.m4 \
configure \
+ bin/config.sub \
+ bin/config.guess \
bin/install-sh \
src/glsl/glsl_parser.cc \
src/glsl/glsl_parser.h \
commit 4510df5464abb51af30bf595d68f9bd5f2689f9c
Author: Andreas Boll <andreas.boll.dev@gmail.com>
Date: Mon Oct 22 21:18:17 2012 +0200
mesa: use .cherry-ignore in the get-pick-list.sh script
NOTE: This is a candidate for the stable branches.
Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
(cherry picked from commit ca8988673baa65107a1b8f6f59b671725d9e4814)
diff --git a/bin/get-pick-list.sh b/bin/get-pick-list.sh
index 7288090..a141afe 100755
--- a/bin/get-pick-list.sh
+++ b/bin/get-pick-list.sh
@@ -12,8 +12,8 @@ git log --reverse --pretty=%H -i --grep='^[[:space:]]*NOTE: This is a candidate'
while read sha
do
# Check to see whether the patch is on the ignore list.
- if [ -f .git/cherry-ignore ] ; then
- if grep -q ^$sha .git/cherry-ignore ; then
+ if [ -f bin/.cherry-ignore ] ; then
+ if grep -q ^$sha bin/.cherry-ignore ; then
continue
fi
fi
commit bf1fb345afe7dce98ddec16965cc2827d5be2244
Author: Andreas Boll <andreas.boll.dev@gmail.com>
Date: Fri Nov 9 11:07:15 2012 +0100
mesa: add initial .cherry-ignore file for the 9.0 branch
Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
diff --git a/bin/.cherry-ignore b/bin/.cherry-ignore
new file mode 100644
index 0000000..35f6e1d
--- /dev/null
+++ b/bin/.cherry-ignore
@@ -0,0 +1,10 @@
+# These commits were cherry picked without using -x.
+# TBD
+
+# Causes too many regressions...
+413c4914129cd26ca87960852d8c0264c0fb29e7 intel: Improve teximage perf for Google Chrome paint rects (v3)
+b1d0fe022dc4826dadce014ab8fe062a82f75a16 intel: Fix segfault in intel_texsubimage_tiled_memcpy
+b5891286202987dfc2606ac716050c0ee426de11 intel: Fix yet-another-bug in intel_texsubimage_tiled_memcpy
+
+# Introduces performance regressions for other games... don't cherry-pick for now
+fa58644855e44830e0b91dc627703c236fa6712a r600g: fix abysmal performance in Reaction Quake
commit 2332bc26d435e465a6f6571ab267db2a33ce05d2
Author: Jonas Ådahl <jadahl@gmail.com>
Date: Sun Oct 28 00:50:12 2012 +0200
wayland: Destroy frame callback when destroying surface
If a frame callback is not destroyed when destroying a surface, its
handler function will be invoked if the surface was destroyed after the
callback was requested but before it was invoked, causing a write on
free:ed memory.
This can happen if eglDestroySurface() is called shortly after
eglSwapBuffers().
Note: This is a candidate for stable branches.
Reviewed-by: Kristian Høgsberg <krh@bitplanet.net>
(cherry picked from commit a3b6b2d3055070da9bf7054fecfd0b171c398eb7)
diff --git a/src/egl/drivers/dri2/platform_wayland.c b/src/egl/drivers/dri2/platform_wayland.c
index dcf3601..2fde171 100644
--- a/src/egl/drivers/dri2/platform_wayland.c
+++ b/src/egl/drivers/dri2/platform_wayland.c
@@ -213,6 +213,9 @@ dri2_destroy_surface(_EGLDriver *drv, _EGLDisplay *disp, _EGLSurface *surf)
dri2_surf->third_buffer);
}
+ if (dri2_surf->frame_callback)
+ wl_callback_destroy(dri2_surf->frame_callback);
+
free(surf);
return EGL_TRUE;
diff --git a/src/gallium/state_trackers/egl/wayland/native_wayland.c b/src/gallium/state_trackers/egl/wayland/native_wayland.c
index 62c87f3..560e40d 100644
--- a/src/gallium/state_trackers/egl/wayland/native_wayland.c
+++ b/src/gallium/state_trackers/egl/wayland/native_wayland.c
@@ -355,6 +355,9 @@ wayland_surface_destroy(struct native_surface *nsurf)
wl_buffer_destroy(surface->buffer[buffer]);
}
+ if (surface->frame_callback)
+ wl_callback_destroy(surface->frame_callback);
+
resource_surface_destroy(surface->rsurf);
FREE(surface);
}
commit d26890688fc4efdec64e8fef33b54049f9c690bf
Author: Fredrik Höglund <fredrik@kde.org>
Date: Tue Nov 6 17:36:34 2012 +0100
egl_dri2/x11: Fix eglPostSubBufferNV()
This got broken in commit 0a523a8820e8a2549ac1c7887eb1892b228af44b.
NOTE: This is a candidate for the 9.0 branch.
Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=55856
(cherry picked from commit f42518962a08ce927e4ddd233d19d2661e135834)
diff --git a/src/egl/drivers/dri2/platform_x11.c b/src/egl/drivers/dri2/platform_x11.c
index 939af86..5b27d90 100644
--- a/src/egl/drivers/dri2/platform_x11.c
+++ b/src/egl/drivers/dri2/platform_x11.c
@@ -797,7 +797,7 @@ static EGLBoolean
dri2_post_sub_buffer(_EGLDriver *drv, _EGLDisplay *disp, _EGLSurface *draw,
EGLint x, EGLint y, EGLint width, EGLint height)
{
- const EGLint rect[4] = { x, draw->Height - y - height, width, height };
+ const EGLint rect[4] = { x, y, width, height };
if (x < 0 || y < 0 || width < 0 || height < 0)
_eglError(EGL_BAD_PARAMETER, "eglPostSubBufferNV");
commit c4f392aafb78c80dde4b126984a498f8f2feee10
Author: Ian Romanick <ian.d.romanick@intel.com>
Date: Thu Nov 8 10:47:44 2012 -0800
mesa: Bump version to 9.0.1
Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
diff --git a/Makefile.am b/Makefile.am
index 3caa121..7736492 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -54,7 +54,7 @@ distclean-local:
# Rules for making release tarballs
-PACKAGE_VERSION=9.0
+PACKAGE_VERSION=9.0.1
PACKAGE_DIR = Mesa-$(PACKAGE_VERSION)
PACKAGE_NAME = MesaLib-$(PACKAGE_VERSION)
diff --git a/configs/default b/configs/default
index 5e4cc56..e5d4705 100644
--- a/configs/default
+++ b/configs/default
@@ -10,7 +10,7 @@ CONFIG_NAME = default
# Version info
MESA_MAJOR=9
MESA_MINOR=0
-MESA_TINY=0
+MESA_TINY=1
MESA_VERSION = $(MESA_MAJOR).$(MESA_MINOR).$(MESA_TINY)
# external projects. This should be useless now that we use libdrm.
diff --git a/configure.ac b/configure.ac
index e7a7241..b46f897 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.0.0],
+AC_INIT([Mesa], [9.0.1],
[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 85701ca..a1cc438 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 0
-#define MESA_PATCH 0
-#define MESA_VERSION_STRING "9.0"
+#define MESA_PATCH 1
+#define MESA_VERSION_STRING "9.0.1"
/* To make version comparison easy */
#define MESA_VERSION(a,b,c) (((a) << 16) + ((b) << 8) + (c))
commit 129d9d507855b74db0aa3fde70067f9bc59e8052
Author: Ian Romanick <ian.d.romanick@intel.com>
Date: Thu Nov 8 10:44:49 2012 -0800
docs: Add 9.0.1 release notes
Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
diff --git a/docs/relnotes-9.0.1.html b/docs/relnotes-9.0.1.html
new file mode 100644
index 0000000..544990c
--- /dev/null
+++ b/docs/relnotes-9.0.1.html
@@ -0,0 +1,50 @@
+<!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>
+
+<h1>Mesa 9.0.1 Release Notes / TBD</h1>
+
+<p>
+Mesa 9.0.1 is a bug fix release which fixes bugs found since the 9.0 release.
+</p>
+<p>
+Mesa 9.0 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=";>Bug </a> - </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.0..
+</pre>
+
+</body>
+</html>
diff --git a/docs/relnotes.html b/docs/relnotes.html
index 196d1af..d9b9cf1 100644
--- a/docs/relnotes.html
+++ b/docs/relnotes.html
@@ -14,6 +14,7 @@ The release notes summarize what's new or changed in each Mesa release.
</p>
<ul>
+<li><a href="relnotes-9.0.1.html">9.0.1 release notes</a>
<li><a href="relnotes-9.0.html">9.0 release notes</a>
<li><a href="relnotes-8.0.4.html">8.0.4 release notes</a>
<li><a href="relnotes-8.0.3.html">8.0.3 release notes</a>
commit 895a5873d141c726e2e81ba53d5b757e4708fb29
Author: Kenneth Graunke <kenneth@whitecape.org>
Date: Wed Oct 24 13:17:24 2012 -0700
glsl: Allow ir_if in the linker's move_non_declarations function.
Global initializers using the ?: operator with at least one non-constant
operand generate ir_if statements. For example,
float foo = some_boolean ? 0.0 : 1.0;
becomes:
(declare (temporary) float conditional_tmp)
(if (var_ref some_boolean)
((assign (x) (var_ref conditional_tmp) (constant float (0.0))))
((assign (x) (var_ref conditional_tmp) (constant float (1.0)))))
This pattern is necessary because the second or third arguments could be
function calls, which create statements (not expressions).
The linker moves these global initializers into the main() function.
However, it incorrectly had an assertion that global initializer
statements were only assignments, calls, or temporary variable
declarations. As demonstrated above, they can be if statements too.
Other than the assertion, everything works fine. So remove it.
Fixes new Piglit test condition-08.vert, as well as an upcoming
game that will be released on Steam.
NOTE: This is a candidate for stable release branches.
Signed-off-by: Kenneth Graunke <kenneth@whitecape.org>
Reviewed-by: Eric Anholt <eric@anholt.net>
(cherry picked from commit b45a68eebf3cf7227fc70082cb1e796041fc81ab)
diff --git a/src/glsl/linker.cpp b/src/glsl/linker.cpp
index 34ce133..86371b5 100644
--- a/src/glsl/linker.cpp
+++ b/src/glsl/linker.cpp
@@ -882,6 +882,7 @@ move_non_declarations(exec_list *instructions, exec_node *last,
assert(inst->as_assignment()
|| inst->as_call()
+ || inst->as_if() /* for initializers with the ?: operator */
|| ((var != NULL) && (var->mode == ir_var_temporary)));
if (make_copies) {
commit 4b507f809c66a1b4245e63778943aeeed71f575c
Author: Ian Romanick <ian.d.romanick@intel.com>
Date: Thu Jul 12 13:56:32 2012 -0700
glx: Set sRGBCapable to a default value
Previously, if the server didn't send a GLX_FRAMEBUFFER_SRGB_CAPABLE_EXT
tag, it would still be set to GLX_DONT_CARE (which is -1). Set it to
GL_FALSE instead.
NOTE: This is a candidate for stable release branches.
Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
Reviewed-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
Cc: Maciej Wieczorek <maciej.t.wieczorek@intel.com>
(cherry picked from commit 7b0f912e70d79bcb863ea38f7d3910ab2be0860e)
diff --git a/src/glx/glxext.c b/src/glx/glxext.c
index 9aae891..420e677 100644
--- a/src/glx/glxext.c
+++ b/src/glx/glxext.c
@@ -405,6 +405,8 @@ __glXInitializeVisualConfigFromTags(struct glx_config * config, int count,
#endif
}
+ config->sRGBCapable = GL_FALSE;
+
/*
** Additional properties may be in a list at the end
** of the reply. They are in pairs of property type
commit 94cc306e41a2565b1dc7d410713ac78a9f1edaf3
Author: Matt Turner <mattst88@gmail.com>
Date: Tue Oct 23 13:30:09 2012 -0700
ralloc: Annotate printf functions with PRINTFLIKE(...)
This is a squash of the following two commits:
ralloc: Annotate printf functions with PRINTFLIKE(...)
Catches problems such as (in the gles3 branch)
glcpp-parse.y: In function '_glcpp_parser_handle_version_declaration':
glcpp-parse.y:1990:39: warning: format '%lli' expects argument of type
'long long int', but argument 4 has type 'int' [-Wformat]
As a side-effect, remove ralloc.c's likely/unlikely macros and just use
the ones from main/compiler.h.
NOTE: This is a candidate for the release branches.
Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
(cherry picked from commit 41b14d125196e75cdd4599a4c1069b41e7000d48)
and
src/glsl/tests/Makefile.am: Specify -I... in AM_CPPFLAGS
When specifying per-target CFLAGS (e.g., ralloc_test_CFLAGS) AM_CFLAGS
are not used. AM_CPPFLAGS should be used for includes anyway.
Fixes a build problem since 41b14d125:
CC ralloc_test-ralloc.o
In file included from ../../../src/glsl/ralloc.c:42:0:
../../../src/glsl/ralloc.h:57:27: fatal error: main/compiler.h: No such file or directory
Acked-by: Paul Berry <stereotype441@gmail.com>
(cherry picked from commit 67f1e7bf5f5d1482cb8684dd5a405b7bab5b1f34)
diff --git a/src/glsl/ralloc.c b/src/glsl/ralloc.c
index 3da09b5..59e71c4 100644
--- a/src/glsl/ralloc.c
+++ b/src/glsl/ralloc.c
@@ -41,14 +41,6 @@ _CRTIMP int _vscprintf(const char *format, va_list argptr);
#include "ralloc.h"
-#ifdef __GNUC__
-#define likely(x) __builtin_expect(!!(x),1)
-#define unlikely(x) __builtin_expect(!!(x),0)
-#else
-#define likely(x) !!(x)
-#define unlikely(x) !!(x)
-#endif
-
#ifndef va_copy
#ifdef __va_copy
#define va_copy(dest, src) __va_copy((dest), (src))
diff --git a/src/glsl/ralloc.h b/src/glsl/ralloc.h
index 86306b1..67eb938 100644
--- a/src/glsl/ralloc.h
+++ b/src/glsl/ralloc.h
@@ -54,6 +54,7 @@ extern "C" {
#include <stddef.h>
#include <stdarg.h>
#include <stdbool.h>
+#include "main/compiler.h"
/**
* \def ralloc(ctx, type)
@@ -301,7 +302,7 @@ bool ralloc_strncat(char **dest, const char *str, size_t n);
*
* \return The newly allocated string.
*/
-char *ralloc_asprintf (const void *ctx, const char *fmt, ...);
+char *ralloc_asprintf (const void *ctx, const char *fmt, ...) PRINTFLIKE(2, 3);
/**
* Print to a string, given a va_list.
@@ -334,7 +335,8 @@ char *ralloc_vasprintf(const void *ctx, const char *fmt, va_list args);
* \return True unless allocation failed.
*/
bool ralloc_asprintf_rewrite_tail(char **str, size_t *start,
- const char *fmt, ...);
+ const char *fmt, ...)
+ PRINTFLIKE(3, 4);
/**
* Rewrite the tail of an existing string, starting at a given index.
@@ -376,7 +378,8 @@ bool ralloc_vasprintf_rewrite_tail(char **str, size_t *start, const char *fmt,
*
* \return True unless allocation failed.
*/
-bool ralloc_asprintf_append (char **str, const char *fmt, ...);
+bool ralloc_asprintf_append (char **str, const char *fmt, ...)
+ PRINTFLIKE(2, 3);
/**
* Append formatted text to the supplied string, given a va_list.
diff --git a/src/glsl/tests/Makefile.am b/src/glsl/tests/Makefile.am
index ee3cef6..957bb55 100644
--- a/src/glsl/tests/Makefile.am
+++ b/src/glsl/tests/Makefile.am
@@ -1,12 +1,9 @@
-INC = \
+AM_CPPFLAGS = \
-I$(top_builddir)/src/gtest/include \
-I$(top_builddir)/src/mesa \
-I$(top_builddir)/src/mapi \
-I$(top_builddir)/src/glsl
-AM_CFLAGS = $(INC)
-AM_CXXFLAGS = $(INC)
-
TESTS_ENVIRONMENT= \
export PYTHON2=$(PYTHON2); \
export PYTHON_FLAGS=$(PYTHON_FLAGS);
commit 4be397e164a495f9f2ae8b13497c44f5d584e85f
Author: Matt Turner <mattst88@gmail.com>
Date: Tue Oct 23 10:57:15 2012 -0700
build: Ship install-sh in the tarball
Fixes the problem where configure from the tarball would report missing
files:
$ ./configure
configure: error: cannot find install-sh, install.sh, or shtool in bin
NOTE: This is a candidate for the 9.0 branch.
(cherry picked from commit ec57fbbc72b552a4f894f32798a2ace16749f520)
diff --git a/Makefile.am b/Makefile.am
index 9a0c1dd..3caa121 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -61,6 +61,7 @@ PACKAGE_NAME = MesaLib-$(PACKAGE_VERSION)
EXTRA_FILES = \
aclocal.m4 \
configure \
+ bin/install-sh \
src/glsl/glsl_parser.cc \
src/glsl/glsl_parser.h \
src/glsl/glsl_lexer.cc \
commit 6a3c578dcd22e47944bee67d0e484ed1846f547c
Author: Matt Turner <mattst88@gmail.com>
Date: Thu Oct 11 10:57:26 2012 -0700
Re-add HAVE_PTHREADS preprocessor macro
Broken in commit 814345f54b.
NOTE: This is a candidate for the 9.0 branch.
(cherry picked from commit 9a51edfb5af72a7a480f408f02d8ecd98c576b7b)
diff --git a/configure.ac b/configure.ac
index 4746dcb..e7a7241 100644
--- a/configure.ac
+++ b/configure.ac
@@ -160,13 +160,13 @@ DEFINES=""
AC_SUBST([DEFINES])
case "$host_os" in
linux*|*-gnu*|gnu*)
- DEFINES="$DEFINES -D_GNU_SOURCE"
+ DEFINES="$DEFINES -D_GNU_SOURCE -DHAVE_PTHREAD"
;;
solaris*)
- DEFINES="$DEFINES -DSVR4"
+ DEFINES="$DEFINES -DHAVE_PTHREAD -DSVR4"
;;
cygwin*)
- DEFINES="$DEFINES"
+ DEFINES="$DEFINES -DHAVE_PTHREAD"
;;
esac
@@ -946,7 +946,7 @@ AC_ARG_ENABLE([glx-tls],
AC_SUBST(GLX_TLS, ${GLX_USE_TLS})
AS_IF([test "x$GLX_USE_TLS" = xyes -a "x$ax_pthread_ok" = xyes],
- [DEFINES="${DEFINES} -DGLX_USE_TLS"])
+ [DEFINES="${DEFINES} -DGLX_USE_TLS -DHAVE_PTHREAD"])
dnl
dnl More DRI setup
@@ -1030,7 +1030,7 @@ if test "x$enable_dri" = xyes; then
esac
;;
freebsd* | dragonfly* | *netbsd*)
- DEFINES="$DEFINES -DUSE_EXTERNAL_DXTN_LIB=1"
+ DEFINES="$DEFINES -DHAVE_PTHREAD -DUSE_EXTERNAL_DXTN_LIB=1"
DEFINES="$DEFINES -DIN_DRI_DRIVER -DHAVE_ALIAS"
if test "x$DRI_DIRS" = "xyes"; then
commit 8d00f077c9672ed2f00a1c67b688c82c3fc7d480
Author: Adam Jackson <ajax@redhat.com>
Date: Wed Oct 17 14:34:53 2012 -0400
glx: Add GLXBadProfileARB to the error string list
Note: This is a candidate for the stable branches.
Reviewed-by: Brian Paul <brianp@vmware.com>
Signed-off-by: Adam Jackson <ajax@redhat.com>
(cherry picked from commit a30d14635d5d55ce0e022b0b66770da32155a3d7)
diff --git a/src/glx/glxext.c b/src/glx/glxext.c
index a4e76c1..9aae891 100644
--- a/src/glx/glxext.c
+++ b/src/glx/glxext.c
@@ -83,6 +83,7 @@ static /* const */ char *error_list[] = {
"GLXBadPbuffer",
"GLXBadCurrentDrawable",
"GLXBadWindow",
+ "GLXBadProfileARB",
};
#ifdef GLX_USE_APPLEGL
commit 8aab8a50d3c56e73ea53be111bbb8b477f6e8c99
Author: Owen W. Taylor <otaylor@fishsoup.net>
Date: Wed Oct 17 00:50:28 2012 -0400
glx: Fix listing of INTEL_swap_event in glXQueryExtensionsString()
Due to a string mismatch, INTEL_swap_event wasn't listed among GLX
extensions for the connection, even when present on both client and
server. That is, glXQueryServerString and glXGetClientString reported the
extension, but glXQueryExtensionsString did not.
Note: This is a candidate for the stable branches.
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=56057
Reviewed-by: Chad Versace <chad.versace@linux.intel.com>
(cherry picked from commit 1d0c6211212a2d486c8f7f64349fd9683061342e)
diff --git a/src/glx/dri2_glx.c b/src/glx/dri2_glx.c
index 4e8b351..15f590e 100644
--- a/src/glx/dri2_glx.c
+++ b/src/glx/dri2_glx.c
@@ -961,7 +961,7 @@ dri2BindExtensions(struct dri2_screen *psc, const __DRIextension **extensions)
__glXEnableDirectExtension(&psc->base, "GLX_SGI_make_current_read");
/* FIXME: if DRI2 version supports it... */
- __glXEnableDirectExtension(&psc->base, "INTEL_swap_event");
+ __glXEnableDirectExtension(&psc->base, "GLX_INTEL_swap_event");
if (psc->dri2->base.version >= 3) {
const unsigned mask = psc->dri2->getAPIMask(psc->driScreen);
commit cf7634d9665b26a321a9d8542d50c76693141b52
Author: Matt Turner <mattst88@gmail.com>
Date: Mon Oct 8 17:01:34 2012 -0700
egl: Return EGL_BAD_MATCH for invalid profile attributes
Version 12 of the EGL_KHR_create_context spec changed this behavior.
NOTE: This is a candidate for the 9.0 branch
Reviewed-by: Chad Versace <chad.versace@linux.intel.com>
(cherry picked from commit 587d5db11d8047663201c5fb06a6b2feb5d55891)
diff --git a/src/egl/main/eglcontext.c b/src/egl/main/eglcontext.c
index 71eca6f..4efb76b 100644
--- a/src/egl/main/eglcontext.c
+++ b/src/egl/main/eglcontext.c
@@ -229,17 +229,14 @@ _eglParseContextAttribList(_EGLContext *ctx, _EGLDisplay *dpy,
*
* "* If an OpenGL context is requested, the requested version
* is greater than 3.2, and the value for attribute
- * EGL_CONTEXT_PROFILE_MASK_KHR has no bits set; has any
- * bits set other than EGL_CONTEXT_CORE_PROFILE_BIT_KHR and
- * EGL_CONTEXT_COMPATIBILITY_PROFILE_BIT_KHR; has more than
- * one of these bits set; or if the implementation does not
- * support the requested profile, then an
- * EGL_BAD_PROFILE_KHR error is generated."
- *
- * However, it does not define EGL_BAD_PROFILE_KHR. For now use
- * EGL_BAD_ATTRIBUTE.
+ * EGL_CONTEXT_OPENGL_PROFILE_MASK_KHR has no bits set; has
+ * any bits set other than EGL_CONTEXT_OPENGL_CORE_PROFILE_BIT_KHR
+ * and EGL_CONTEXT_OPENGL_COMPATIBILITY_PROFILE_BIT_KHR; has
+ * more than one of these bits set; or if the implementation does
+ * not support the requested profile, then an EGL_BAD_MATCH error
+ * is generated."
*/
- err = EGL_BAD_ATTRIBUTE;
+ err = EGL_BAD_MATCH;
break;
}
}
commit 2a81037439afb04d4170f674646cdae59619707d
Author: Kristian Høgsberg <krh@bitplanet.net>
Date: Tue Oct 16 14:30:53 2012 -0400
wayland: Drop support for ill-defined, unused wl_egl_pixmap
It doesn't provide the cross-process buffer sharing that a window system
pixmap could otherwise support and we don't have anything left that uses
this type of surface.
diff --git a/src/egl/drivers/dri2/platform_wayland.c b/src/egl/drivers/dri2/platform_wayland.c
index 7e00c33..dcf3601 100644
--- a/src/egl/drivers/dri2/platform_wayland.c
+++ b/src/egl/drivers/dri2/platform_wayland.c
@@ -108,7 +108,6 @@ dri2_create_surface(_EGLDriver *drv, _EGLDisplay *disp, EGLint type,
struct dri2_egl_display *dri2_dpy = dri2_egl_display(disp);
struct dri2_egl_config *dri2_conf = dri2_egl_config(conf);
struct dri2_egl_surface *dri2_surf;
- struct dri2_egl_buffer *dri2_buf;
int i;
(void) drv;
@@ -146,17 +145,6 @@ dri2_create_surface(_EGLDriver *drv, _EGLDisplay *disp, EGLint type,
dri2_surf->base.Width = -1;
dri2_surf->base.Height = -1;
break;
Reply to: