!UPSTREAM: Make GL_STENCIL_INDEX exist again in ES2.

This lets gles2conform build since 88ec004.

Makefile.am

@@ -36,6 +36,7 @@ PACKAGE_NAME = MesaLib-$(PACKAGE_VERSION)
 EXTRA_FILES = \
 	aclocal.m4					\
 	configure					\
+	VERSION					\
 	bin/ar-lib					\
 	bin/compile					\
 	bin/config.sub					\
@@ -45,7 +46,6 @@ EXTRA_FILES = \
 	bin/ltmain.sh					\
 	bin/missing					\
 	bin/ylwrap					\
-        bin/test-driver					\
 	src/glsl/glsl_parser.cpp			\
 	src/glsl/glsl_parser.h				\
 	src/glsl/glsl_lexer.cpp				\

VERSION

@@ -1 +1 @@
-10.0.5
+10.0.0-devel

bin/.cherry-ignore

@@ -1,39 +0,0 @@
-# Since we've disabled DRI3 completely in 10.0, this commit is no longer
-# necessary.
-f0f202e6b764be803470e27cba9102f14361ae22 glx: conditionaly build dri3 and present loader (v3)
-
-# This patch makes bug #71870 worse, so it won't be cherry picked until that
-# issue can be resolved.  See
-# http://lists.freedesktop.org/archives/mesa-dev/2013-November/048899.html
-068a073c1d4853b5c8f33efdeb481026f42e23a5 meta: fix meta clear of layered framebuffers
-
-# This patch isn't actually necessary because that bug that it fixes isn't in
-# the 10.0 branch.  See
-# http://lists.freedesktop.org/archives/mesa-stable/2013-December/000500.html
-a057b837ddd1c725a7504eedc53c6df05a012773 egl: add HAVE_LIBDRM define, fix EGL X11 platform
-
-# Author requested skipping due to regressions
-# Picking it would require at least also picking:
-# 73c3c7e3, 3e0e9e3b, c59a605c
-b2d1c579bb84a88179072a6a783f8827e218db55 glcpp: Set extension defines after resolving the GLSL version.
-
-# These patches depend on other code not in stable branch.
-# (at least 3b22146dc714b6090f7423abbc4df53d7d1fdaa9)
-e190709119d8eb85c67bfbad5be699d39ad0118e mesa: Ensure that transform feedback refers to the correct program.
-43e77215b13b2f86e461cd8a62b542fc6854dd1c i965/gen7: Use to the correct program when uploading transform feedback state.
-
-# Author requested to ignore these four (since they depend on commits not in
-# stable).
-3313cc269bd428ca96a132d86da5fddc0f27386a i965: Add an option to ignore sample qualifier
-a92e5f7cf63d496ad7830b5cea4bbab287c25b8e i965: Use sample barycentric coordinates with per sample shading
-f5cfb4ae21df8eebfc6b86c0ce858b1c0a9160dd i965: Ignore 'centroid' interpolation qualifier in case of persample shading
-dc2f94bc786768329973403248820a2e5249f102 i965: Ignore 'centroid' interpolation qualifier in case of persample shading
-
-# This depends on the clear_buffer_object extensions work which is not in 10.0
-# (See commit 5f7bc0c75904a40da0973329badea8497e53a26a on other branches)
-aff7c5e78ab133866a90f67613508735c9b75094
-
-# These patches are fixing code not present in 10.0
-f34d75d6f69f4c0bf391e0adf1fd469601b01b04
-e8d85034dad37177fce780ee3e09501e60be6e81
-a61d859519d520b849c11ad5c1c1972870abd956

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.*10\.0\|CC:.*10\.0.*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.

common.py

@@ -100,4 +100,4 @@ def AddOptions(opts):
 	opts.Add(BoolOption('quiet', 'DEPRECATED: profile build', 'yes'))
 	opts.Add(BoolOption('texture_float', 'enable floating-point textures and renderbuffers', 'no'))
 	if host_platform == 'windows':
-		opts.Add(EnumOption('MSVC_VERSION', 'MS Visual C++ version', None, allowed_values=('7.1', '8.0', '9.0', '10.0', '11.0', '12.0')))
+		opts.Add(EnumOption('MSVC_VERSION', 'MS Visual C++ version', None, allowed_values=('7.1', '8.0', '9.0', '10.0', '11.0')))

configure.ac

@@ -29,11 +29,14 @@ AC_SUBST([OSMESA_VERSION])
 dnl Versions for external dependencies
 LIBDRM_REQUIRED=2.4.24
 LIBDRM_RADEON_REQUIRED=2.4.46
-LIBDRM_INTEL_REQUIRED=2.4.49
+LIBDRM_INTEL_REQUIRED=2.4.38
 LIBDRM_NVVIEUX_REQUIRED=2.4.33
 LIBDRM_NOUVEAU_REQUIRED="2.4.33 libdrm >= 2.4.41"
 LIBDRM_FREEDRENO_REQUIRED=2.4.39
 DRI2PROTO_REQUIRED=2.6
+DRI3PROTO_REQUIRED=1.0
+PRESENTPROTO_REQUIRED=1.0
+LIBUDEV_REQUIRED=151
 GLPROTO_REQUIRED=1.4.14
 
 dnl Check for progs
@@ -227,12 +230,6 @@ esac
 AC_SUBST([VISIBILITY_CFLAGS])
 AC_SUBST([VISIBILITY_CXXFLAGS])
 
-dnl
-dnl Optional flags, check for compiler support
-dnl
-AX_CHECK_COMPILE_FLAG([-msse4.1], [SSE41_SUPPORTED=1], [SSE41_SUPPORTED=0])
-AM_CONDITIONAL([SSE41_SUPPORTED], [test x$SSE41_SUPPORTED = x1])
-
 dnl
 dnl Hacks to enable 32 or 64 bit build
 dnl
@@ -814,10 +811,13 @@ xyesno)
         fi
         PKG_CHECK_MODULES([DRI2PROTO], [dri2proto >= $DRI2PROTO_REQUIRED])
         GL_PC_REQ_PRIV="$GL_PC_REQ_PRIV libdrm >= $LIBDRM_REQUIRED"
+        PKG_CHECK_MODULES([DRI3PROTO], [dri3proto >= $DRI3PROTO_REQUIRED])
+        PKG_CHECK_MODULES([PRESENTPROTO], [presentproto >= $PRESENTPROTO_REQUIRED])
+        PKG_CHECK_MODULES([LIBUDEV], [libudev >= $LIBUDEV_REQUIRED])
     fi
 
     # find the DRI deps for libGL
-    dri_modules="x11 xext xdamage xfixes x11-xcb xcb-glx >= 1.8.1 xcb-dri2 >= 1.8"
+    dri_modules="x11 xext xdamage xfixes x11-xcb xcb-glx >= 1.8.1 xcb-dri2 >= 1.8 xcb-dri3 xcb-present xcb-sync xshmfence"
 
     # add xf86vidmode if available
     PKG_CHECK_MODULES([XF86VIDMODE], [xxf86vm], HAVE_XF86VIDMODE=yes, HAVE_XF86VIDMODE=no)
@@ -827,8 +827,8 @@ xyesno)
 
     PKG_CHECK_MODULES([DRIGL], [$dri_modules])
     GL_PC_REQ_PRIV="$GL_PC_REQ_PRIV $dri_modules"
-    X11_INCLUDES="$X11_INCLUDES $DRIGL_CFLAGS"
-    GL_LIB_DEPS="$DRIGL_LIBS"
+    X11_INCLUDES="$X11_INCLUDES $DRIGL_CFLAGS $LIBUDEV_CFLAGS"
+    GL_LIB_DEPS="$DRIGL_LIBS $LIBUDEV_LIBS"
 
     # need DRM libs, $PTHREAD_LIBS, etc.
     GL_LIB_DEPS="$GL_LIB_DEPS $LIBDRM_LIBS -lm $PTHREAD_LIBS $DLOPEN_LIBS"
@@ -999,7 +999,7 @@ if test "x$enable_dri" = xyes; then
     DRI_DIRS=`echo "$DRI_DIRS" | $SED 's/  */ /g'`
 
     # Check for expat
-    PKG_CHECK_EXISTS([expat], [have_expat=yes], [have_expat=no])
+    PKG_CHECK_EXISTS([EXPAT], [have_expat=yes], [have_expat=no])
     if test "x$have_expat" = "xyes"; then
        PKG_CHECK_MODULES([EXPAT], [expat], [],
                          AC_MSG_ERROR([Expat required for DRI.]))
@@ -1500,6 +1500,12 @@ AC_ARG_WITH([llvm-shared-libs],
         [link with LLVM shared libraries @<:@default=disabled@:>@])],
     [],
     [with_llvm_shared_libs=no])
+AS_IF([test x$enable_opencl = xyes],
+    [
+        if test "x$with_llvm_shared_libs" != xyes; then
+            AC_MSG_ERROR([OpenCL requires LLVM shared libraries])
+        fi
+    ])
 
 AC_ARG_WITH([llvm-prefix],
     [AS_HELP_STRING([--with-llvm-prefix],
@@ -1533,9 +1539,9 @@ if test "x$enable_gallium_llvm" = xauto; then
 fi
 if test "x$enable_gallium_llvm" = xyes; then
     if test "x$llvm_prefix" != x; then
-        AC_PATH_TOOL([LLVM_CONFIG], [llvm-config], [no], ["$llvm_prefix/bin"])
+        AC_PATH_PROG([LLVM_CONFIG], [llvm-config], [no], ["$llvm_prefix/bin"])
     else
-        AC_PATH_TOOL([LLVM_CONFIG], [llvm-config], [no])
+        AC_PATH_PROG([LLVM_CONFIG], [llvm-config], [no])
     fi
 
     if test "x$LLVM_CONFIG" != xno; then

docs/relnotes/10.0.1.html

@@ -1,150 +0,0 @@
-<!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 10.0.1 Release Notes / (December 12, 2013)</h1>
-
-<p>
-Mesa 10.0.1 is a bug fix release which fixes bugs found since the 10.0 release.
-</p>
-<p>
-Mesa 10.0.1 implements the OpenGL 3.3 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.3.  OpenGL
-3.3 is <strong>only</strong> available if requested at context creation
-because compatibility contexts not supported.
-</p>
-
-
-<h2>MD5 checksums</h2>
-<pre>
-0a72ca5b36046a658bf6038326ff32ed  MesaLib-10.0.1.tar.bz2
-01bde35c912e504ba62caf1ef9f7022c  MesaLib-10.0.1.tar.gz
-59a174a11a89e6b1b8ee9c3f7e3c388c  MesaLib-10.0.1.zip
-</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=64323">Bug 64323</a> - Severe misrendering in Left 4 Dead 2</li>
-
-<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=68838">Bug 68838</a> - GLSL: struct declarations produce a &quot;empty declaration warning&quot; in 9.2</li>
-
-<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=69155">Bug 69155</a> - [NV50 gallium] [piglit] bin/varying-packing-simple triggers memory corruption/failures</li>
-
-<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=70250">Bug 70250</a> - weston-terminal rendering corrupted with output transform 90 and 270</li>
-
-<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=70601">Bug 70601</a> - [SNB Bisected]Piglit spec/ARB_texture_float/multisample-formats 2 GL_ARB_texture_float fails</li>
-
-<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=72230">Bug 72230</a> - Unable to extract MesaLib-10.0.0.tar.{gz,bz2} with bsdtar</li>
-
-<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=72325">Bug 72325</a> - [swrast] piglit glean fbo regression</li>
-
-<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=72327">Bug 72327</a> - [swrast] piglit glean pointSprite regression</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-10.0..mesa-10.0.1
-</pre>
-
-<p>Axel Davy (2):</p>
-<ul>
-  <li>egl/wayland: Flush the wl_display at the end of SwapBuffers</li>
-  <li>Enable throttling in SwapBuffers</li>
-</ul>
-
-<p>Chad Versace (2):</p>
-<ul>
-  <li>i965/hsw: Apply non-msrt fast color clear w/a to all HSW GTs</li>
-  <li>i965: Add extra-alignment for non-msrt fast color clear for all hw (v2)</li>
-</ul>
-
-<p>Dave Airlie (1):</p>
-<ul>
-  <li>swrast: fix readback regression since inversion fix</li>
-</ul>
-
-<p>Emil Velikov (1):</p>
-<ul>
-  <li>automake: include only one copy VERSION in tarball</li>
-</ul>
-
-<p>Ian Romanick (3):</p>
-<ul>
-  <li>docs: Add 10.0 release md5sums</li>
-  <li>Remove a057b83 from the pick list</li>
-  <li>glsl: Don't emit empty declaration warning for a struct specifier</li>
-</ul>
-
-<p>Ilia Mirkin (8):</p>
-<ul>
-  <li>mesa: don't leak performance monitors on context destroy</li>
-  <li>nv50: Fix GPU_READING/WRITING bit removal</li>
-  <li>nouveau: avoid leaking fences while waiting</li>
-  <li>nv50: wait on the buf's fence before sticking it into pushbuf</li>
-  <li>nv50: enable h264 and mpeg4 for nv98+ (vp3, vp4.0)</li>
-  <li>nouveau/video: update h264 picparm field names based on usage</li>
-  <li>nouveau/video: update a few more h264 picparm field names</li>
-  <li>nv50: report 15 max inputs for fragment programs</li>
-</ul>
-
-<p>Jordan Justen (1):</p>
-<ul>
-  <li>dri megadriver_stub: add compatibility for older DRI loaders</li>
-</ul>
-
-<p>Kristian Høgsberg (2):</p>
-<ul>
-  <li>egl/wayland: Damage INT32_MAX x INT32_MAX region for eglSwapBuffers</li>
-  <li>egl/wayland: Send commit after flushing the driver context</li>
-</ul>
-
-<p>Maarten Lankhorst (1):</p>
-<ul>
-  <li>nouveau: Fix compiler warning regression</li>
-</ul>
-
-<p>Paul Berry (1):</p>
-<ul>
-  <li>i965/gen6: Fix multisample resolve blits for luminance/intensity 32F formats.</li>
-</ul>
-
-<p>Thomas Hellstrom (1):</p>
-<ul>
-  <li>st/xa: Bump major version number to 2</li>
-</ul>
-
-<p>Tom Stellard (2):</p>
-<ul>
-  <li>r300/compiler/tests: Fix segfault</li>
-  <li>r300/compiler/tests: Fix line length check in test parser</li>
-</ul>
-
-</div>
-</body>
-</html>

docs/relnotes/10.0.2.html

@@ -1,161 +0,0 @@
-<!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 10.0.2 Release Notes / (January 9, 2014)</h1>
-
-<p>
-Mesa 10.0.2 is a bug fix release which fixes bugs found since the 10.0.1 release.
-</p>
-<p>
-Mesa 10.0.2 implements the OpenGL 3.3 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.3.  OpenGL
-3.3 is <strong>only</strong> available if requested at context creation
-because compatibility contexts not supported.
-</p>
-
-
-<h2>MD5 checksums</h2>
-<pre>
-de7d14baf0101b697c140d2f47ef27e9  MesaLib-10.0.2.tar.gz
-8544c0ab3e438a08b5103421ea15b6d2  MesaLib-10.0.2.tar.bz2
-181b0d6c1afca38e98a930d0e564ed90  MesaLib-10.0.2.zip
-</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=70740">Bug 70740</a> - HiZ on SNB causes GPU hang with WebGL web app</li>
-
-<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=72026">Bug 72026</a> - SIGSEGV in fs_visitor::visit(ir_dereference_variable*)</li>
-
-<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=72264">Bug 72264</a> - GLSL error reporting</li>
-
-<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=72369">Bug 72369</a> - glitches in serious sam 3 with the sb shader backend</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-10.0.1..mesa-10.0.2
-</pre>
-
-<p>Aaron Watry (8):</p>
-<ul>
-  <li>clover: Remove unused variable</li>
-  <li>pipe_loader/sw: close dev-&gt;lib when initialization fails</li>
-  <li>radeon/compute: Stop leaking LLVMContexts in radeon_llvm_parse_bitcode</li>
-  <li>r600/compute: Free compiled kernels when deleting compute state</li>
-  <li>r600/compute: Use the correct FREE macro when deleting compute state</li>
-  <li>radeon/llvm: Free target data at end of optimization</li>
-  <li>st/vdpau: Destroy context when initialization fails</li>
-  <li>r600/pipe: Stop leaking context-&gt;start_compute_cs_cmd.buf on EG/CM</li>
-</ul>
-
-<p>Alex Deucher (1):</p>
-<ul>
-  <li>r600g: fix SUMO2 pci id</li>
-</ul>
-
-<p>Alexander von Gluck IV (1):</p>
-<ul>
-  <li>Haiku: Add in public GL kit headers</li>
-</ul>
-
-<p>Anuj Phogat (1):</p>
-<ul>
-  <li>mesa: Fix error code generation in glBeginConditionalRender()</li>
-</ul>
-
-<p>Carl Worth (2):</p>
-<ul>
-  <li>docs: Add md5sums for the 10.0.1 release.</li>
-  <li>Update version to 10.0.2</li>
-</ul>
-
-<p>Chad Versace (1):</p>
-<ul>
-  <li>i965/gen6: Fix HiZ hang in WebGL Google Maps</li>
-</ul>
-
-<p>Erik Faye-Lund (1):</p>
-<ul>
-  <li>glcpp: error on multiple #else/#elif directives</li>
-</ul>
-
-<p>Henri Verbeet (1):</p>
-<ul>
-  <li>i915: Add support for gl_FragData[0] reads.</li>
-</ul>
-
-<p>Ilia Mirkin (1):</p>
-<ul>
-  <li>nv50: fix a small leak on context destroy</li>
-</ul>
-
-<p>Jonathan Liu (2):</p>
-<ul>
-  <li>st/mesa: use pipe_sampler_view_release()</li>
-  <li>llvmpipe: use pipe_sampler_view_release() to avoid segfault</li>
-</ul>
-
-<p>Kenneth Graunke (2):</p>
-<ul>
-  <li>i965: Fix 3DSTATE_PUSH_CONSTANT_ALLOC_PS packet creation.</li>
-  <li>Revert "mesa: Remove GLXContextID typedef from glx.h."</li>
-</ul>
-
-<p>Kevin Rogovin (1):</p>
-<ul>
-  <li>Use line number information from entire function expression</li>
-</ul>
-
-<p>Kristian Høgsberg (1):</p>
-<ul>
-  <li>dri_util: Don't assume __DRIcontext-&gt;driverPrivate is a gl_context</li>
-</ul>
-
-<p>Marek Olšák (2):</p>
-<ul>
-  <li>mesa: fix interpretation of glClearBuffer(drawbuffer)</li>
-  <li>st/mesa: fix glClear with multiple colorbuffers and different formats</li>
-</ul>
-
-<p>Paul Berry (2):</p>
-<ul>
-  <li>glsl: Teach ir_variable_refcount about ir_loop::counter variables.</li>
-  <li>glsl: Fix inconsistent assumptions about ir_loop::counter.</li>
-</ul>
-
-<p>Vadim Girlin (1):</p>
-<ul>
-  <li>r600g/sb: fix stack size computation on evergreen</li>
-</ul>
-
-</div>
-</body>
-</html>

docs/relnotes/10.0.3.html

@@ -1,206 +0,0 @@
-<!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 10.0.3 Release Notes / (February 3, 2014)</h1>
-
-<p>
-Mesa 10.0.3 is a bug fix release which fixes bugs found since the 10.0.2 release.
-</p>
-<p>
-Mesa 10.0.3 implements the OpenGL 3.3 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.3.  OpenGL
-3.3 is <strong>only</strong> available if requested at context creation
-because compatibility contexts not supported.
-</p>
-
-
-<h2>MD5 checksums</h2>
-<pre>
-5f9f463ef08129f6762106b434910adb  MesaLib-10.0.3.tar.bz2
-fb3997b6500e153bc32370cb3fc4ca9e  MesaLib-10.0.3.tar.gz
-a07b4b6b9eb449b88a6cb5061e51c331  MesaLib-10.0.3.zip
-</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=72708">Bug 72708</a> - Master fails to build with older gcc due to -msse4.1</li>
-
-<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=72926">Bug 72926</a> - [REGRESSION,swrast] Memory-related crash with anti-aliasing enabled</li>
-
-<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=73096">Bug 73096</a> - Query GL_RGBA_SIGNED_COMPONENTS_EXT missing</li>
-
-<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=73100">Bug 73100</a> - Please use AC_PATH_TOOL instead of AC_PATH_PROG for llvm-config</li>
-
-<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=73418">Bug 73418</a> - OpenCL hangs graphics on CAYMAN</li>
-
-<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=73473">Bug 73473</a> - Potential crash bug in src/gallium/auxiliary/rtasm/rtasm_execmem.c</li>
-
-<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=73915">Bug 73915</a> - sample shading + centroid broken since f5cfb4a</li>
-
-<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=73956">Bug 73956</a> - SIGSEGV when passing GL_NONE to glReadBuffer</li>
-
-<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=74026">Bug 74026</a> - Compiler rejects chained assignments involving array dereferences</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-10.0.2..mesa-10.0.3
-</pre>
-
-<p>Aaron Watry (2):</p>
-<ul>
-  <li>radeon: Move gfx/dma cs cleanup to r600_common_context_cleanup</li>
-  <li>st/dri: prevent leak of dri option default values</li>
-</ul>
-
-<p>Andreas Fänger (1):</p>
-<ul>
-  <li>swrast: fix delayed texel buffer allocation regression for OpenMP</li>
-</ul>
-
-<p>Anuj Phogat (3):</p>
-<ul>
-  <li>glsl: Disable ARB_texture_rectangle in shader version 100.</li>
-  <li>i965: Use sample barycentric coordinates with per sample shading</li>
-  <li>i965: Ignore 'centroid' interpolation qualifier in case of persample shading</li>
-</ul>
-
-<p>Brian Paul (3):</p>
-<ul>
-  <li>mesa: implement missing glGet(GL_RGBA_SIGNED_COMPONENTS_EXT) query</li>
-  <li>st/mesa: fix glReadBuffer(GL_NONE) segfault</li>
-  <li>draw: fix incorrect vertex size computation in LLVM drawing code</li>
-</ul>
-
-<p>Carl Worth (5):</p>
-<ul>
-  <li>Add md5sums for 10.0.2. release.</li>
-  <li>cherry-ignore: Ignore several patches not yet ready for the stable branch</li>
-  <li>Drop another couple of patches.</li>
-  <li>cherry-ignore: Ignore 4 patches at teh request of the author, (Anuj).</li>
-  <li>Update version to 10.0.3</li>
-</ul>
-
-<p>Chad Versace (1):</p>
-<ul>
-  <li>i965/gen6/blorp: Emit more flushes to workaround hangs</li>
-</ul>
-
-<p>Chris Forbes (1):</p>
-<ul>
-  <li>i965: fold offset into coord for textureOffset(gsampler2DRect)</li>
-</ul>
-
-<p>Emil Velikov (5):</p>
-<ul>
-  <li>mesa: use signed temporary variable to store _ColorDrawBufferIndexes</li>
-  <li>st/mesa: use signed temporary variable to store _ColorDrawBufferIndexes</li>
-  <li>nv50: access only the available amount of textures</li>
-  <li>nv50: access only the available amount of constbuf</li>
-  <li>gallium/rtasm: handle mmap failures appropriately</li>
-</ul>
-
-<p>Eric Anholt (2):</p>
-<ul>
-  <li>i965: Fix handling of MESA_pack_invert in blit (PBO) readpixels.</li>
-  <li>i965: Don't do the temporary-and-blit-copy for INVALIDATE_RANGE maps.</li>
-</ul>
-
-<p>Ian Romanick (2):</p>
-<ul>
-  <li>mesa: Add COMPRESSED_RGBA_S3TC_DXT1_EXT to COMPRESSED_TEXTURE_FORMATS for GLES</li>
-  <li>radeon / r200: Pass the API into _mesa_initialize_context</li>
-</ul>
-
-<p>Ilia Mirkin (2):</p>
-<ul>
-  <li>mesa: fix GL_COLOR_SUM enum for drivers without ARB_vertex_program</li>
-  <li>st/vdpau: don't return a device if the screen doesn't support NPOT</li>
-</ul>
-
-<p>José Fonseca (1):</p>
-<ul>
-  <li>mesa: Use IROUND instead of roundf.</li>
-</ul>
-
-<p>Kenneth Graunke (2):</p>
-<ul>
-  <li>glsl: Rename "expr" to "lhs_expr" in vector_extract munging code.</li>
-  <li>glsl: Fix chained assignments of vector channels.</li>
-</ul>
-
-<p>Lauri Kasanen (1):</p>
-<ul>
-  <li>mesa: Fix build to properly check for supported compiler flags</li>
-</ul>
-
-<p>Marek Olšák (2):</p>
-<ul>
-  <li>st/mesa: use sRGB formats for MSAA resolving if destination is sRGB</li>
-  <li>gallium/util: util_format_srgb should not return FORMAT_NONE for sRGB formats</li>
-</ul>
-
-<p>Matt Turner (2):</p>
-<ul>
-  <li>glcpp: Define GL_EXT_shader_integer_mix in both GL and ES.</li>
-  <li>glx: Update glxext.h to revision 24777.</li>
-</ul>
-
-<p>Michał Górny (1):</p>
-<ul>
-  <li>Use AC_PATH_TOOL instead of AC_PATH_PROG for llvm-config.</li>
-</ul>
-
-<p>Paul Berry (1):</p>
-<ul>
-  <li>i965: Ensure that all necessary state is re-emitted if we run out of aperture.</li>
-</ul>
-
-<p>Paul Seidler (1):</p>
-<ul>
-  <li>build: move ARCH_LIBS definition outside of ASM definition</li>
-</ul>
-
-<p>Thomas Sondergaard (4):</p>
-<ul>
-  <li>mesa: Preliminary support for MSVC_VERSION=12.0</li>
-  <li>mesa: Fix compile error with MSVC 2013</li>
-  <li>mesa: Work around internal compiler error</li>
-  <li>mesa: Namespace qualify fma to override ambiguity with fma from math.h</li>
-</ul>
-
-<p>Tom Stellard (1):</p>
-<ul>
-  <li>r600g/compute: Emit DEALLOC_STATE on cayman after dispatching a compute shader.</li>
-</ul>
-
-</div>
-</body>
-</html>

docs/relnotes/10.0.4.html

@@ -1,191 +0,0 @@
-<!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 10.0.4 Release Notes / (March 12, 2014)</h1>
-
-<p>
-Mesa 10.0.4 is a bug fix release which fixes bugs found since the 10.0.3 release.
-</p>
-<p>
-Mesa 10.0.4 implements the OpenGL 3.3 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.3.  OpenGL
-3.3 is <strong>only</strong> available if requested at context creation
-because compatibility contexts not supported.
-</p>
-
-
-<h2>MD5 checksums</h2>
-<pre>
-5a3c5b90776ec8a9fcd777c99e0607e2  MesaLib-10.0.4.tar.gz
-8b148869d2620b0720c8a8d2b7eb3e38  MesaLib-10.0.4.tar.bz2
-da2418d25bfbc273660af7e755fb367e  MesaLib-10.0.4.zip
-</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=71870">Bug 71870</a> - Metro: Last Light rendering issues</li>
-
-<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=72895">Bug 72895</a> - Missing trees in flightgear 2.12.1 with mesa 10.0.1</li>
-
-<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=74251">Bug 74251</a> - Segfault in st_finalize_texture with Texture Buffer</li>
-
-<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=74723">Bug 74723</a> - main/shaderapi.c:407: detach_shader: Assertion `shProg-&gt;Shaders[j]-&gt;Type == 0x8B31 || shProg-&gt;Shaders[j]-&gt;Type == 0x8B30' failed.</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-10.0.3..mesa-10.0.4
-</pre>
-
-<p>Anuj Phogat (4):</p>
-<ul>
-  <li>mesa: Generate correct error code in glDrawBuffers()</li>
-  <li>mesa: Add GL_TEXTURE_CUBE_MAP_ARRAY to legal_get_tex_level_parameter_target()</li>
-  <li>glsl: Fix condition to generate shader link error</li>
-  <li>i965: Fix the region's pitch condition to use blitter</li>
-</ul>
-
-<p>Brian Paul (8):</p>
-<ul>
-  <li>r200: move driContextSetFlags(ctx) call after ctx var is initialized</li>
-  <li>radeon: move driContextSetFlags(ctx) call after ctx var is initialized</li>
-  <li>gallium/auxiliary/indices: replace free() with FREE()</li>
-  <li>draw: fix incorrect color of flat-shaded clipped lines</li>
-  <li>st/mesa: avoid sw fallback for getting/decompressing textures</li>
-  <li>mesa: update assertion in detach_shader() for geom shaders</li>
-  <li>mesa: do depth/stencil format conversion in glGetTexImage</li>
-  <li>softpipe: use 64-bit arithmetic in softpipe_resource_layout()</li>
-</ul>
-
-<p>Carl Worth (4):</p>
-<ul>
-  <li>docs: Add md5sums for 10.0.3 release</li>
-  <li>main: Avoid double-free of shader Label</li>
-  <li>get-pick-list: Update to only find patches nominated for the 10.0 branch</li>
-  <li>Update version to 10.0.4</li>
-</ul>
-
-<p>Chris Forbes (1):</p>
-<ul>
-  <li>i965: Validate (and resolve) all the bound textures.</li>
-</ul>
-
-<p>Christian König (1):</p>
-<ul>
-  <li>radeon/uvd: fix feedback buffer handling v2</li>
-</ul>
-
-<p>Daniel Kurtz (1):</p>
-<ul>
-  <li>glsl: Add locking to builtin_builder singleton</li>
-</ul>
-
-<p>Emil Velikov (3):</p>
-<ul>
-  <li>dri/nouveau: Pass the API into _mesa_initialize_context</li>
-  <li>nv50: correctly calculate the number of vertical blocks during transfer map</li>
-  <li>dri/i9*5: correctly calculate the amount of system memory</li>
-</ul>
-
-<p>Fredrik Höglund (3):</p>
-<ul>
-  <li>mesa: Preserve the NewArrays state when copying a VAO</li>
-  <li>glx: Fix the default values for GLXFBConfig attributes</li>
-  <li>glx: Fix the GLXFBConfig attrib sort priorities</li>
-</ul>
-
-<p>Hans (2):</p>
-<ul>
-  <li>util: don't define isfinite(), isnan() for MSVC &gt;= 1800</li>
-  <li>mesa: don't define c99 math functions for MSVC &gt;= 1800</li>
-</ul>
-
-<p>Ian Romanick (6):</p>
-<ul>
-  <li>meta: Release resources used by decompress_texture_image</li>
-  <li>meta: Release resources used by _mesa_meta_DrawPixels</li>
-  <li>meta: Fallback to software for GetTexImage of compressed GL_TEXTURE_CUBE_MAP_ARRAY</li>
-  <li>meta: Consistenly use non-Apple VAO functions</li>
-  <li>glcpp: Only warn for macro names containing __</li>
-  <li>glsl: Only warn for macro names containing __</li>
-</ul>
-
-<p>Ilia Mirkin (3):</p>
-<ul>
-  <li>nv30: report 8 maximum inputs</li>
-  <li>nouveau/video: make sure that firmware is present when checking caps</li>
-  <li>nouveau: fix chipset checks for nv1a by using the oclass instead</li>
-</ul>
-
-<p>Julien Cristau (1):</p>
-<ul>
-  <li>glx/dri2: fix build failure on HURD</li>
-</ul>
-
-<p>Kenneth Graunke (2):</p>
-<ul>
-  <li>glsl: Don't lose precision qualifiers when encountering "centroid".</li>
-  <li>i965: Create a hardware context before initializing state module.</li>
-</ul>
-
-<p>Kusanagi Kouichi (1):</p>
-<ul>
-  <li>targets/vdpau: Always use c++ to link</li>
-</ul>
-
-<p>Marek Olšák (1):</p>
-<ul>
-  <li>st/mesa: fix crash when a shader uses a TBO and it's not bound</li>
-</ul>
-
-<p>Matt Turner (1):</p>
-<ul>
-  <li>glsl: Initialize ubo_binding_mask flags to zero.</li>
-</ul>
-
-<p>Paul Berry (2):</p>
-<ul>
-  <li>glsl: Make condition_to_hir() callable from outside ast_iteration_statement.</li>
-  <li>glsl: Fix continue statements in do-while loops.</li>
-</ul>
-
-<p>Tom Stellard (1):</p>
-<ul>
-  <li>r600g/compute: PIPE_CAP_COMPUTE should be false for pre-evergreen GPUs</li>
-</ul>
-
-<p>Topi Pohjolainen (1):</p>
-<ul>
-  <li>i965/blorp: do not use unnecessary hw-blending support</li>
-</ul>
-
-</div>
-</body>
-</html>

docs/relnotes/10.0.5.html

@@ -1,173 +0,0 @@
-<!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 10.0.5 Release Notes / (April 18, 2014)</h1>
-
-<p>
-Mesa 10.0.5 is a bug fix release which fixes bugs found since the 10.0.4 release.
-</p>
-<p>
-Mesa 10.0.5 implements the OpenGL 3.3 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.3.  OpenGL
-3.3 is <strong>only</strong> available if requested at context creation
-because compatibility contexts not supported.
-</p>
-
-
-<h2>MD5 checksums</h2>
-<pre>
-db606aadd0fe321f3664099677d159bc  MesaLib-10.0.5.tar.gz
-e6009ccd8898d7104bb325b6af9ec354  MesaLib-10.0.5.tar.bz2
-c8ab9e502542bf32299a4df85b0b704d  MesaLib-10.0.5.zip
-</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=58660">Bug 58660</a> - CAYMAN broken with HyperZ on</li>
-
-<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=64471">Bug 64471</a> - Radeon HD6570 lockup in Brütal Legend with HyperZ</li>
-
-<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=66352">Bug 66352</a> - GPU lockup in L4D2 on TURKS with HyperZ</li>
-
-<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=68799">Bug 68799</a> - [APITRACE] Hyper-Z lockup with Falcon BMS 4.32u6 on CAYMAN</li>
-
-<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=71547">Bug 71547</a> - compilation failure :#error &quot;SSE4.1 instruction set not enabled&quot;</li>
-
-<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=72685">Bug 72685</a> - [radeonsi hyperz] Artifacts in Unigine Sanctuary</li>
-
-<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=73088">Bug 73088</a> - [HyperZ] Juniper (6770): Gone Home / Unigine Heaven 4.0 lock up system after several minutes of use</li>
-
-<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=74428">Bug 74428</a> - hyperz causes gpu hang in Counter-strike: Source</li>
-
-<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=74803">Bug 74803</a> - [r600g] HyperZ broken on RV630 (Cogs shadows are broken)</li>
-
-<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=74863">Bug 74863</a> - [r600g] HyperZ broken on RV770 and CYPRESS (Left 4 Dead 2 trees corruption) bisected!</li>
-
-<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=74892">Bug 74892</a> - HyperZ GPU lockup with radeonsi 7970M PITCAIRN and Distance Alpha game</li>
-
-<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=74988">Bug 74988</a> - Buffer overrun (segfault) decompressing ETC2 texture in GLBenchmark 3.0 Manhattan</li>
-
-<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=75279">Bug 75279</a> - XCloseDisplay() takes one minute around nouveau_dri.so, freezing Firefox startup</li>
-
-<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=77102">Bug 77102</a> - gallium nouveau has no profile in vdpau and libva</li>
-
-<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=77207">Bug 77207</a> - [ivb/hsw] batch overwritten with garbage</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-10.0.4..mesa-10.0.5
-</pre>
-
-<p>Alex Deucher (1):</p>
-<ul>
-  <li>radeon: reverse DBG_NO_HYPERZ logic</li>
-</ul>
-
-<p>Brian Paul (9):</p>
-<ul>
-  <li>mesa: add unpacking code for MESA_FORMAT_Z32_FLOAT_S8X24_UINT</li>
-  <li>mesa: fix copy &amp; paste bugs in pack_ubyte_SARGB8()</li>
-  <li>mesa: fix copy &amp; paste bugs in pack_ubyte_SRGB8()</li>
-  <li>mesa: fix unpack_Z32_FLOAT_X24S8() / unpack_Z32_FLOAT() mix-up</li>
-  <li>st/mesa: add null pointer checking in query object functions</li>
-  <li>mesa: fix glMultiDrawArrays inside a display list</li>
-  <li>cso: fix sampler view count in cso_set_sampler_views()</li>
-  <li>svga: replace sampler assertion with conditional</li>
-  <li>svga: move LIST_INITHEAD(dirty_buffers) earlier in svga_context_create()</li>
-</ul>
-
-<p>Carl Worth (3):</p>
-<ul>
-  <li>docs: Add md5sums for the 10.0.4 release.</li>
-  <li>Ignore patches which don't apply.</li>
-  <li>Update version to 10.0.5</li>
-</ul>
-
-<p>Christian König (2):</p>
-<ul>
-  <li>st/mesa: recreate sampler view on context change v3</li>
-  <li>st/mesa: fix sampler view handling with shared textures v4</li>
-</ul>
-
-<p>Courtney Goeltzenleuchter (1):</p>
-<ul>
-  <li>mesa: add bounds checking to eliminate buffer overrun</li>
-</ul>
-
-<p>Emil Velikov (2):</p>
-<ul>
-  <li>mesa: return v.value_int64 when the requested type is TYPE_INT64</li>
-  <li>glx: drop obsolete _XUnlock_Mutex in __glXInitialize error path</li>
-</ul>
-
-<p>Eric Anholt (1):</p>
-<ul>
-  <li>i965: Fix buffer overruns in MSAA MCS buffer clearing.</li>
-</ul>
-
-<p>Ilia Mirkin (6):</p>
-<ul>
-  <li>nouveau: fix fence waiting logic in screen destroy</li>
-  <li>nv50: adjust blit_3d handling of ms output textures</li>
-  <li>mesa/main: condition GL_DEPTH_STENCIL on ARB_depth_texture</li>
-  <li>nouveau: add forgotten GL_COMPRESSED_INTENSITY to texture format list</li>
-  <li>nouveau: there may not have been a texture if the fbo was incomplete</li>
-  <li>nouveau: fix firmware check on nvd7/nvd9</li>
-</ul>
-
-<p>Johannes Nixdorf (1):</p>
-<ul>
-  <li>configure.ac: fix the detection of expat with pkg-config</li>
-</ul>
-
-<p>Jonathan Gray (1):</p>
-<ul>
-  <li>gallium: add endian detection for OpenBSD</li>
-</ul>
-
-<p>José Fonseca (1):</p>
-<ul>
-  <li>draw: Duplicate TGSI tokens in draw_pipe_pstipple module.</li>
-</ul>
-
-<p>Matt Turner (1):</p>
-<ul>
-  <li>mesa: Wrap SSE4.1 code in #ifdef __SSE4_1__.</li>
-</ul>
-
-<p>Paul Berry (1):</p>
-<ul>
-  <li>i965/gen7: Prefer vertical alignment of 4 when possible.</li>
-</ul>
-
-</div>
-</body>
-</html>

docs/relnotes/10.0.html

@@ -14,7 +14,7 @@
 <iframe src="../contents.html"></iframe>
 <div class="content">
 
-<h1>Mesa 10.0 Release Notes / (November 30th, 2013)</h1>
+<h1>Mesa 10.0 Release Notes / TBD</h1>
 
 <p>
 Mesa 10.0 is a new development release.
@@ -33,9 +33,7 @@ because compatibility contexts are not supported.
 
 <h2>MD5 checksums</h2>
 <pre>
-b38626b96c664db67a534d7859682436  MesaLib-10.0.0.tar.gz
-f3fe55d9735bea158bbe97ed9a0da819  MesaLib-10.0.0.tar.bz2
-c6ee1ce51e3bf35947d2978b872daf51  MesaLib-10.0.0.zip
+TBD.
 </pre>
 
 
@@ -57,89 +55,16 @@ Note: some of the new features are only available with certain drivers.
 <li>GL_ARB_vertex_attrib_binding</li>
 <li>GL_ARB_vertex_type_10f_11f_11f_rev on i965 and r600g</li>
 <li>GL_KHR_debug</li>
-<li>GLX_MESA_query_renderer</li>
 </ul>
 
 
 <h2>Bug fixes</h2>
 
-<p>Attempts have been made to <b>not</b> include bugs fixed in previous 9.2
-releases or bugs that were regressions during 10.0 development. This list is
-likely incomplete.</p>
-
-<ul>
-
-<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=47755">Bug 47755</a> - [glsl-compiler] no error checking when Interpolation qualifier for built-in variable is different in vertex and fragment shader</li>
-
-<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=52171">Bug 52171</a> - [gallium/r600/clover] Simple benchmarks failed to run</li>
-
-<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=53077">Bug 53077</a> - [IVB] Output error with msaa when both of framebuffer and source color's alpha are not 1</li>
-
-<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=54867">Bug 54867</a> - bug in r300 compiler</li>
-
-<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=60929">Bug 60929</a> - [r600-llvm] mono games with opengl are blocking on start</li>
-
-<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=62142">Bug 62142</a> - Mesa/demo mipmap_limits upside down with running by SOFTWARE</li>
-
-<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=62698">Bug 62698</a> - [bisected] WebGL demo &quot;Consumed&quot;: texstate.c:628: update_texture_state: Assertion „__builtin_popcount(enabledTargets) == 1“ failed.</li>
-
-<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=64225">Bug 64225</a> - bfgminer --scyte generates Segmentation Fault on Northern Island</li>
-
-<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=64226">Bug 64226</a> - python-opencl package generate segmentation fault at pipe_r600.so</li>
-
-<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=64261">Bug 64261</a> - [SNB Bisected]Ogles3conform GL3Tests_color_buffer_float_color_buffer_float_clamp_fixed.test fail</li>
-
-<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=66213">Bug 66213</a> - Certain Mesa Demos Rendering Inverted (vertically)</li>
-
-<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=66806">Bug 66806</a> - [softpipe] glxgears floating point exception</li>
-
-<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=67921">Bug 67921</a> - [bisected commit 883987] crosscompiling fails with util/u_cpu_detect.c:247:4: error: 'asm' undeclared (first use in this function)</li>
-
-<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=68162">Bug 68162</a> - [radeonsi] texture rendering is broken in Source-Engine games</li>
-
-<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=68451">Bug 68451</a> - Texture flicker in native Dota2 in mesa 9.2.0rc1</li>
-
-<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=68503">Bug 68503</a> - Graphical glitches in Serious Sam 3 when SB is enabled</li>
-
-<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=68792">Bug 68792</a> - Problems during playback of h264 files using UVD and VLC on AMD E-350 CPU</li>
-
-<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=68845">Bug 68845</a> - VDPAU/UVD regression</li>
-
-<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=69078">Bug 69078</a> - Modern Warfare (1, 2 and 3) broken in Wine on SNB</li>
-
-<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=69321">Bug 69321</a> - starting openCL crashes/boots system</li>
-
-<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=70042">Bug 70042</a> - Major texture flickering in Dota 2 (r600g on HD 6950)</li>
-
-<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=70088">Bug 70088</a> - Glamor on r600g crashes Xserver</li>
-
-<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=70123">Bug 70123</a> - Freeze caused by 'winsys/radeon: remove cs_queue_empty' commit</li>
-
-<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=70327">Bug 70327</a> - Casting floating point variable to integer not working properly while constant gets converted properly</li>
-
-<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=70891">Bug 70891</a> - CL_INVALID_BUILD_OPTIONS results in CL_INVALID_DEVICE when asking for build log</li>
-
-<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=70913">Bug 70913</a> - [PIGLIT,radeonsi] crash in &quot;spec/EXT_framebuffer_multisample/sample-alpha-to-coverage 4 depth&quot; (buffer overflow)</li>
-
-<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=71022">Bug 71022</a> - configure: error: Expat required for DRI.</li>
-
-<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=71110">Bug 71110</a> - xorg_driver.c:1030:2: error: too many arguments to function ‘DamageUnregister’</li>
-
-<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=71172">Bug 71172</a> - Segfault when running glxinfo. NV25GL [Quadro4 900 XGL]</li>
-
-<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=71512">Bug 71512</a> - dlopen.h:54: undefined reference to `dlopen'</li>
-
-<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=71870">Bug 71870</a> - Metro: Last Light rendering issues</li>
-
-</ul>
+TBD.
 
 <h2>Changes</h2>
 
-<ul>
-<li>Removed X.Org state tracker (unmaintained and broken)</li>
-<li>Removed the video-accel r300 targets</li>
-<li>Removed the video-accel softpipe targets</li>
-</ul>
+TBD.
 
 </div>
 </body>

include/GL/glx.h

@@ -168,7 +168,6 @@ typedef XID GLXDrawable;
 /* GLX 1.3 and later */
 typedef struct __GLXFBConfigRec *GLXFBConfig;
 typedef XID GLXFBConfigID;
-typedef XID GLXContextID;
 typedef XID GLXWindow;
 typedef XID GLXPbuffer;
 

include/GL/glxext.h

@@ -33,10 +33,10 @@ extern "C" {
 ** used to make the header, and the header can be found at
 **   http://www.opengl.org/registry/
 **
-** Khronos $Revision: 24777 $ on $Date: 2014-01-14 14:02:32 -0800 (Tue, 14 Jan 2014) $
+** Khronos $Revision: 23422 $ on $Date: 2013-10-08 15:40:45 -0700 (Tue, 08 Oct 2013) $
 */
 
-#define GLX_GLXEXT_VERSION 20140114
+#define GLX_GLXEXT_VERSION 20131008
 
 /* Generated C header for:
  * API: glx
@@ -49,7 +49,6 @@ extern "C" {
 
 #ifndef GLX_VERSION_1_3
 #define GLX_VERSION_1_3 1
-typedef XID GLXContextID;
 typedef struct __GLXFBConfigRec *GLXFBConfig;
 typedef XID GLXWindow;
 typedef XID GLXPbuffer;
@@ -273,6 +272,7 @@ __GLXextFuncPtr glXGetProcAddressARB (const GLubyte *procName);
 
 #ifndef GLX_EXT_import_context
 #define GLX_EXT_import_context 1
+typedef XID GLXContextID;
 #define GLX_SHARE_CONTEXT_EXT             0x800A
 #define GLX_VISUAL_ID_EXT                 0x800B
 #define GLX_SCREEN_EXT                    0x800C
@@ -433,14 +433,6 @@ void glXCopyImageSubDataNV (Display *dpy, GLXContext srcCtx, GLuint srcName, GLe
 #endif
 #endif /* GLX_NV_copy_image */
 
-#ifndef GLX_NV_delay_before_swap
-#define GLX_NV_delay_before_swap 1
-typedef Bool ( *PFNGLXDELAYBEFORESWAPNVPROC) (Display *dpy, GLXDrawable drawable, GLfloat seconds);
-#ifdef GLX_GLXEXT_PROTOTYPES
-Bool glXDelayBeforeSwapNV (Display *dpy, GLXDrawable drawable, GLfloat seconds);
-#endif
-#endif /* GLX_NV_delay_before_swap */
-
 #ifndef GLX_NV_float_buffer
 #define GLX_NV_float_buffer 1
 #define GLX_FLOAT_COMPONENTS_NV           0x20B0

include/GL/internal/dri_interface.h

@@ -782,6 +782,12 @@ typedef __DRIdrawable *
                               const __DRIconfig *config,
                               void *loaderPrivate);
 
+typedef __DRIcontext *
+(*__DRIcreateNewContextFunc)(__DRIscreen *screen,
+                             const __DRIconfig *config,
+                             __DRIcontext *shared,
+                             void *loaderPrivate);
+
 typedef __DRIcontext *
 (*__DRIcreateContextAttribsFunc)(__DRIscreen *screen,
                                  int api,
@@ -943,10 +949,7 @@ struct __DRIdri2ExtensionRec {
 				    void *loaderPrivate);
 
    __DRIcreateNewDrawableFunc   createNewDrawable;
-   __DRIcontext *(*createNewContext)(__DRIscreen *screen,
-                                     const __DRIconfig *config,
-                                     __DRIcontext *shared,
-                                     void *loaderPrivate);
+   __DRIcreateNewContextFunc    createNewContext;
 
    /* Since version 2 */
    __DRIgetAPIMaskFunc          getAPIMask;
@@ -1402,6 +1405,7 @@ struct __DRIimageDriverExtensionRec {
    /* Common DRI functions, shared with DRI2 */
    __DRIcreateNewScreen2Func            createNewScreen2;
    __DRIcreateNewDrawableFunc           createNewDrawable;
+   __DRIcreateNewContextFunc            createNewContext;
    __DRIcreateContextAttribsFunc        createContextAttribs;
    __DRIgetAPIMaskFunc                  getAPIMask;
 };

include/GLES2/gl2platform.h

@@ -27,4 +27,6 @@
 #define GL_APIENTRY KHRONOS_APIENTRY
 #endif
 
+#define GL_STENCIL_INDEX 0x1901
+
 #endif /* __gl2platform_h_ */

include/HaikuGL/GLRenderer.h

@@ -1,76 +0,0 @@
-/*
- * Copyright 2006, Philippe Houdoin. All rights reserved.
- * Distributed under the terms of the MIT License.
-
- * This header defines BGLRenderer, the base class making up
- * the Haiku GL renderer add-ons (essentially selfcontained C++
- * shared libraries that do the actual rendering such as
- * libswpipe.so and libswrast.so)
- */
-#ifndef GLRENDERER_H
-#define GLRENDERER_H
-
-
-#include <BeBuild.h>
-#include <GLView.h>
-
-
-class BGLDispatcher;
-class GLRendererRoster;
-
-typedef unsigned long renderer_id;
-
-class BGLRenderer
-{
-							// Private unimplemented copy constructors
-							BGLRenderer(const BGLRenderer &);
-							BGLRenderer & operator=(const BGLRenderer &);
-	
-public:
-							BGLRenderer(BGLView *view, ulong bgl_options,
-								BGLDispatcher *dispatcher);
-	virtual					~BGLRenderer();
-
-	void 					Acquire();
-	void					Release();
-
-	virtual void			LockGL();
-	virtual void 			UnlockGL();
-	
-	virtual	void 			SwapBuffers(bool VSync = false);
-	virtual	void			Draw(BRect updateRect);
-	virtual status_t		CopyPixelsOut(BPoint source, BBitmap *dest);
-	virtual status_t    	CopyPixelsIn(BBitmap *source, BPoint dest);
-
- 	virtual void			FrameResized(float width, float height);
-	
-	virtual void			DirectConnected(direct_buffer_info *info);
-	virtual void			EnableDirectMode(bool enabled);
-
-	inline	int32			ReferenceCount() const { return fRefCount; };
-	inline	ulong			Options() const { return fOptions; };
-	inline	BGLView*		GLView() { return fView; };
-	inline	BGLDispatcher*	GLDispatcher() { return fDispatcher; };
-
-private:
-	friend class GLRendererRoster;
-
-	virtual status_t		_Reserved_Renderer_0(int32, void *);
-	virtual status_t		_Reserved_Renderer_1(int32, void *);
-	virtual status_t		_Reserved_Renderer_2(int32, void *);
-	virtual status_t		_Reserved_Renderer_3(int32, void *);
-	virtual status_t		_Reserved_Renderer_4(int32, void *);
-
-	volatile int32			fRefCount;	// How much we're still usefull?
-	BGLView*				fView;		// Never forget who is the boss!
-	ulong					fOptions;	// Keep that tune in memory
-	BGLDispatcher*			fDispatcher;// Our personal GL API call dispatcher
-
-	GLRendererRoster*		fOwningRoster;
-	renderer_id				fID;
-};
-
-extern "C" _EXPORT BGLRenderer* instantiate_gl_renderer(BGLView *view, ulong options, BGLDispatcher *dispatcher);
-
-
-#endif	// GLRENDERER_H

include/HaikuGL/GLView.h

@@ -1,193 +0,0 @@
-/*
- * Copyright 2008-2013, Haiku, Inc. All Rights Reserved.
- * Distributed under the terms of the MIT License.
- *
- * This header defines BGLView, the base class making up
- * the Haiku GL Kit.
- *
- */
-#ifndef BGLVIEW_H
-#define BGLVIEW_H
-
-
-#include <GL/gl.h>
-
-#define BGL_RGB			0
-#define BGL_INDEX		1
-#define BGL_SINGLE		0
-#define BGL_DOUBLE		2
-#define BGL_DIRECT		0
-#define BGL_INDIRECT	4
-#define BGL_ACCUM		8
-#define BGL_ALPHA		16
-#define BGL_DEPTH		32
-#define BGL_OVERLAY		64
-#define BGL_UNDERLAY	128
-#define BGL_STENCIL		512
-
-#ifdef __cplusplus
-
-#include <AppKit.h>
-#include <Bitmap.h>
-#include <DirectWindow.h>
-#include <View.h>
-#include <Window.h>
-#include <WindowScreen.h>
-
-
-struct glview_direct_info;
-class BGLRenderer;
-class GLRendererRoster;
-
-class BGLView : public BView {
-public:
-							BGLView(BRect rect, const char* name,
-								ulong resizingMode, ulong mode,
-								ulong options);
-	virtual					~BGLView();
-
-			void			LockGL();
-			void			UnlockGL();
-			void			SwapBuffers();
-			void			SwapBuffers(bool vSync);
-
-			BView*			EmbeddedView(); // deprecated, returns NULL
-			void*			GetGLProcAddress(const char* procName);
-
-			status_t		CopyPixelsOut(BPoint source, BBitmap *dest);
-			status_t		CopyPixelsIn(BBitmap *source, BPoint dest);
-
-	// Mesa's GLenum is uint where Be's ones was ulong!
-	virtual	void			ErrorCallback(unsigned long errorCode);
-
-	virtual void			Draw(BRect updateRect);
-	virtual void			AttachedToWindow();
-	virtual void			AllAttached();
-	virtual void			DetachedFromWindow();
-	virtual void			AllDetached();
-
-	virtual void			FrameResized(float newWidth, float newHeight);
-	virtual status_t		Perform(perform_code d, void *arg);
-
-	virtual status_t		Archive(BMessage *data, bool deep = true) const;
-
-	virtual void			MessageReceived(BMessage *message);
-	virtual void			SetResizingMode(uint32 mode);
-
-	virtual void			Show();
-	virtual void			Hide();
-
-	virtual BHandler*		ResolveSpecifier(BMessage *msg, int32 index,
-								BMessage *specifier, int32 form,
-								const char *property);
-	virtual status_t		GetSupportedSuites(BMessage *data);
-
-			void			DirectConnected(direct_buffer_info *info);
-			void			EnableDirectMode(bool enabled);
-
-			void*			getGC()	{ return fGc; } // ???
-
-	virtual void			GetPreferredSize(float* width, float* height);
-
-private:
-
-	virtual void			_ReservedGLView1();
-	virtual void			_ReservedGLView2();
-	virtual void			_ReservedGLView3();
-	virtual void			_ReservedGLView4();
-	virtual void			_ReservedGLView5();
-	virtual void			_ReservedGLView6();
-	virtual void			_ReservedGLView7();
-	virtual void			_ReservedGLView8();
-
-							BGLView(const BGLView &);
-							BGLView &operator=(const BGLView &);
-
-			void			_DitherFront();
-			bool			_ConfirmDither();
-			void			_Draw(BRect rect);
-			void			_CallDirectConnected();
-
-			void*			fGc;
-			uint32			fOptions;
-			uint32			fDitherCount;
-			BLocker			fDrawLock;
-			BLocker			fDisplayLock;
-			glview_direct_info* fClipInfo;
-
-			BGLRenderer*	fRenderer;
-			GLRendererRoster* fRoster;
-
-			BBitmap*		fDitherMap;
-			BRect			fBounds;
-			int16*			fErrorBuffer[2];
-			uint64			_reserved[8];
-
-			void			_LockDraw();
-			void			_UnlockDraw();
-
-// BeOS compatibility
-private:
-							BGLView(BRect rect, char* name,
-								ulong resizingMode, ulong mode,
-								ulong options);
-};
-
-
-class BGLScreen : public BWindowScreen {
-public:
-							BGLScreen(char* name,
-								ulong screenMode, ulong options,
-								status_t *error, bool debug=false);
-							~BGLScreen();
-
-			void			LockGL();
-			void			UnlockGL();
-			void			SwapBuffers();
-							// Mesa's GLenum is uint where Be's ones was ulong!
-	virtual	void			ErrorCallback(unsigned long errorCode);
-
-	virtual void			ScreenConnected(bool connected);
-	virtual void			FrameResized(float width, float height);
-	virtual status_t		Perform(perform_code code, void *arg);
-
-	virtual status_t		Archive(BMessage *data, bool deep = true) const;
-	virtual void			MessageReceived(BMessage *message);
-
-	virtual void			Show();
-	virtual void			Hide();
-
-	virtual BHandler*		ResolveSpecifier(BMessage *message,
-								int32 index,
-								BMessage *specifier,
-								int32 form,
-								const char *property);
-	virtual status_t		GetSupportedSuites(BMessage *data);
-
-private:
-
-	virtual void			_ReservedGLScreen1();
-	virtual void			_ReservedGLScreen2();
-	virtual void			_ReservedGLScreen3();
-	virtual void			_ReservedGLScreen4();
-	virtual void			_ReservedGLScreen5();
-	virtual void			_ReservedGLScreen6();
-	virtual void			_ReservedGLScreen7();
-	virtual void			_ReservedGLScreen8();
-
-							BGLScreen(const BGLScreen &);
-							BGLScreen &operator=(const BGLScreen &);
-
-			void*			fGc;
-			long			fOptions;
-			BLocker			fDrawLock;
-
-			int32			fColorSpace;
-			uint32			fScreenMode;
-
-			uint64			_reserved[7];
-};
-
-#endif // __cplusplus
-
-#endif // BGLVIEW_H

include/HaikuGL/OpenGLKit.h

@@ -1,10 +0,0 @@
-/*
- * Master include file for the Haiku OpenGL Kit.
- */
-
-#include <GL/gl.h>
-#include <GLView.h>
-
-// Projects needing GL/glu.h and GL/glut.h should now
-// include these headers independently as glu and glut
-// are no longe core parts of mesa

include/HaikuGL/README

@@ -1,28 +0,0 @@
-These headers make up the Haiku Op*nGL kit.
-
-Headers in this directory preserve some BeOS™ compatibility
-compatibility, so changes should be mentioned to the Haiku
-project mailing list.
-
-http://haiku-os.org
-
-Normal Haiku Op*enGL layout:
-
-  * headers/os/OpenGLKit.h
-  * headers/os/opengl/GLView.h
-  * headers/os/opengl/GLRenderer.h
-  * headers/os/opengl/GL/gl.h
-  * headers/os/opengl/GL/gl_mangle.h
-  * headers/os/opengl/GL/glext.h
-  * headers/os/opengl/GL/osmesa.h (needed?)
-
-Extras:
-
-  * headers/os/opengl/GL/glu.h
-  * headers/os/opengl/GL/glut.h
-
-OpenGL™ is a trademark of SGI. The usage of this trademark
-in the Haiku GL Kit is not a sign of any certification or
-endorsement by SGI or its affiliates. Usage is purely to
-allow legacy compatibility with the BeOS™ and its 3D GL
-rendering subsystem.

include/pci_ids/r600_pci_ids.h

@@ -208,7 +208,7 @@ CHIPSET(0x9644, SUMO2_9644, SUMO2)
 CHIPSET(0x9645, SUMO2_9645, SUMO2)
 CHIPSET(0x9647, SUMO_9647,  SUMO)
 CHIPSET(0x9648, SUMO_9648,  SUMO)
-CHIPSET(0x9649, SUMO2_9649, SUMO2)
+CHIPSET(0x9649, SUMO_9649,  SUMO)
 CHIPSET(0x964a, SUMO_964A,  SUMO)
 CHIPSET(0x964b, SUMO_964B,  SUMO)
 CHIPSET(0x964c, SUMO_964C,  SUMO)

m4/ax_check_compile_flag.m4

@@ -1,72 +0,0 @@
-# ===========================================================================
-#   http://www.gnu.org/software/autoconf-archive/ax_check_compile_flag.html
-# ===========================================================================
-#
-# SYNOPSIS
-#
-#   AX_CHECK_COMPILE_FLAG(FLAG, [ACTION-SUCCESS], [ACTION-FAILURE], [EXTRA-FLAGS])
-#
-# DESCRIPTION
-#
-#   Check whether the given FLAG works with the current language's compiler
-#   or gives an error.  (Warnings, however, are ignored)
-#
-#   ACTION-SUCCESS/ACTION-FAILURE are shell commands to execute on
-#   success/failure.
-#
-#   If EXTRA-FLAGS is defined, it is added to the current language's default
-#   flags (e.g. CFLAGS) when the check is done.  The check is thus made with
-#   the flags: "CFLAGS EXTRA-FLAGS FLAG".  This can for example be used to
-#   force the compiler to issue an error when a bad flag is given.
-#
-#   NOTE: Implementation based on AX_CFLAGS_GCC_OPTION. Please keep this
-#   macro in sync with AX_CHECK_{PREPROC,LINK}_FLAG.
-#
-# LICENSE
-#
-#   Copyright (c) 2008 Guido U. Draheim <guidod@gmx.de>
-#   Copyright (c) 2011 Maarten Bosmans <mkbosmans@gmail.com>
-#
-#   This program is free software: you can redistribute it and/or modify it
-#   under the terms of the GNU General Public License as published by the
-#   Free Software Foundation, either version 3 of the License, or (at your
-#   option) any later version.
-#
-#   This program is distributed in the hope that it will be useful, but
-#   WITHOUT ANY WARRANTY; without even the implied warranty of
-#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
-#   Public License for more details.
-#
-#   You should have received a copy of the GNU General Public License along
-#   with this program. If not, see <http://www.gnu.org/licenses/>.
-#
-#   As a special exception, the respective Autoconf Macro's copyright owner
-#   gives unlimited permission to copy, distribute and modify the configure
-#   scripts that are the output of Autoconf when processing the Macro. You
-#   need not follow the terms of the GNU General Public License when using
-#   or distributing such scripts, even though portions of the text of the
-#   Macro appear in them. The GNU General Public License (GPL) does govern
-#   all other use of the material that constitutes the Autoconf Macro.
-#
-#   This special exception to the GPL applies to versions of the Autoconf
-#   Macro released by the Autoconf Archive. When you make and distribute a
-#   modified version of the Autoconf Macro, you may extend this special
-#   exception to the GPL to apply to your modified version as well.
-
-#serial 2
-
-AC_DEFUN([AX_CHECK_COMPILE_FLAG],
-[AC_PREREQ(2.59)dnl for _AC_LANG_PREFIX
-AS_VAR_PUSHDEF([CACHEVAR],[ax_cv_check_[]_AC_LANG_ABBREV[]flags_$4_$1])dnl
-AC_CACHE_CHECK([whether _AC_LANG compiler accepts $1], CACHEVAR, [
-  ax_check_save_flags=$[]_AC_LANG_PREFIX[]FLAGS
-  _AC_LANG_PREFIX[]FLAGS="$[]_AC_LANG_PREFIX[]FLAGS $4 $1"
-  AC_COMPILE_IFELSE([AC_LANG_PROGRAM()],
-    [AS_VAR_SET(CACHEVAR,[yes])],
-    [AS_VAR_SET(CACHEVAR,[no])])
-  _AC_LANG_PREFIX[]FLAGS=$ax_check_save_flags])
-AS_IF([test x"AS_VAR_GET(CACHEVAR)" = xyes],
-  [m4_default([$2], :)],
-  [m4_default([$3], :)])
-AS_VAR_POPDEF([CACHEVAR])dnl
-])dnl AX_CHECK_COMPILE_FLAGS

src/egl/drivers/dri2/egl_dri2.h

@@ -117,7 +117,7 @@ struct dri2_egl_display
 
    __DRIdri2LoaderExtension    dri2_loader_extension;
    __DRIswrastLoaderExtension  swrast_loader_extension;
-   const __DRIextension     *extensions[5];
+   const __DRIextension     *extensions[4];
    const __DRIextension    **driver_extensions;
 
 #ifdef HAVE_X11_PLATFORM
@@ -189,6 +189,7 @@ struct dri2_egl_surface
 #ifdef HAVE_WAYLAND_PLATFORM
       struct wl_buffer   *wl_buffer;
       __DRIimage         *dri_image;
+      int                 pitch, name;
 #endif
 #ifdef HAVE_DRM_PLATFORM
       struct gbm_bo       *bo;

src/egl/drivers/dri2/platform_drm.c

@@ -175,12 +175,13 @@ dri2_destroy_surface(_EGLDriver *drv, _EGLDisplay *disp, _EGLSurface *surf)
 }
 
 static int
-get_back_bo(struct dri2_egl_surface *dri2_surf)
+get_back_bo(struct dri2_egl_surface *dri2_surf, __DRIbuffer *buffer)
 {
    struct dri2_egl_display *dri2_dpy =
       dri2_egl_display(dri2_surf->base.Resource.Display);
+   struct gbm_dri_bo *bo;
    struct gbm_dri_surface *surf = dri2_surf->gbm_surf;
-   int i;
+   int i, name, pitch;
 
    if (dri2_surf->back == NULL) {
       for (i = 0; i < ARRAY_SIZE(dri2_surf->color_buffers); i++) {
@@ -200,17 +201,6 @@ get_back_bo(struct dri2_egl_surface *dri2_surf)
    if (dri2_surf->back->bo == NULL)
       return -1;
 
-   return 0;
-}
-
-static void
-back_bo_to_dri_buffer(struct dri2_egl_surface *dri2_surf, __DRIbuffer *buffer)
-{
-   struct dri2_egl_display *dri2_dpy =
-      dri2_egl_display(dri2_surf->base.Resource.Display);
-   struct gbm_dri_bo *bo;
-   int name, pitch;
-
    bo = (struct gbm_dri_bo *) dri2_surf->back->bo;
 
    dri2_dpy->image->queryImage(bo->image, __DRI_IMAGE_ATTRIB_NAME, &name);
@@ -221,6 +211,8 @@ back_bo_to_dri_buffer(struct dri2_egl_surface *dri2_surf, __DRIbuffer *buffer)
    buffer->pitch = pitch;
    buffer->cpp = 4;
    buffer->flags = 0;
+
+   return 0;
 }
 
 static int
@@ -262,11 +254,10 @@ dri2_get_buffers_with_format(__DRIdrawable *driDrawable,
 
       switch (attachments[i]) {
       case __DRI_BUFFER_BACK_LEFT:
-	 if (get_back_bo(dri2_surf) < 0) {
+	 if (get_back_bo(dri2_surf, &dri2_surf->buffers[j]) < 0) {
 	    _eglError(EGL_BAD_ALLOC, "failed to allocate color buffer");
 	    return NULL;
 	 }
-         back_bo_to_dri_buffer(dri2_surf, &dri2_surf->buffers[j]);
 	 break;
       default:
 	 if (get_aux_bo(dri2_surf, attachments[i], attachments[i + 1],
@@ -321,27 +312,6 @@ dri2_get_buffers(__DRIdrawable * driDrawable,
    return buffer;
 }
 
-static int
-dri_image_get_buffers(__DRIdrawable *driDrawable,
-                      unsigned int format,
-                      uint32_t *stamp,
-                      void *loaderPrivate,
-                      uint32_t buffer_mask,
-                      struct __DRIimageList *buffers)
-{
-   struct dri2_egl_surface *dri2_surf = loaderPrivate;
-   struct gbm_dri_bo *bo;
-
-   if (get_back_bo(dri2_surf) < 0)
-      return 0;
-
-   bo = (struct gbm_dri_bo *) dri2_surf->back->bo;
-   buffers->image_mask = __DRI_IMAGE_BUFFER_BACK;
-   buffers->back = bo->image;
-
-   return 1;
-}
-
 static void
 dri2_flush_front_buffer(__DRIdrawable * driDrawable, void *loaderPrivate)
 {
@@ -378,8 +348,9 @@ dri2_query_buffer_age(_EGLDriver *drv,
                       _EGLDisplay *disp, _EGLSurface *surface)
 {
    struct dri2_egl_surface *dri2_surf = dri2_egl_surface(surface);
+   __DRIbuffer buffer;
 
-   if (get_back_bo(dri2_surf) < 0) {
+   if (get_back_bo(dri2_surf, &buffer) < 0) {
       _eglError(EGL_BAD_ALLOC, "dri2_query_buffer_age");
       return 0;
    }
@@ -498,7 +469,6 @@ dri2_initialize_drm(_EGLDriver *drv, _EGLDisplay *disp)
    dri2_dpy->gbm_dri->get_buffers = dri2_get_buffers;
    dri2_dpy->gbm_dri->flush_front_buffer = dri2_flush_front_buffer;
    dri2_dpy->gbm_dri->get_buffers_with_format = dri2_get_buffers_with_format;
-   dri2_dpy->gbm_dri->image_get_buffers = dri_image_get_buffers;
 
    dri2_dpy->gbm_dri->base.base.surface_lock_front_buffer = lock_front_buffer;
    dri2_dpy->gbm_dri->base.base.surface_release_buffer = release_buffer;

src/egl/drivers/dri2/platform_wayland.c

@@ -257,11 +257,12 @@ dri2_release_buffers(struct dri2_egl_surface *dri2_surf)
 }
 
 static int
-get_back_bo(struct dri2_egl_surface *dri2_surf)
+get_back_bo(struct dri2_egl_surface *dri2_surf, __DRIbuffer *buffer)
 {
    struct dri2_egl_display *dri2_dpy =
       dri2_egl_display(dri2_surf->base.Resource.Display);
-   int i;
+   __DRIimage *image;
+   int i, name, pitch;
 
    /* There might be a buffer release already queued that wasn't processed */
    wl_display_dispatch_queue_pending(dri2_dpy->wl_dpy, dri2_dpy->wl_queue);
@@ -294,30 +295,23 @@ get_back_bo(struct dri2_egl_surface *dri2_surf)
    if (dri2_surf->back->dri_image == NULL)
       return -1;
 
-   dri2_surf->back->locked = 1;
-
-   return 0;
-}
-
-
-static void
-back_bo_to_dri_buffer(struct dri2_egl_surface *dri2_surf, __DRIbuffer *buffer)
-{
-   struct dri2_egl_display *dri2_dpy =
-      dri2_egl_display(dri2_surf->base.Resource.Display);
-   __DRIimage *image;
-   int name, pitch;
-
    image = dri2_surf->back->dri_image;
 
    dri2_dpy->image->queryImage(image, __DRI_IMAGE_ATTRIB_NAME, &name);
    dri2_dpy->image->queryImage(image, __DRI_IMAGE_ATTRIB_STRIDE, &pitch);
 
+   dri2_surf->back->name = name;
+   dri2_surf->back->pitch = pitch;
+
    buffer->attachment = __DRI_BUFFER_BACK_LEFT;
    buffer->name = name;
    buffer->pitch = pitch;
    buffer->cpp = 4;
    buffer->flags = 0;
+
+   dri2_surf->back->locked = 1;
+
+   return 0;
 }
 
 static int
@@ -343,12 +337,16 @@ get_aux_bo(struct dri2_egl_surface *dri2_surf,
    return 0;
 }
 
-static int
-update_buffers(struct dri2_egl_surface *dri2_surf)
+static __DRIbuffer *
+dri2_get_buffers_with_format(__DRIdrawable * driDrawable,
+			     int *width, int *height,
+			     unsigned int *attachments, int count,
+			     int *out_count, void *loaderPrivate)
 {
+   struct dri2_egl_surface *dri2_surf = loaderPrivate;
    struct dri2_egl_display *dri2_dpy =
       dri2_egl_display(dri2_surf->base.Resource.Display);
-   int i;
+   int i, j;
 
    if (dri2_surf->base.Type == EGL_WINDOW_BIT &&
        (dri2_surf->base.Width != dri2_surf->wl_win->width || 
@@ -362,9 +360,22 @@ update_buffers(struct dri2_egl_surface *dri2_surf)
       dri2_surf->dy = dri2_surf->wl_win->dy;
    }
 
-   if (get_back_bo(dri2_surf) < 0) {
-      _eglError(EGL_BAD_ALLOC, "failed to allocate color buffer");
-      return -1;
+   for (i = 0, j = 0; i < 2 * count; i += 2, j++) {
+      switch (attachments[i]) {
+      case __DRI_BUFFER_BACK_LEFT:
+	 if (get_back_bo(dri2_surf, &dri2_surf->buffers[j]) < 0) {
+	    _eglError(EGL_BAD_ALLOC, "failed to allocate color buffer");
+	    return NULL;
+	 }
+	 break;
+      default:
+	 if (get_aux_bo(dri2_surf, attachments[i], attachments[i + 1],
+			&dri2_surf->buffers[j]) < 0) {
+	    _eglError(EGL_BAD_ALLOC, "failed to allocate aux buffer");
+	    return NULL;
+	 }
+	 break;
+      }
    }
 
    /* If we have an extra unlocked buffer at this point, we had to do triple
@@ -380,36 +391,6 @@ update_buffers(struct dri2_egl_surface *dri2_surf)
       }
    }
 
-   return 0;
-}
-
-static __DRIbuffer *
-dri2_get_buffers_with_format(__DRIdrawable * driDrawable,
-			     int *width, int *height,
-			     unsigned int *attachments, int count,
-			     int *out_count, void *loaderPrivate)
-{
-   struct dri2_egl_surface *dri2_surf = loaderPrivate;
-   int i, j;
-
-   if (update_buffers(dri2_surf) < 0)
-      return NULL;
-
-   for (i = 0, j = 0; i < 2 * count; i += 2, j++) {
-      switch (attachments[i]) {
-      case __DRI_BUFFER_BACK_LEFT:
-         back_bo_to_dri_buffer(dri2_surf, &dri2_surf->buffers[j]);
-	 break;
-      default:
-	 if (get_aux_bo(dri2_surf, attachments[i], attachments[i + 1],
-			&dri2_surf->buffers[j]) < 0) {
-	    _eglError(EGL_BAD_ALLOC, "failed to allocate aux buffer");
-	    return NULL;
-	 }
-	 break;
-      }
-   }
-
    *out_count = j;
    if (j == 0)
 	   return NULL;
@@ -453,25 +434,6 @@ dri2_get_buffers(__DRIdrawable * driDrawable,
    return buffer;
 }
 
-static int
-image_get_buffers(__DRIdrawable *driDrawable,
-                  unsigned int format,
-                  uint32_t *stamp,
-                  void *loaderPrivate,
-                  uint32_t buffer_mask,
-                  struct __DRIimageList *buffers)
-{
-   struct dri2_egl_surface *dri2_surf = loaderPrivate;
-
-   if (update_buffers(dri2_surf) < 0)
-      return 0;
-
-   buffers->image_mask = __DRI_IMAGE_BUFFER_BACK;
-   buffers->back = dri2_surf->back->dri_image;
-
-   return 1;
-}
-
 static void
 dri2_flush_front_buffer(__DRIdrawable * driDrawable, void *loaderPrivate)
 {
@@ -479,12 +441,6 @@ dri2_flush_front_buffer(__DRIdrawable * driDrawable, void *loaderPrivate)
    (void) loaderPrivate;
 }
 
-static const __DRIimageLoaderExtension image_loader_extension = {
-   { __DRI_IMAGE_LOADER, 1 },
-   image_get_buffers,
-   dri2_flush_front_buffer
-};
-
 static void
 wayland_frame_callback(void *data, struct wl_callback *callback, uint32_t time)
 {
@@ -503,7 +459,7 @@ create_wl_buffer(struct dri2_egl_surface *dri2_surf)
 {
    struct dri2_egl_display *dri2_dpy =
       dri2_egl_display(dri2_surf->base.Resource.Display);
-   int fd, stride, name;
+   int fd;
 
    if (dri2_surf->current->wl_buffer != NULL)
       return;
@@ -511,8 +467,6 @@ create_wl_buffer(struct dri2_egl_surface *dri2_surf)
    if (dri2_dpy->capabilities & WL_DRM_CAPABILITY_PRIME) {
       dri2_dpy->image->queryImage(dri2_surf->current->dri_image,
                                   __DRI_IMAGE_ATTRIB_FD, &fd);
-      dri2_dpy->image->queryImage(dri2_surf->current->dri_image,
-                                  __DRI_IMAGE_ATTRIB_STRIDE, &stride);
 
       dri2_surf->current->wl_buffer =
          wl_drm_create_prime_buffer(dri2_dpy->wl_drm,
@@ -520,22 +474,17 @@ create_wl_buffer(struct dri2_egl_surface *dri2_surf)
                                     dri2_surf->base.Width,
                                     dri2_surf->base.Height,
                                     dri2_surf->format,
-                                    0, stride,
+                                    0, dri2_surf->current->pitch,
                                     0, 0,
                                     0, 0);
       close(fd);
    } else {
-      dri2_dpy->image->queryImage(dri2_surf->current->dri_image,
-                                  __DRI_IMAGE_ATTRIB_NAME, &name);
-      dri2_dpy->image->queryImage(dri2_surf->current->dri_image,
-                                  __DRI_IMAGE_ATTRIB_STRIDE, &stride);
-
       dri2_surf->current->wl_buffer =
          wl_drm_create_buffer(dri2_dpy->wl_drm,
-                              name,
+                              dri2_surf->current->name,
                               dri2_surf->base.Width,
                               dri2_surf->base.Height,
-                              stride,
+                              dri2_surf->current->pitch,
                               dri2_surf->format);
    }
 
@@ -557,8 +506,7 @@ dri2_swap_buffers_with_damage(_EGLDriver *drv,
 {
    struct dri2_egl_display *dri2_dpy = dri2_egl_display(disp);
    struct dri2_egl_surface *dri2_surf = dri2_egl_surface(draw);
-   struct dri2_egl_context *dri2_ctx;
-   _EGLContext *ctx;
+   __DRIbuffer buffer;
    int i, ret = 0;
 
    while (dri2_surf->frame_callback && ret != -1)
@@ -578,7 +526,7 @@ dri2_swap_buffers_with_damage(_EGLDriver *drv,
 
    /* Make sure we have a back buffer in case we're swapping without ever
     * rendering. */
-   if (get_back_bo(dri2_surf) < 0) {
+   if (get_back_bo(dri2_surf, &buffer) < 0) {
       _eglError(EGL_BAD_ALLOC, "dri2_swap_buffers");
       return EGL_FALSE;
    }
@@ -600,8 +548,8 @@ dri2_swap_buffers_with_damage(_EGLDriver *drv,
    dri2_surf->dy = 0;
 
    if (n_rects == 0) {
-      wl_surface_damage(dri2_surf->wl_win->surface,
-                        0, 0, INT32_MAX, INT32_MAX);
+      wl_surface_damage(dri2_surf->wl_win->surface, 0, 0,
+                        dri2_surf->base.Width, dri2_surf->base.Height);
    } else {
       for (i = 0; i < n_rects; i++) {
          const int *rect = &rects[i * 4];
@@ -612,21 +560,10 @@ dri2_swap_buffers_with_damage(_EGLDriver *drv,
       }
    }
 
-   if (dri2_dpy->flush->base.version >= 4) {
-      ctx = _eglGetCurrentContext();
-      dri2_ctx = dri2_egl_context(ctx);
-      (*dri2_dpy->flush->flush_with_flags)(dri2_ctx->dri_context,
-                                           dri2_surf->dri_drawable,
-                                           __DRI2_FLUSH_DRAWABLE,
-                                           __DRI2_THROTTLE_SWAPBUFFER);
-   } else {
-      (*dri2_dpy->flush->flush)(dri2_surf->dri_drawable);
-   }
-
-   (*dri2_dpy->flush->invalidate)(dri2_surf->dri_drawable);
-
    wl_surface_commit(dri2_surf->wl_win->surface);
-   wl_display_flush(dri2_dpy->wl_dpy);
+
+   (*dri2_dpy->flush->flush)(dri2_surf->dri_drawable);
+   (*dri2_dpy->flush->invalidate)(dri2_surf->dri_drawable);
 
    return EGL_TRUE;
 }
@@ -636,8 +573,9 @@ dri2_query_buffer_age(_EGLDriver *drv,
                       _EGLDisplay *disp, _EGLSurface *surface)
 {
    struct dri2_egl_surface *dri2_surf = dri2_egl_surface(surface);
+   __DRIbuffer buffer;
 
-   if (get_back_bo(dri2_surf) < 0) {
+   if (get_back_bo(dri2_surf, &buffer) < 0) {
       _eglError(EGL_BAD_ALLOC, "dri2_query_buffer_age");
       return 0;
    }
@@ -861,12 +799,11 @@ dri2_initialize_wayland(_EGLDriver *drv, _EGLDisplay *disp)
    dri2_dpy->dri2_loader_extension.flushFrontBuffer = dri2_flush_front_buffer;
    dri2_dpy->dri2_loader_extension.getBuffersWithFormat =
       dri2_get_buffers_with_format;
-
+      
    dri2_dpy->extensions[0] = &dri2_dpy->dri2_loader_extension.base;
-   dri2_dpy->extensions[1] = &image_loader_extension.base;
-   dri2_dpy->extensions[2] = &image_lookup_extension.base;
-   dri2_dpy->extensions[3] = &use_invalidate.base;
-   dri2_dpy->extensions[4] = NULL;
+   dri2_dpy->extensions[1] = &image_lookup_extension.base;
+   dri2_dpy->extensions[2] = &use_invalidate.base;
+   dri2_dpy->extensions[3] = NULL;
 
    if (!dri2_create_screen(disp))
       goto cleanup_driver;

src/gallium/auxiliary/cso_cache/cso_context.c

@@ -1182,12 +1182,11 @@ cso_set_sampler_views(struct cso_context *ctx,
       pipe_sampler_view_reference(&info->views[i], NULL);
    }
 
-   /* bind the new sampler views */
-   ctx->pipe->set_sampler_views(ctx->pipe, shader_stage, 0,
-                                MAX2(info->nr_views, count),
-                                info->views);
-
    info->nr_views = count;
+
+   /* bind the new sampler views */
+   ctx->pipe->set_sampler_views(ctx->pipe, shader_stage, 0, count,
+                                info->views);
 }
 
 

src/gallium/auxiliary/draw/draw_pipe_clip.c

@@ -588,12 +588,7 @@ do_clip_line( struct draw_stage *stage,
 
    if (v0->clipmask) {
       interp( clipper, stage->tmp[0], t0, v0, v1, viewport_index );
-      if (stage->draw->rasterizer->flatshade_first) {
-         copy_flat(stage, stage->tmp[0], v0);  /* copy v0 color to tmp[0] */
-      }
-      else {
-         copy_flat(stage, stage->tmp[0], v1);  /* copy v1 color to tmp[0] */
-      }
+      copy_flat(stage, stage->tmp[0], v0);
       newprim.v[0] = stage->tmp[0];
    }
    else {
@@ -602,12 +597,6 @@ do_clip_line( struct draw_stage *stage,
 
    if (v1->clipmask) {
       interp( clipper, stage->tmp[1], t1, v1, v0, viewport_index );
-      if (stage->draw->rasterizer->flatshade_first) {
-         copy_flat(stage, stage->tmp[1], v0);  /* copy v0 color to tmp[1] */
-      }
-      else {
-         copy_flat(stage, stage->tmp[1], v1);  /* copy v1 color to tmp[1] */
-      }
       newprim.v[1] = stage->tmp[1];
    }
    else {

src/gallium/auxiliary/draw/draw_pipe_pstipple.c

@@ -673,7 +673,7 @@ pstip_create_fs_state(struct pipe_context *pipe,
    struct pstip_fragment_shader *pstipfs = CALLOC_STRUCT(pstip_fragment_shader);
 
    if (pstipfs) {
-      pstipfs->state.tokens = tgsi_dup_tokens(fs->tokens);
+      pstipfs->state = *fs;
 
       /* pass-through */
       pstipfs->driver_fs = pstip->driver_create_fs_state(pstip->pipe, fs);
@@ -707,7 +707,6 @@ pstip_delete_fs_state(struct pipe_context *pipe, void *fs)
    if (pstipfs->pstip_fs)
       pstip->driver_delete_fs_state(pstip->pipe, pstipfs->pstip_fs);
 
-   FREE((void*)pstipfs->state.tokens);
    FREE(pstipfs);
 }
 

src/gallium/auxiliary/draw/draw_pt_fetch_shade_pipeline.c

@@ -72,8 +72,8 @@ static void fetch_pipeline_prepare( struct draw_pt_middle_end *middle,
 
    const unsigned gs_out_prim = (gs ? gs->output_primitive :
                                  u_assembled_prim(prim));
-   unsigned nr_vs_outputs = draw_total_vs_outputs(draw);
-   unsigned nr = MAX2(vs->info.num_inputs, nr_vs_outputs);
+   unsigned nr = MAX2( vs->info.num_inputs,
+		       draw_total_vs_outputs(draw) );
 
    if (gs) {
       nr = MAX2(nr, gs->info.num_outputs + 1);
@@ -129,9 +129,6 @@ static void fetch_pipeline_prepare( struct draw_pt_middle_end *middle,
    /* No need to prepare the shader.
     */
    vs->prepare(vs, draw);
-
-   /* Make sure that the vertex size didn't change at any point above */
-   assert(nr_vs_outputs == draw_total_vs_outputs(draw));
 }
 
 

src/gallium/auxiliary/draw/draw_pt_fetch_shade_pipeline_llvm.c

@@ -141,11 +141,19 @@ llvm_middle_end_prepare( struct draw_pt_middle_end *middle,
    struct draw_geometry_shader *gs = draw->gs.geometry_shader;
    const unsigned out_prim = gs ? gs->output_primitive :
       u_assembled_prim(in_prim);
-   unsigned nr;
+   const unsigned nr = MAX2(vs->info.num_inputs,
+                            draw_total_vs_outputs(draw));
 
    fpme->input_prim = in_prim;
    fpme->opt = opt;
 
+   /* Always leave room for the vertex header whether we need it or
+    * not.  It's hard to get rid of it in particular because of the
+    * viewport code in draw_pt_post_vs.c.
+    */
+   fpme->vertex_size = sizeof(struct vertex_header) + nr * 4 * sizeof(float);
+
+
    draw_pt_post_vs_prepare( fpme->post_vs,
                             draw->clip_xy,
                             draw->clip_z,
@@ -169,30 +177,6 @@ llvm_middle_end_prepare( struct draw_pt_middle_end *middle,
       *max_vertices = 4096;
    }
 
-   /* Get the number of float[4] attributes per vertex.
-    * Note: this must be done after draw_pt_emit_prepare() since that
-    * can effect the vertex size.
-    */
-   nr = MAX2(vs->info.num_inputs, draw_total_vs_outputs(draw));
-
-   /* Always leave room for the vertex header whether we need it or
-    * not.  It's hard to get rid of it in particular because of the
-    * viewport code in draw_pt_post_vs.c.
-    */
-   fpme->vertex_size = sizeof(struct vertex_header) + nr * 4 * sizeof(float);
-
-   /* Get the number of float[4] attributes per vertex.
-    * Note: this must be done after draw_pt_emit_prepare() since that
-    * can effect the vertex size.
-    */
-   nr = MAX2(vs->info.num_inputs, draw_total_vs_outputs(draw));
-
-   /* Always leave room for the vertex header whether we need it or
-    * not.  It's hard to get rid of it in particular because of the
-    * viewport code in draw_pt_post_vs.c.
-    */
-   fpme->vertex_size = sizeof(struct vertex_header) + nr * 4 * sizeof(float);
-
    /* return even number */
    *max_vertices = *max_vertices & ~1;
 

src/gallium/auxiliary/indices/u_primconvert.c

@@ -74,7 +74,7 @@ void
 util_primconvert_destroy(struct primconvert_context *pc)
 {
    util_primconvert_save_index_buffer(pc, NULL);
-   FREE(pc);
+   free(pc);
 }
 
 void

src/gallium/auxiliary/os/os_thread.h

@@ -41,7 +41,7 @@
 #include "util/u_debug.h" /* for assert */
 
 
-#if defined(PIPE_OS_LINUX) || defined(PIPE_OS_BSD) || defined(PIPE_OS_SOLARIS) || defined(PIPE_OS_APPLE) || defined(PIPE_OS_HAIKU) || defined(PIPE_OS_CYGWIN) || defined(PIPE_OS_HURD)
+#if defined(PIPE_OS_LINUX) || defined(PIPE_OS_BSD) || defined(PIPE_OS_SOLARIS) || defined(PIPE_OS_APPLE) || defined(PIPE_OS_HAIKU) || defined(PIPE_OS_CYGWIN)
 
 #include <pthread.h> /* POSIX threads headers */
 #include <stdio.h> /* for perror() */
@@ -316,7 +316,7 @@ typedef int64_t pipe_condvar;
  * pipe_barrier
  */
 
-#if (defined(PIPE_OS_LINUX) || defined(PIPE_OS_BSD) || defined(PIPE_OS_SOLARIS) || defined(PIPE_OS_HURD)) && !defined(PIPE_OS_ANDROID)
+#if (defined(PIPE_OS_LINUX) || defined(PIPE_OS_BSD) || defined(PIPE_OS_SOLARIS)) && !defined(PIPE_OS_ANDROID)
 
 typedef pthread_barrier_t pipe_barrier;
 
@@ -444,7 +444,7 @@ pipe_semaphore_wait(pipe_semaphore *sema)
  */
 
 typedef struct {
-#if defined(PIPE_OS_LINUX) || defined(PIPE_OS_BSD) || defined(PIPE_OS_SOLARIS) || defined(PIPE_OS_APPLE) || defined(PIPE_OS_HAIKU) || defined(PIPE_OS_CYGWIN) || defined(PIPE_OS_HURD)
+#if defined(PIPE_OS_LINUX) || defined(PIPE_OS_BSD) || defined(PIPE_OS_SOLARIS) || defined(PIPE_OS_APPLE) || defined(PIPE_OS_HAIKU) || defined(PIPE_OS_CYGWIN)
    pthread_key_t key;
 #elif defined(PIPE_SUBSYSTEM_WINDOWS_USER)
    DWORD key;
@@ -459,7 +459,7 @@ typedef struct {
 static INLINE void
 pipe_tsd_init(pipe_tsd *tsd)
 {
-#if defined(PIPE_OS_LINUX) || defined(PIPE_OS_BSD) || defined(PIPE_OS_SOLARIS) || defined(PIPE_OS_APPLE) || defined(PIPE_OS_HAIKU) || defined(PIPE_OS_CYGWIN) || defined(PIPE_OS_HURD)
+#if defined(PIPE_OS_LINUX) || defined(PIPE_OS_BSD) || defined(PIPE_OS_SOLARIS) || defined(PIPE_OS_APPLE) || defined(PIPE_OS_HAIKU) || defined(PIPE_OS_CYGWIN)
    if (pthread_key_create(&tsd->key, NULL/*free*/) != 0) {
       perror("pthread_key_create(): failed to allocate key for thread specific data");
       exit(-1);
@@ -476,7 +476,7 @@ pipe_tsd_get(pipe_tsd *tsd)
    if (tsd->initMagic != (int) PIPE_TSD_INIT_MAGIC) {
       pipe_tsd_init(tsd);
    }
-#if defined(PIPE_OS_LINUX) || defined(PIPE_OS_BSD) || defined(PIPE_OS_SOLARIS) || defined(PIPE_OS_APPLE) || defined(PIPE_OS_HAIKU) || defined(PIPE_OS_CYGWIN) || defined(PIPE_OS_HURD)
+#if defined(PIPE_OS_LINUX) || defined(PIPE_OS_BSD) || defined(PIPE_OS_SOLARIS) || defined(PIPE_OS_APPLE) || defined(PIPE_OS_HAIKU) || defined(PIPE_OS_CYGWIN)
    return pthread_getspecific(tsd->key);
 #elif defined(PIPE_SUBSYSTEM_WINDOWS_USER)
    assert(0);
@@ -493,7 +493,7 @@ pipe_tsd_set(pipe_tsd *tsd, void *value)
    if (tsd->initMagic != (int) PIPE_TSD_INIT_MAGIC) {
       pipe_tsd_init(tsd);
    }
-#if defined(PIPE_OS_LINUX) || defined(PIPE_OS_BSD) || defined(PIPE_OS_SOLARIS) || defined(PIPE_OS_APPLE) || defined(PIPE_OS_HAIKU) || defined(PIPE_OS_CYGWIN) || defined(PIPE_OS_HURD)
+#if defined(PIPE_OS_LINUX) || defined(PIPE_OS_BSD) || defined(PIPE_OS_SOLARIS) || defined(PIPE_OS_APPLE) || defined(PIPE_OS_HAIKU) || defined(PIPE_OS_CYGWIN)
    if (pthread_setspecific(tsd->key, value) != 0) {
       perror("pthread_set_specific() failed");
       exit(-1);

src/gallium/auxiliary/pipe-loader/pipe_loader_drm.c

@@ -88,9 +88,6 @@ find_drm_pci_id(struct pipe_loader_drm_device *ddev)
               &ddev->base.u.pci.chip_id) != 2)
       goto fail;
 
-   udev_device_unref(device);
-   udev_unref(udev);
-
    return TRUE;
 
   fail:

src/gallium/auxiliary/pipe-loader/pipe_loader_sw.c

@@ -95,11 +95,8 @@ pipe_loader_sw_create_screen(struct pipe_loader_device *dev,
       return NULL;
 
    init = (void *)util_dl_get_proc_address(sdev->lib, "swrast_create_screen");
-   if (!init){
-      util_dl_close(sdev->lib);
-      sdev->lib = NULL;
+   if (!init)
       return NULL;
-   }
 
    return init(sdev->ws);
 }

src/gallium/auxiliary/rtasm/rtasm_execmem.c

@@ -69,7 +69,7 @@ static struct mem_block *exec_heap = NULL;
 static unsigned char *exec_mem = NULL;
 
 
-static int
+static void
 init_heap(void)
 {
    if (!exec_heap)
@@ -79,8 +79,6 @@ init_heap(void)
       exec_mem = (unsigned char *) mmap(0, EXEC_HEAP_SIZE, 
 					PROT_EXEC | PROT_READ | PROT_WRITE, 
 					MAP_PRIVATE | MAP_ANONYMOUS, -1, 0);
-
-   return (exec_mem != MAP_FAILED);
 }
 
 
@@ -92,8 +90,7 @@ rtasm_exec_malloc(size_t size)
 
    pipe_mutex_lock(exec_mutex);
 
-   if (!init_heap())
-      goto bail;
+   init_heap();
 
    if (exec_heap) {
       size = (size + 31) & ~31;  /* next multiple of 32 bytes */
@@ -104,8 +101,7 @@ rtasm_exec_malloc(size_t size)
       addr = exec_mem + block->ofs;
    else 
       debug_printf("rtasm_exec_malloc failed\n");
-
-bail:
+   
    pipe_mutex_unlock(exec_mutex);
    
    return addr;

src/gallium/auxiliary/util/u_format.h

@@ -872,9 +872,6 @@ util_format_get_component_bits(enum pipe_format format,
 static INLINE enum pipe_format
 util_format_srgb(enum pipe_format format)
 {
-   if (util_format_is_srgb(format))
-      return format;
-
    switch (format) {
    case PIPE_FORMAT_L8_UNORM:
       return PIPE_FORMAT_L8_SRGB;

src/gallium/auxiliary/util/u_math.h

@@ -112,13 +112,10 @@ static INLINE float logf( float f )
 #define logf(x) ((float)log((double)(x)))
 #endif /* logf */
 
-#if _MSC_VER < 1800
 #define isfinite(x) _finite((double)(x))
 #define isnan(x) _isnan((double)(x))
-#endif /* _MSC_VER < 1800 */
 #endif /* _MSC_VER < 1400 && !defined(__cplusplus) */
 
-#if _MSC_VER < 1800
 static INLINE double log2( double x )
 {
    const double invln2 = 1.442695041;
@@ -136,7 +133,6 @@ roundf(float x)
 {
    return x >= 0.0f ? floorf(x + 0.5f) : ceilf(x - 0.5f);
 }
-#endif
 
 #define INFINITY (DBL_MAX + DBL_MAX)
 #define NAN (INFINITY - INFINITY)

src/gallium/drivers/llvmpipe/lp_state_sampler.c

@@ -136,12 +136,6 @@ llvmpipe_set_sampler_views(struct pipe_context *pipe,
 
    /* set the new sampler views */
    for (i = 0; i < num; i++) {
-      /* Note: we're using pipe_sampler_view_release() here to work around
-       * a possible crash when the old view belongs to another context that
-       * was already destroyed.
-       */
-      pipe_sampler_view_release(pipe,
-                                &llvmpipe->sampler_views[shader][start + i]);
       pipe_sampler_view_reference(&llvmpipe->sampler_views[shader][start + i],
                                   views[i]);
    }

src/gallium/drivers/nouveau/nouveau_buffer.c

@@ -205,9 +205,6 @@ nouveau_transfer_write(struct nouveau_context *nv, struct nouveau_transfer *tx,
                   base, size / 4, (const uint32_t *)data);
    else
       nv->push_data(nv, buf->bo, buf->offset + base, buf->domain, size, data);
-
-   nouveau_fence_ref(nv->screen->fence.current, &buf->fence);
-   nouveau_fence_ref(nv->screen->fence.current, &buf->fence_wr);
 }
 
 

src/gallium/drivers/nouveau/nouveau_fence.c

@@ -189,15 +189,16 @@ nouveau_fence_wait(struct nouveau_fence *fence)
    /* wtf, someone is waiting on a fence in flush_notify handler? */
    assert(fence->state != NOUVEAU_FENCE_STATE_EMITTING);
 
-   if (fence->state < NOUVEAU_FENCE_STATE_EMITTED)
+   if (fence->state < NOUVEAU_FENCE_STATE_EMITTED) {
       nouveau_fence_emit(fence);
 
-   if (fence->state < NOUVEAU_FENCE_STATE_FLUSHED)
+      if (fence == screen->fence.current)
+         nouveau_fence_new(screen, &screen->fence.current, FALSE);
+   }
+   if (fence->state < NOUVEAU_FENCE_STATE_FLUSHED) {
       if (nouveau_pushbuf_kick(screen->pushbuf, screen->pushbuf->channel))
          return FALSE;
-
-   if (fence == screen->fence.current)
-      nouveau_fence_next(screen);
+   }
 
    do {
       nouveau_fence_update(screen, FALSE);

src/gallium/drivers/nouveau/nouveau_screen.h

@@ -49,11 +49,6 @@ struct nouveau_screen {
 
 	boolean hint_buf_keep_sysmem_copy;
 
-	struct {
-		unsigned profiles_checked;
-		unsigned profiles_present;
-	} firmware_info;
-
 #ifdef NOUVEAU_ENABLE_DRIVER_STATISTICS
    union {
       uint64_t v[29];

src/gallium/drivers/nouveau/nouveau_video.c

@@ -519,7 +519,7 @@ nouveau_create_decoder(struct pipe_context *context,
       goto vl;
    if (screen->device->chipset >= 0x98 && screen->device->chipset != 0xa0)
       goto vl;
-   if (screen->device->chipset < 0x40)
+   if (screen->device->chipset < 0x31 || screen->device->chipset == 0x35)
       goto vl;
 
    dec = CALLOC_STRUCT(nouveau_decoder);
@@ -611,6 +611,7 @@ nouveau_create_decoder(struct pipe_context *context,
    BEGIN_NV04(push, NV31_MPEG(FORMAT), 2);
    PUSH_DATA (push, 0);
    switch (templ->entrypoint) {
+      case PIPE_VIDEO_ENTRYPOINT_BITSTREAM: PUSH_DATA (push, 0x100); break;
       case PIPE_VIDEO_ENTRYPOINT_IDCT: PUSH_DATA (push, 1); break;
       case PIPE_VIDEO_ENTRYPOINT_MC: PUSH_DATA (push, 0); break;
       default: assert(0);
@@ -781,7 +782,7 @@ nouveau_video_buffer_create(struct pipe_context *pipe,
     */
    if (templat->buffer_format != PIPE_FORMAT_NV12 || getenv("XVMC_VL") ||
        (screen->device->chipset >= 0x98 && screen->device->chipset != 0xa0) ||
-       screen->device->chipset < 0x40)
+       screen->device->chipset < 0x31 || screen->device->chipset == 0x35)
       return vl_video_buffer_create(pipe, templat);
 
    assert(templat->chroma_format == PIPE_VIDEO_CHROMA_FORMAT_420);
@@ -838,8 +839,7 @@ nouveau_screen_get_video_param(struct pipe_screen *pscreen,
 {
    switch (param) {
    case PIPE_VIDEO_CAP_SUPPORTED:
-      return entrypoint >= PIPE_VIDEO_ENTRYPOINT_IDCT &&
-         u_reduce_video_profile(profile) == PIPE_VIDEO_FORMAT_MPEG12;
+      return vl_profile_supported(pscreen, profile, entrypoint);
    case PIPE_VIDEO_CAP_NPOT_TEXTURES:
       return 1;
    case PIPE_VIDEO_CAP_MAX_WIDTH:

src/gallium/drivers/nouveau/nouveau_vp3_video.c

@@ -21,7 +21,6 @@
  */
 
 #include <sys/mman.h>
-#include <sys/stat.h>
 #include <stdio.h>
 #include <fcntl.h>
 
@@ -351,77 +350,6 @@ nouveau_vp3_load_firmware(struct nouveau_vp3_decoder *dec,
    return 0;
 }
 
-static int
-firmware_present(struct pipe_screen *pscreen, enum pipe_video_profile profile)
-{
-   struct nouveau_screen *screen = nouveau_screen(pscreen);
-   int chipset = screen->device->chipset;
-   int vp3 = chipset < 0xa3 || chipset == 0xaa || chipset == 0xac;
-   int vp5 = chipset >= 0xd0;
-   int ret;
-
-   /* For all chipsets, try to create a BSP objects. Assume that if firmware
-    * is present for it, firmware is also present for VP/PPP */
-   if (!(screen->firmware_info.profiles_checked & 1)) {
-      struct nouveau_object *channel = NULL, *bsp = NULL;
-      struct nv04_fifo nv04_data = {.vram = 0xbeef0201, .gart = 0xbeef0202};
-      struct nvc0_fifo nvc0_args = {};
-      struct nve0_fifo nve0_args = {.engine = NVE0_FIFO_ENGINE_BSP};
-      void *data = NULL;
-      int size, oclass;
-      if (chipset < 0xc0)
-         oclass = 0x85b1;
-      else if (chipset < 0xe0)
-         oclass = 0x90b1;
-      else
-         oclass = 0x95b1;
-
-      if (chipset < 0xc0) {
-         data = &nv04_data;
-         size = sizeof(nv04_data);
-      } else if (chipset < 0xe0) {
-         data = &nvc0_args;
-         size = sizeof(nvc0_args);
-      } else {
-         data = &nve0_args;
-         size = sizeof(nve0_args);
-      }
-
-      /* kepler must have its own channel, so just do this for everyone */
-      nouveau_object_new(&screen->device->object, 0,
-                         NOUVEAU_FIFO_CHANNEL_CLASS,
-                         data, size, &channel);
-
-      if (channel) {
-         nouveau_object_new(channel, 0, oclass, NULL, 0, &bsp);
-         if (bsp)
-            screen->firmware_info.profiles_present |= 1;
-         nouveau_object_del(&bsp);
-         nouveau_object_del(&channel);
-      }
-      screen->firmware_info.profiles_checked |= 1;
-   }
-
-   if (!(screen->firmware_info.profiles_present & 1))
-      return 0;
-
-   /* For vp3/vp4 chipsets, make sure that the relevant firmware is present */
-   if (!vp5 && !(screen->firmware_info.profiles_checked & (1 << profile))) {
-      char path[PATH_MAX];
-      struct stat s;
-      if (vp3)
-         vp3_getpath(profile, path);
-      else
-         vp4_getpath(profile, path);
-      ret = stat(path, &s);
-      if (!ret && s.st_size > 1000)
-         screen->firmware_info.profiles_present |= (1 << profile);
-      screen->firmware_info.profiles_checked |= (1 << profile);
-   }
-
-   return vp5 || (screen->firmware_info.profiles_present & (1 << profile));
-}
-
 int
 nouveau_vp3_screen_get_video_param(struct pipe_screen *pscreen,
                                    enum pipe_video_profile profile,
@@ -434,11 +362,14 @@ nouveau_vp3_screen_get_video_param(struct pipe_screen *pscreen,
    enum pipe_video_format codec = u_reduce_video_profile(profile);
    switch (param) {
    case PIPE_VIDEO_CAP_SUPPORTED:
-      /* VP3 does not support MPEG4, VP4+ do. */
-      return entrypoint == PIPE_VIDEO_ENTRYPOINT_BITSTREAM &&
-         profile >= PIPE_VIDEO_PROFILE_MPEG1 &&
-         (!vp3 || codec != PIPE_VIDEO_FORMAT_MPEG4) &&
-         firmware_present(pscreen, profile);
+      /* For now, h264 and mpeg4 don't work on pre-nvc0. */
+      if (chipset < 0xc0)
+         return codec == PIPE_VIDEO_FORMAT_MPEG12 ||
+            codec == PIPE_VIDEO_FORMAT_VC1;
+      /* In the general case, this should work, once the pre-nvc0 problems are
+       * resolved. */
+      return profile >= PIPE_VIDEO_PROFILE_MPEG1 && (
+            !vp3 || codec != PIPE_VIDEO_FORMAT_MPEG4);
    case PIPE_VIDEO_CAP_NPOT_TEXTURES:
       return 1;
    case PIPE_VIDEO_CAP_MAX_WIDTH:

src/gallium/drivers/nouveau/nouveau_vp3_video_vp.c

@@ -114,21 +114,21 @@ struct h264_picparm_vp { // 700..a00
 	uint32_t stride1, stride2; // 04 08
 	uint32_t ofs[6]; // 0c..24 in-image offset
 
-	uint32_t tmp_stride;
+	uint32_t u24; // nfi ac8 ?
 	uint32_t bucket_size; // 28 bucket size
 	uint32_t inter_ring_data_size; // 2c
 
-	unsigned mb_adaptive_frame_field_flag : 1; // 0
-	unsigned direct_8x8_inference_flag : 1; // 1 0x02: into vuc ofs 56
+	unsigned f0 : 1; // 0 0x01: into 640 shifted by 3, 540 shifted by 5, half size something?
+	unsigned f1 : 1; // 1 0x02: into vuc ofs 56
 	unsigned weighted_pred_flag : 1; // 2 0x04
-	unsigned constrained_intra_pred_flag : 1; // 3 0x08: into vuc ofs 68
+	unsigned f3 : 1; // 3 0x08: into vuc ofs 68
 	unsigned is_reference : 1; // 4
 	unsigned interlace : 1; // 5 field_pic_flag
 	unsigned bottom_field_flag : 1; // 6
-	unsigned second_field : 1; // 7 0x80: nfi yet
+	unsigned f7 : 1; // 7 0x80: nfi yet
 
 	signed log2_max_frame_num_minus4 : 4; // 31 0..3
-	unsigned chroma_format_idc : 2; // 31 4..5
+	unsigned u31_45 : 2; // 31 4..5
 	unsigned pic_order_cnt_type : 2; // 31 6..7
 	signed pic_init_qp_minus26 : 6; // 32 0..5
 	signed chroma_qp_index_offset : 5; // 32 6..10
@@ -144,15 +144,17 @@ struct h264_picparm_vp { // 700..a00
 	uint32_t field_order_cnt[2]; // 38, 3c
 
 	struct { // 40
+		// 0x00223102
+		// nfi (needs: top_is_reference, bottom_is_reference, is_long_term, maybe some other state that was saved..
 		unsigned fifo_idx : 7; // 00 0..6
 		unsigned tmp_idx : 5; // 00 7..11
-		unsigned top_is_reference : 1; // 00 12
-		unsigned bottom_is_reference : 1; // 00 13
-		unsigned is_long_term : 1; // 00 14
+		unsigned unk12 : 1; // 00 12 not seen yet, but set, maybe top_is_reference
+		unsigned unk13 : 1; // 00 13 not seen yet, but set, maybe bottom_is_reference?
+		unsigned unk14 : 1; // 00 14 skipped?
 		unsigned notseenyet : 1; // 00 15 pad?
-		unsigned field_pic_flag : 1; // 00 16
-		unsigned top_field_marking : 4; // 00 17..20
-		unsigned bottom_field_marking : 4; // 00 21..24
+		unsigned unk16 : 1; // 00 16
+		unsigned unk17 : 4; // 00 17..20
+		unsigned unk21 : 4; // 00 21..24
 		unsigned pad : 7; // 00 d25..31
 
 		uint32_t field_order_cnt[2]; // 04,08
@@ -333,21 +335,21 @@ nouveau_vp3_fill_picparm_h264_vp(struct nouveau_vp3_decoder *dec,
    nouveau_vp3_ycbcr_offsets(dec, &h->ofs[1], &h->ofs[3], &h->ofs[4]);
    h->ofs[5] = h->ofs[3];
    h->ofs[0] = h->ofs[2] = 0;
-   h->tmp_stride = dec->tmp_stride >> 8;
-   assert(h->tmp_stride);
+   h->u24 = dec->tmp_stride >> 8;
+   assert(h->u24);
    nouveau_vp3_inter_sizes(dec, 1, &ring, &h->bucket_size, &h->inter_ring_data_size);
 
    h->u220 = 0;
-   h->mb_adaptive_frame_field_flag = d->pps->sps->mb_adaptive_frame_field_flag;
-   h->direct_8x8_inference_flag = d->pps->sps->direct_8x8_inference_flag;
+   h->f0 = d->pps->sps->mb_adaptive_frame_field_flag;
+   h->f1 = d->pps->sps->direct_8x8_inference_flag;
    h->weighted_pred_flag = d->pps->weighted_pred_flag;
-   h->constrained_intra_pred_flag = d->pps->constrained_intra_pred_flag;
+   h->f3 = d->pps->constrained_intra_pred_flag;
    h->is_reference = d->is_reference;
    h->interlace = d->field_pic_flag;
    h->bottom_field_flag = d->bottom_field_flag;
-   h->second_field = 0; // TODO: figure out when set..
+   h->f7 = 0; // TODO: figure out when set..
    h->log2_max_frame_num_minus4 = d->pps->sps->log2_max_frame_num_minus4;
-   h->chroma_format_idc = 1;
+   h->u31_45 = 1;
 
    h->pic_order_cnt_type = d->pps->sps->pic_order_cnt_type;
    h->pic_init_qp_minus26 = d->pps->pic_init_qp_minus26;
@@ -374,19 +376,18 @@ nouveau_vp3_fill_picparm_h264_vp(struct nouveau_vp3_decoder *dec,
       h->refs[j].field_order_cnt[1] = d->field_order_cnt_list[i][1];
       h->refs[j].frame_idx = d->frame_num_list[i];
       if (!dec->refs[refs[j]->valid_ref].field_pic_flag) {
-         h->refs[j].top_is_reference = d->top_is_reference[i];
-         h->refs[j].bottom_is_reference = d->bottom_is_reference[i];
+         h->refs[j].unk12 = d->top_is_reference[i];
+         h->refs[j].unk13 = d->bottom_is_reference[i];
       }
-      h->refs[j].is_long_term = d->is_long_term[i];
+      h->refs[j].unk14 = 0;
       h->refs[j].notseenyet = 0;
-      h->refs[j].field_pic_flag = dec->refs[refs[j]->valid_ref].field_pic_flag;
-      h->refs[j].top_field_marking =
-         dec->refs[refs[j]->valid_ref].decoded_top && d->top_is_reference[i] ?
-         1 + d->is_long_term[i] : 0;
-      h->refs[j].bottom_field_marking =
-         dec->refs[refs[j]->valid_ref].decoded_bottom && d->bottom_is_reference[i] ?
-         1 + d->is_long_term[i] : 0;
+      h->refs[j].unk16 = dec->refs[refs[j]->valid_ref].field_pic_flag;
+      h->refs[j].unk17 = dec->refs[refs[j]->valid_ref].decoded_top &&
+                         d->top_is_reference[i];
+      h->refs[j].unk21 = dec->refs[refs[j]->valid_ref].decoded_bottom &&
+                         d->bottom_is_reference[i];
       h->refs[j].pad = 0;
+      assert(!d->is_long_term[i]);
       j++;
    }
    for (; i < 16; ++i)
@@ -394,7 +395,7 @@ nouveau_vp3_fill_picparm_h264_vp(struct nouveau_vp3_decoder *dec,
    assert(d->num_ref_frames <= dec->base.max_references);
 
    for (; i < d->num_ref_frames; ++i)
-      h->refs[j].field_pic_flag = d->field_pic_flag;
+      h->refs[j].unk16 = d->field_pic_flag;
    *(struct h264_picparm_vp *)map = *h;
 
    return 0x1113;

src/gallium/drivers/nouveau/nv30/nv30_screen.c

@@ -218,7 +218,7 @@ nv30_screen_get_shader_param(struct pipe_screen *pscreen, unsigned shader,
       case PIPE_SHADER_CAP_MAX_CONTROL_FLOW_DEPTH:
          return 0;
       case PIPE_SHADER_CAP_MAX_INPUTS:
-         return 8; /* should be possible to do 10 with nv4x */
+         return (eng3d->oclass >= NV40_3D_CLASS) ? 12 : 10;
       case PIPE_SHADER_CAP_MAX_CONSTS:
          return (eng3d->oclass >= NV40_3D_CLASS) ? 224 : 32;
       case PIPE_SHADER_CAP_MAX_CONST_BUFFERS:
@@ -298,16 +298,10 @@ nv30_screen_destroy(struct pipe_screen *pscreen)
 {
    struct nv30_screen *screen = nv30_screen(pscreen);
 
-   if (screen->base.fence.current) {
-      struct nouveau_fence *current = NULL;
-
-      /* nouveau_fence_wait will create a new current fence, so wait on the
-       * _current_ one, and remove both.
-       */
-      nouveau_fence_ref(screen->base.fence.current, &current);
-      nouveau_fence_wait(current);
-      nouveau_fence_ref(NULL, &current);
-      nouveau_fence_ref(NULL, &screen->base.fence.current);
+   if (screen->base.fence.current &&
+       screen->base.fence.current->state >= NOUVEAU_FENCE_STATE_EMITTED) {
+      nouveau_fence_wait(screen->base.fence.current);
+      nouveau_fence_ref (NULL, &screen->base.fence.current);
    }
 
    nouveau_object_del(&screen->query);

src/gallium/drivers/nouveau/nv50/nv50_context.c

@@ -114,8 +114,6 @@ nv50_destroy(struct pipe_context *pipe)
    draw_destroy(nv50->draw);
 #endif
 
-   FREE(nv50->blit);
-
    nouveau_context_destroy(&nv50->base);
 }
 
@@ -165,7 +163,7 @@ nv50_invalidate_resource_storage(struct nouveau_context *ctx,
    }
 
    if (res->bind & PIPE_BIND_SAMPLER_VIEW) {
-      for (s = 0; s < 3; ++s) {
+      for (s = 0; s < 5; ++s) {
       for (i = 0; i < nv50->num_textures[s]; ++i) {
          if (nv50->textures[s][i] &&
              nv50->textures[s][i]->texture == res) {
@@ -179,7 +177,7 @@ nv50_invalidate_resource_storage(struct nouveau_context *ctx,
    }
 
    if (res->bind & PIPE_BIND_CONSTANT_BUFFER) {
-      for (s = 0; s < 3; ++s) {
+      for (s = 0; s < 5; ++s) {
       for (i = 0; i < nv50->num_vtxbufs; ++i) {
          if (!nv50->constbuf[s][i].user &&
              nv50->constbuf[s][i].u.buf == res) {

src/gallium/drivers/nouveau/nv50/nv50_screen.c

@@ -224,7 +224,7 @@ nv50_screen_get_shader_param(struct pipe_screen *pscreen, unsigned shader,
    case PIPE_SHADER_CAP_MAX_INPUTS:
       if (shader == PIPE_SHADER_VERTEX)
          return 32;
-      return 15;
+      return 0x300 / 16;
    case PIPE_SHADER_CAP_MAX_CONSTS:
       return 65536 / 16;
    case PIPE_SHADER_CAP_MAX_CONST_BUFFERS:
@@ -283,15 +283,8 @@ nv50_screen_destroy(struct pipe_screen *pscreen)
    struct nv50_screen *screen = nv50_screen(pscreen);
 
    if (screen->base.fence.current) {
-      struct nouveau_fence *current = NULL;
-
-      /* nouveau_fence_wait will create a new current fence, so wait on the
-       * _current_ one, and remove both.
-       */
-      nouveau_fence_ref(screen->base.fence.current, &current);
-      nouveau_fence_wait(current);
-      nouveau_fence_ref(NULL, &current);
-      nouveau_fence_ref(NULL, &screen->base.fence.current);
+      nouveau_fence_wait(screen->base.fence.current);
+      nouveau_fence_ref (NULL, &screen->base.fence.current);
    }
    if (screen->base.pushbuf)
       screen->base.pushbuf->user_priv = NULL;

src/gallium/drivers/nouveau/nv50/nv50_state_validate.c

@@ -61,7 +61,7 @@ nv50_validate_fb(struct nv50_context *nv50)
       if (mt->base.status & NOUVEAU_BUFFER_STATUS_GPU_READING)
          nv50->state.rt_serialize = TRUE;
       mt->base.status |= NOUVEAU_BUFFER_STATUS_GPU_WRITING;
-      mt->base.status &= ~NOUVEAU_BUFFER_STATUS_GPU_READING;
+      mt->base.status &= NOUVEAU_BUFFER_STATUS_GPU_READING;
 
       /* only register for writing, otherwise we'd always serialize here */
       BCTX_REFN(nv50->bufctx_3d, FB, &mt->base, WR);
@@ -91,7 +91,7 @@ nv50_validate_fb(struct nv50_context *nv50)
       if (mt->base.status & NOUVEAU_BUFFER_STATUS_GPU_READING)
          nv50->state.rt_serialize = TRUE;
       mt->base.status |= NOUVEAU_BUFFER_STATUS_GPU_WRITING;
-      mt->base.status &= ~NOUVEAU_BUFFER_STATUS_GPU_READING;
+      mt->base.status &= NOUVEAU_BUFFER_STATUS_GPU_READING;
 
       BCTX_REFN(nv50->bufctx_3d, FB, &mt->base, WR);
    } else {

src/gallium/drivers/nouveau/nv50/nv50_surface.c

@@ -935,7 +935,6 @@ nv50_blit_3d(struct nv50_context *nv50, const struct pipe_blit_info *info)
    float x0, x1, y0, y1, z;
    float dz;
    float x_range, y_range;
-   float tri_x, tri_y;
 
    blit->mode = nv50_blit_select_mode(info);
    blit->color_mask = nv50_blit_derive_color_mask(info);
@@ -955,14 +954,11 @@ nv50_blit_3d(struct nv50_context *nv50, const struct pipe_blit_info *info)
    x_range = (float)info->src.box.width / (float)info->dst.box.width;
    y_range = (float)info->src.box.height / (float)info->dst.box.height;
 
-   tri_x = 16384 << nv50_miptree(dst)->ms_x;
-   tri_y = 16384 << nv50_miptree(dst)->ms_y;
-
    x0 = (float)info->src.box.x - x_range * (float)info->dst.box.x;
    y0 = (float)info->src.box.y - y_range * (float)info->dst.box.y;
 
-   x1 = x0 + tri_x * x_range;
-   y1 = y0 + tri_y * y_range;
+   x1 = x0 + 16384.0f * x_range;
+   y1 = y0 + 16384.0f * y_range;
 
    x0 *= (float)(1 << nv50_miptree(src)->ms_x);
    x1 *= (float)(1 << nv50_miptree(src)->ms_x);
@@ -1031,7 +1027,7 @@ nv50_blit_3d(struct nv50_context *nv50, const struct pipe_blit_info *info)
       PUSH_DATAf(push, y0);
       PUSH_DATAf(push, z);
       BEGIN_NV04(push, NV50_3D(VTX_ATTR_2F_X(0)), 2);
-      PUSH_DATAf(push, tri_x);
+      PUSH_DATAf(push, 16384 << nv50_miptree(dst)->ms_x);
       PUSH_DATAf(push, 0.0f);
       BEGIN_NV04(push, NV50_3D(VTX_ATTR_3F_X(1)), 3);
       PUSH_DATAf(push, x0);
@@ -1039,7 +1035,7 @@ nv50_blit_3d(struct nv50_context *nv50, const struct pipe_blit_info *info)
       PUSH_DATAf(push, z);
       BEGIN_NV04(push, NV50_3D(VTX_ATTR_2F_X(0)), 2);
       PUSH_DATAf(push, 0.0f);
-      PUSH_DATAf(push, tri_y);
+      PUSH_DATAf(push, 16384 << nv50_miptree(dst)->ms_y);
       BEGIN_NV04(push, NV50_3D(VERTEX_END_GL), 1);
       PUSH_DATA (push, 0);
    }

src/gallium/drivers/nouveau/nv50/nv50_tex.c

@@ -271,7 +271,7 @@ nv50_validate_tic(struct nv50_context *nv50, int s)
 
       nv50->screen->tic.lock[tic->id / 32] |= 1 << (tic->id % 32);
 
-      res->status &= ~NOUVEAU_BUFFER_STATUS_GPU_WRITING;
+      res->status &= NOUVEAU_BUFFER_STATUS_GPU_WRITING;
       res->status |= NOUVEAU_BUFFER_STATUS_GPU_READING;
 
       BCTX_REFN(nv50->bufctx_3d, TEXTURES, res, RD);

src/gallium/drivers/nouveau/nv50/nv50_transfer.c

@@ -278,7 +278,7 @@ nv50_miptree_transfer_map(struct pipe_context *pctx,
 
    if (util_format_is_plain(res->format)) {
       tx->nblocksx = box->width << mt->ms_x;
-      tx->nblocksy = box->height << mt->ms_y;
+      tx->nblocksy = box->height << mt->ms_x;
    } else {
       tx->nblocksx = util_format_get_nblocksx(res->format, box->width);
       tx->nblocksy = util_format_get_nblocksy(res->format, box->height);

src/gallium/drivers/nouveau/nv50/nv50_vbo.c

@@ -597,15 +597,6 @@ nv50_draw_elements(struct nv50_context *nv50, boolean shorten,
 
       assert(nouveau_resource_mapped_by_gpu(nv50->idxbuf.buffer));
 
-      /* This shouldn't have to be here. The going theory is that the buffer
-       * is being filled in by PGRAPH, and it's not done yet by the time it
-       * gets submitted to PFIFO, which in turn starts immediately prefetching
-       * the not-yet-written data. Ideally this wait would only happen on
-       * pushbuf submit, but it's probably not a big performance difference.
-       */
-      if (buf->fence_wr && !nouveau_fence_signalled(buf->fence_wr))
-         nouveau_fence_wait(buf->fence_wr);
-
       while (instance_count--) {
          BEGIN_NV04(push, NV50_3D(VERTEX_BEGIN_GL), 1);
          PUSH_DATA (push, prim);

src/gallium/drivers/nouveau/nv50/nv84_video.c

@@ -741,80 +741,16 @@ error:
    return NULL;
 }
 
-#define FIRMWARE_BSP_KERN  0x01
-#define FIRMWARE_VP_KERN   0x02
-#define FIRMWARE_BSP_H264  0x04
-#define FIRMWARE_VP_MPEG2  0x08
-#define FIRMWARE_VP_H264_1 0x10
-#define FIRMWARE_VP_H264_2 0x20
-#define FIRMWARE_PRESENT(val, fw) (val & FIRMWARE_ ## fw)
-
-static int
-firmware_present(struct pipe_screen *pscreen, enum pipe_video_format codec)
-{
-   struct nouveau_screen *screen = nouveau_screen(pscreen);
-   struct nouveau_object *obj = NULL;
-   struct stat s;
-   int checked = screen->firmware_info.profiles_checked;
-   int present, ret;
-
-   if (!FIRMWARE_PRESENT(checked, VP_KERN)) {
-      nouveau_object_new(screen->channel, 0, 0x7476, NULL, 0, &obj);
-      if (obj)
-         screen->firmware_info.profiles_present |= FIRMWARE_VP_KERN;
-      nouveau_object_del(&obj);
-      screen->firmware_info.profiles_checked |= FIRMWARE_VP_KERN;
-   }
-
-   if (codec == PIPE_VIDEO_FORMAT_MPEG4_AVC) {
-      if (!FIRMWARE_PRESENT(checked, BSP_KERN)) {
-         nouveau_object_new(screen->channel, 0, 0x74b0, NULL, 0, &obj);
-         if (obj)
-            screen->firmware_info.profiles_present |= FIRMWARE_BSP_KERN;
-         nouveau_object_del(&obj);
-         screen->firmware_info.profiles_checked |= FIRMWARE_BSP_KERN;
-      }
-
-      if (!FIRMWARE_PRESENT(checked, VP_H264_1)) {
-         ret = stat("/lib/firmware/nouveau/nv84_vp-h264-1", &s);
-         if (!ret && s.st_size > 1000)
-            screen->firmware_info.profiles_present |= FIRMWARE_VP_H264_1;
-         screen->firmware_info.profiles_checked |= FIRMWARE_VP_H264_1;
-      }
-
-      /* should probably check the others, but assume that 1 means all */
-
-      present = screen->firmware_info.profiles_present;
-      return FIRMWARE_PRESENT(present, VP_KERN) &&
-         FIRMWARE_PRESENT(present, BSP_KERN) &&
-         FIRMWARE_PRESENT(present, VP_H264_1);
-   } else {
-      if (!FIRMWARE_PRESENT(checked, VP_MPEG2)) {
-         ret = stat("/lib/firmware/nouveau/nv84_vp-mpeg12", &s);
-         if (!ret && s.st_size > 1000)
-            screen->firmware_info.profiles_present |= FIRMWARE_VP_MPEG2;
-         screen->firmware_info.profiles_checked |= FIRMWARE_VP_MPEG2;
-      }
-      present = screen->firmware_info.profiles_present;
-      return FIRMWARE_PRESENT(present, VP_KERN) &&
-         FIRMWARE_PRESENT(present, VP_MPEG2);
-   }
-}
-
 int
 nv84_screen_get_video_param(struct pipe_screen *pscreen,
                             enum pipe_video_profile profile,
                             enum pipe_video_entrypoint entrypoint,
                             enum pipe_video_cap param)
 {
-   enum pipe_video_format codec;
-
    switch (param) {
    case PIPE_VIDEO_CAP_SUPPORTED:
-      codec = u_reduce_video_profile(profile);
-      return (codec == PIPE_VIDEO_FORMAT_MPEG4_AVC ||
-              codec == PIPE_VIDEO_FORMAT_MPEG12) &&
-         firmware_present(pscreen, codec);
+      return u_reduce_video_profile(profile) == PIPE_VIDEO_FORMAT_MPEG4_AVC ||
+         u_reduce_video_profile(profile) == PIPE_VIDEO_FORMAT_MPEG12;
    case PIPE_VIDEO_CAP_NPOT_TEXTURES:
       return 1;
    case PIPE_VIDEO_CAP_MAX_WIDTH:

src/gallium/drivers/nouveau/nv50/nv98_video.c

@@ -64,6 +64,10 @@ nv98_create_decoder(struct pipe_context *context,
    struct nouveau_vp3_decoder *dec;
    struct nouveau_pushbuf **push;
    struct nv04_fifo nv04_data = {.vram = 0xbeef0201, .gart = 0xbeef0202};
+   union nouveau_bo_config cfg;
+
+   cfg.nv50.tile_mode = 0x20;
+   cfg.nv50.memtype = 0x70;
 
    int ret, i;
    uint32_t codec = 1, ppp_codec = 3;
@@ -196,7 +200,7 @@ nv98_create_decoder(struct pipe_context *context,
    dec->ref_stride = mb(templ->width)*16 * (mb_half(templ->height)*32 + nouveau_vp3_video_align(templ->height)/2);
    ret = nouveau_bo_new(screen->device, NOUVEAU_BO_VRAM, 0,
                         dec->ref_stride * (templ->max_references+2) + tmp_size,
-                        NULL, &dec->ref_bo);
+                        &cfg, &dec->ref_bo);
    if (ret)
       goto fail;
 

src/gallium/drivers/nouveau/nvc0/nvc0_screen.c

@@ -331,14 +331,7 @@ nvc0_screen_destroy(struct pipe_screen *pscreen)
    struct nvc0_screen *screen = nvc0_screen(pscreen);
 
    if (screen->base.fence.current) {
-      struct nouveau_fence *current = NULL;
-
-      /* nouveau_fence_wait will create a new current fence, so wait on the
-       * _current_ one, and remove both.
-       */
-      nouveau_fence_ref(screen->base.fence.current, &current);
-      nouveau_fence_wait(current);
-      nouveau_fence_ref(NULL, &current);
+      nouveau_fence_wait(screen->base.fence.current);
       nouveau_fence_ref(NULL, &screen->base.fence.current);
    }
    if (screen->base.pushbuf)

src/gallium/drivers/r300/compiler/tests/radeon_compiler_regalloc_tests.c

@@ -79,13 +79,14 @@ static void test_runner_rc_regalloc(
 
 static void tex_1d_swizzle(struct test_result *result)
 {
-	struct r300_fragment_program_compiler c;
+	struct radeon_compiler c;
 
-	memset(&c, 0, sizeof(c));
-	init_compiler(&c.Base, RC_FRAGMENT_PROGRAM, 0, 0);
-	c.AllocateHwInputs = dummy_allocate_hw_inputs;
+	init_compiler(&c, RC_FRAGMENT_PROGRAM, 0, 0);
+	struct r300_fragment_program_compiler *cc =
+		(struct r300_fragment_program_compiler*)&c;
+	cc->AllocateHwInputs = dummy_allocate_hw_inputs;
 
-	test_runner_rc_regalloc(result, &c.Base, "regalloc_tex_1d_swizzle.test");
+	test_runner_rc_regalloc(result, &c, "regalloc_tex_1d_swizzle.test");
 }
 
 unsigned radeon_compiler_regalloc_run_tests()

src/gallium/drivers/r300/compiler/tests/rc_test_helpers.c

@@ -542,7 +542,6 @@ unsigned load_program(
 	char **string_store;
 	unsigned i = 0;
 
-	memset(line, 0, sizeof(line));
 	snprintf(path, MAX_PATH_LENGTH, "compiler/tests/%s", filename);
 	file = fopen(path, "r");
 	if (!file) {
@@ -553,8 +552,7 @@ unsigned load_program(
 	count = &test->num_input_lines;
 
 	while (fgets(line, MAX_LINE_LENGTH, file)){
-		char last_char = line[MAX_LINE_LENGTH - 1];
-		if (last_char && last_char != '\n') {
+		if (line[MAX_LINE_LENGTH - 2] == '\n') {
 			fprintf(stderr, "Error line cannot be longer than 100 "
 				"characters:\n%s\n", line);
 			return 0;

src/gallium/drivers/r600/evergreen_compute.c

@@ -204,8 +204,6 @@ void *evergreen_create_compute_state(
 	const unsigned char * code;
 	unsigned i;
 
-	shader->llvm_ctx = LLVMContextCreate();
-
 	COMPUTE_DBG(ctx->screen, "*** evergreen_create_compute_state\n");
 
 	header = cso->prog;
@@ -218,14 +216,13 @@ void *evergreen_create_compute_state(
 	shader->input_size = cso->req_input_mem;
 
 #ifdef HAVE_OPENCL 
-	shader->num_kernels = radeon_llvm_get_num_kernels(shader->llvm_ctx, code,
-							header->num_bytes);
+	shader->num_kernels = radeon_llvm_get_num_kernels(code, header->num_bytes);
 	shader->kernels = CALLOC(sizeof(struct r600_kernel), shader->num_kernels);
 
 	for (i = 0; i < shader->num_kernels; i++) {
 		struct r600_kernel *kernel = &shader->kernels[i];
-		kernel->llvm_module = radeon_llvm_get_kernel_module(shader->llvm_ctx, i,
-							code, header->num_bytes);
+		kernel->llvm_module = radeon_llvm_get_kernel_module(i, code,
+							header->num_bytes);
 	}
 #endif
 	return shader;
@@ -235,18 +232,7 @@ void evergreen_delete_compute_state(struct pipe_context *ctx, void* state)
 {
 	struct r600_pipe_compute *shader = (struct r600_pipe_compute *)state;
 
-	if (!shader)
-		return;
-
-	FREE(shader->kernels);
-
-#ifdef HAVE_OPENCL
-	if (shader->llvm_ctx){
-		LLVMContextDispose(shader->llvm_ctx);
-	}
-#endif
-
-	FREE(shader);
+	free(shader);
 }
 
 static void evergreen_bind_compute_state(struct pipe_context *ctx_, void *state)
@@ -488,17 +474,6 @@ static void compute_emit_cs(struct r600_context *ctx, const uint *block_layout,
 	r600_flush_emit(ctx);
 	ctx->b.flags = 0;
 
-	if (ctx->b.chip_class >= CAYMAN) {
-		cs->buf[cs->cdw++] = PKT3(PKT3_EVENT_WRITE, 0, 0);
-		cs->buf[cs->cdw++] = EVENT_TYPE(EVENT_TYPE_CS_PARTIAL_FLUSH) | EVENT_INDEX(4);
-		/* DEALLOC_STATE prevents the GPU from hanging when a
-		 * SURFACE_SYNC packet is emitted some time after a DISPATCH_DIRECT
-		 * with any of the CB*_DEST_BASE_ENA or DB_DEST_BASE_ENA bits set.
-		 */
-		cs->buf[cs->cdw++] = PKT3C(PKT3_DEALLOC_STATE, 0, 0);
-		cs->buf[cs->cdw++] = 0;
-	}
-
 #if 0
 	COMPUTE_DBG(ctx->screen, "cdw: %i\n", cs->cdw);
 	for (i = 0; i < cs->cdw; i++) {

src/gallium/drivers/r600/evergreen_compute_internal.h

@@ -47,10 +47,6 @@ struct r600_pipe_compute {
 	unsigned private_size;
 	unsigned input_size;
 	struct r600_resource *kernel_param;
-
-#ifdef HAVE_OPENCL
-	LLVMContextRef llvm_ctx;
-#endif
 };
 
 struct r600_resource* r600_compute_buffer_alloc_vram(struct r600_screen *screen, unsigned size);

src/gallium/drivers/r600/evergreend.h

@@ -63,7 +63,6 @@
 #define R600_TEXEL_PITCH_ALIGNMENT_MASK        0x7
 
 #define PKT3_NOP                               0x10
-#define PKT3_DEALLOC_STATE                     0x14
 #define PKT3_DISPATCH_DIRECT                   0x15
 #define PKT3_DISPATCH_INDIRECT                 0x16
 #define PKT3_INDIRECT_BUFFER_END               0x17

src/gallium/drivers/r600/r600_blit.c

@@ -619,36 +619,6 @@ void r600_copy_buffer(struct pipe_context *ctx, struct pipe_resource *dst, unsig
 	}
 }
 
-/**
- * Global buffers are not really resources, they are are actually offsets
- * into a single global resource (r600_screen::global_pool).  The means
- * they don't have their own cs_buf handle, so they cannot be passed
- * to r600_copy_buffer() and must be handled separately.
- *
- * XXX: It should be possible to implement this function using
- * r600_copy_buffer() by passing the memory_pool resource as both src
- * and dst and updating dstx and src_box to point to the correct offsets.
- * This would likely perform better than the current implementation.
- */
-static void r600_copy_global_buffer(struct pipe_context *ctx,
-				    struct pipe_resource *dst, unsigned
-				    dstx, struct pipe_resource *src,
-				    const struct pipe_box *src_box)
-{
-	struct pipe_box dst_box; struct pipe_transfer *src_pxfer,
-	*dst_pxfer;
-
-	u_box_1d(dstx, src_box->width, &dst_box);
-	void *src_ptr = ctx->transfer_map(ctx, src, 0, PIPE_TRANSFER_READ,
-					  src_box, &src_pxfer);
-	void *dst_ptr = ctx->transfer_map(ctx, dst, 0, PIPE_TRANSFER_WRITE,
-					  &dst_box, &dst_pxfer);
-	memcpy(dst_ptr, src_ptr, src_box->width);
-
-	ctx->transfer_unmap(ctx, src_pxfer);
-	ctx->transfer_unmap(ctx, dst_pxfer);
-}
-
 static void r600_clear_buffer(struct pipe_context *ctx, struct pipe_resource *dst,
 			      unsigned offset, unsigned size, unsigned value)
 {
@@ -701,12 +671,7 @@ static void r600_resource_copy_region(struct pipe_context *ctx,
 
 	/* Handle buffers first. */
 	if (dst->target == PIPE_BUFFER && src->target == PIPE_BUFFER) {
-		if ((src->bind & PIPE_BIND_GLOBAL) ||
-					(dst->bind & PIPE_BIND_GLOBAL)) {
-			r600_copy_global_buffer(ctx, dst, dstx, src, src_box);
-		} else {
-			r600_copy_buffer(ctx, dst, dstx, src, src_box);
-		}
+		r600_copy_buffer(ctx, dst, dstx, src, src_box);
 		return;
 	}
 

src/gallium/drivers/r600/r600_llvm.c

@@ -712,7 +712,6 @@ unsigned r600_llvm_compile(
 	const char * gpu_family = r600_llvm_gpu_string(family);
 	unsigned i;
 
-	memset(&binary, 0, sizeof(struct radeon_llvm_binary));
 	r = radeon_llvm_compile(mod, &binary, gpu_family, dump);
 
 	assert(binary.code_size % 4 == 0);
@@ -745,9 +744,6 @@ unsigned r600_llvm_compile(
 		}
 	}
 
-	FREE(binary.code);
-	FREE(binary.config);
-
 	return r;
 }
 

src/gallium/drivers/r600/r600_pipe.c

@@ -43,7 +43,7 @@
 
 static const struct debug_named_value r600_debug_options[] = {
 	/* features */
-	{ "hyperz", DBG_HYPERZ, "Enable Hyper-Z" },
+	{ "nohyperz", DBG_NO_HYPERZ, "Disable Hyper-Z" },
 #if defined(R600_USE_LLVM)
 	{ "nollvm", DBG_NO_LLVM, "Disable the LLVM shader compiler" },
 #endif
@@ -192,7 +192,12 @@ static void r600_destroy_context(struct pipe_context *context)
 
 	r600_release_command_buffer(&rctx->start_cs_cmd);
 
-	FREE(rctx->start_compute_cs_cmd.buf);
+	if (rctx->b.rings.gfx.cs) {
+		rctx->b.ws->cs_destroy(rctx->b.rings.gfx.cs);
+	}
+	if (rctx->b.rings.dma.cs) {
+		rctx->b.ws->cs_destroy(rctx->b.rings.dma.cs);
+	}
 
 	r600_common_context_cleanup(&rctx->b);
 	FREE(rctx);
@@ -413,6 +418,7 @@ static int r600_get_param(struct pipe_screen* pscreen, enum pipe_cap param)
 	case PIPE_CAP_VERTEX_ELEMENT_SRC_OFFSET_4BYTE_ALIGNED_ONLY:
 	case PIPE_CAP_USER_INDEX_BUFFERS:
 	case PIPE_CAP_USER_CONSTANT_BUFFERS:
+	case PIPE_CAP_COMPUTE:
 	case PIPE_CAP_START_INSTANCE:
 	case PIPE_CAP_MAX_DUAL_SOURCE_RENDER_TARGETS:
 	case PIPE_CAP_TEXTURE_BUFFER_OBJECTS:
@@ -421,9 +427,6 @@ static int r600_get_param(struct pipe_screen* pscreen, enum pipe_cap param)
 	case PIPE_CAP_TEXTURE_MULTISAMPLE:
 		return 1;
 
-	case PIPE_CAP_COMPUTE:
-		return rscreen->b.chip_class > R700;
-
 	case PIPE_CAP_TGSI_TEXCOORD:
 		return 0;
 
@@ -894,8 +897,8 @@ struct pipe_screen *r600_screen_create(struct radeon_winsys *ws)
 		rscreen->b.debug_flags |= DBG_COMPUTE;
 	if (debug_get_bool_option("R600_DUMP_SHADERS", FALSE))
 		rscreen->b.debug_flags |= DBG_FS | DBG_VS | DBG_GS | DBG_PS | DBG_CS;
-	if (debug_get_bool_option("R600_HYPERZ", FALSE))
-		rscreen->b.debug_flags |= DBG_HYPERZ;
+	if (!debug_get_bool_option("R600_HYPERZ", TRUE))
+		rscreen->b.debug_flags |= DBG_NO_HYPERZ;
 	if (!debug_get_bool_option("R600_LLVM", TRUE))
 		rscreen->b.debug_flags |= DBG_NO_LLVM;
 

src/gallium/drivers/r600/sb/sb_bc.h

@@ -614,10 +614,6 @@ public:
 	unsigned num_slots;
 	bool uses_mova_gpr;
 
-	bool stack_workaround_8xx;
-	bool stack_workaround_9xx;
-
-	unsigned wavefront_size;
 	unsigned stack_entry_size;
 
 	static unsigned dump_pass;
@@ -642,23 +638,6 @@ public:
 	bool is_cayman() {return hw_class == HW_CLASS_CAYMAN;}
 	bool is_egcm() {return hw_class >= HW_CLASS_EVERGREEN;}
 
-	bool needs_8xx_stack_workaround() {
-		if (!is_evergreen())
-			return false;
-
-		switch (hw_chip) {
-		case HW_CHIP_CYPRESS:
-		case HW_CHIP_JUNIPER:
-			return false;
-		default:
-			return true;
-		}
-	}
-
-	bool needs_9xx_stack_workaround() {
-		return is_cayman();
-	}
-
 	sb_hw_class_bits hw_class_bit() {
 		switch (hw_class) {
 		case HW_CLASS_R600:return HB_R6;

src/gallium/drivers/r600/sb/sb_bc_finalize.cpp

@@ -40,9 +40,8 @@ namespace r600_sb {
 
 int bc_finalizer::run() {
 
-	run_on(sh.root);
-
 	regions_vec &rv = sh.get_regions();
+
 	for (regions_vec::reverse_iterator I = rv.rbegin(), E = rv.rend(); I != E;
 			++I) {
 		region_node *r = *I;
@@ -59,6 +58,8 @@ int bc_finalizer::run() {
 		r->expand();
 	}
 
+	run_on(sh.root);
+
 	cf_peephole();
 
 	// workaround for some problems on r6xx/7xx
@@ -212,36 +213,18 @@ void bc_finalizer::run_on(container_node* c) {
 		if (n->is_alu_group()) {
 			finalize_alu_group(static_cast<alu_group_node*>(n));
 		} else {
-			if (n->is_alu_clause()) {
-				cf_node *c = static_cast<cf_node*>(n);
-
-				if (c->bc.op == CF_OP_ALU_PUSH_BEFORE && ctx.is_egcm()) {
-					if (ctx.stack_workaround_8xx) {
-						region_node *r = c->get_parent_region();
-						if (r) {
-							unsigned ifs, loops;
-							unsigned elems = get_stack_depth(r, loops, ifs);
-							unsigned dmod1 = elems % ctx.stack_entry_size;
-							unsigned dmod2 = (elems + 1) % ctx.stack_entry_size;
-
-							if (elems && (!dmod1 || !dmod2))
-								c->flags |= NF_ALU_STACK_WORKAROUND;
-						}
-					} else if (ctx.stack_workaround_9xx) {
-						region_node *r = c->get_parent_region();
-						if (r) {
-							unsigned ifs, loops;
-							get_stack_depth(r, loops, ifs);
-							if (loops >= 2)
-								c->flags |= NF_ALU_STACK_WORKAROUND;
-						}
-					}
-				}
-			} else if (n->is_fetch_inst()) {
+			if (n->is_fetch_inst()) {
 				finalize_fetch(static_cast<fetch_node*>(n));
 			} else if (n->is_cf_inst()) {
 				finalize_cf(static_cast<cf_node*>(n));
+			} else if (n->is_alu_clause()) {
+
+			} else if (n->is_fetch_clause()) {
+
+			} else {
+				assert(!"unexpected node");
 			}
+
 			if (n->is_container())
 				run_on(static_cast<container_node*>(n));
 		}
@@ -595,6 +578,10 @@ void bc_finalizer::finalize_cf(cf_node* c) {
 
 	unsigned flags = c->bc.op_ptr->flags;
 
+	if (flags & CF_CALL) {
+		update_nstack(c->get_parent_region(), ctx.is_cayman() ? 1 : 2);
+	}
+
 	c->bc.end_of_program = 0;
 	last_cf = c;
 
@@ -728,8 +715,17 @@ void bc_finalizer::finalize_cf(cf_node* c) {
 
 			c->bc.index_gpr = reg >= 0 ? reg : 0;
 		}
-	} else if (flags & CF_CALL) {
-		update_nstack(c->get_parent_region(), ctx.wavefront_size == 16 ? 2 : 1);
+
+
+
+	} else {
+
+#if 0
+		if ((flags & (CF_BRANCH | CF_LOOP)) && !sh.uses_gradients) {
+			c->bc.valid_pixel_mode = 1;
+		}
+#endif
+
 	}
 }
 
@@ -767,86 +763,37 @@ void bc_finalizer::update_ngpr(unsigned gpr) {
 		ngpr = gpr + 1;
 }
 
-unsigned bc_finalizer::get_stack_depth(node *n, unsigned &loops,
-                                           unsigned &ifs, unsigned add) {
-	unsigned stack_elements = add;
-	bool has_non_wqm_push = (add != 0);
-	region_node *r = n->is_region() ?
-			static_cast<region_node*>(n) : n->get_parent_region();
-
-	loops = 0;
-	ifs = 0;
-
-	while (r) {
-		if (r->is_loop()) {
-			++loops;
-		} else {
-			++ifs;
-			has_non_wqm_push = true;
-		}
-		r = r->get_parent_region();
-	}
-	stack_elements += (loops * ctx.stack_entry_size) + ifs;
-
-	// reserve additional elements in some cases
-	switch (ctx.hw_class) {
-	case HW_CLASS_R600:
-	case HW_CLASS_R700:
-		// If any non-WQM push is invoked, 2 elements should be reserved.
-		if (has_non_wqm_push)
-			stack_elements += 2;
-		break;
-	case HW_CLASS_CAYMAN:
-		// If any stack operation is invoked, 2 elements should be reserved
-		if (stack_elements)
-			stack_elements += 2;
-		break;
-	case HW_CLASS_EVERGREEN:
-		// According to the docs we need to reserve 1 element for each of the
-		// following cases:
-		//   1) non-WQM push is used with WQM/LOOP frames on stack
-		//   2) ALU_ELSE_AFTER is used at the point of max stack usage
-		// NOTE:
-		// It was found that the conditions above are not sufficient, there are
-		// other cases where we also need to reserve stack space, that's why
-		// we always reserve 1 stack element if we have non-WQM push on stack.
-		// Condition 2 is ignored for now because we don't use this instruction.
-		if (has_non_wqm_push)
-			++stack_elements;
-		break;
-	}
-	return stack_elements;
-}
-
 void bc_finalizer::update_nstack(region_node* r, unsigned add) {
 	unsigned loops = 0;
 	unsigned ifs = 0;
-	unsigned elems = r ? get_stack_depth(r, loops, ifs, add) : add;
 
-	// XXX all chips expect this value to be computed using 4 as entry size,
-	// not the real entry size
-	unsigned stack_entries = (elems + 3) >> 2;
+	while (r) {
+		if (r->is_loop())
+			++loops;
+		else
+			++ifs;
+
+		r = r->get_parent_region();
+	}
+
+	unsigned stack_elements = (loops * ctx.stack_entry_size) + ifs + add;
+
+	// FIXME calculate more precisely
+	if (ctx.is_evergreen()) {
+		++stack_elements;
+	} else {
+		stack_elements += 2;
+		if (ctx.is_cayman())
+			++stack_elements;
+	}
+
+	unsigned stack_entries = (stack_elements + 3) >> 2;
 
 	if (nstack < stack_entries)
 		nstack = stack_entries;
 }
 
 void bc_finalizer::cf_peephole() {
-	if (ctx.stack_workaround_8xx || ctx.stack_workaround_9xx) {
-		for (node_iterator N, I = sh.root->begin(), E = sh.root->end(); I != E;
-				I = N) {
-			N = I; ++N;
-			cf_node *c = static_cast<cf_node*>(*I);
-
-			if (c->bc.op == CF_OP_ALU_PUSH_BEFORE &&
-					(c->flags & NF_ALU_STACK_WORKAROUND)) {
-				cf_node *push = sh.create_cf(CF_OP_PUSH);
-				c->insert_before(push);
-				push->jump(c);
-				c->bc.set_op(CF_OP_ALU);
-			}
-		}
-	}
 
 	for (node_iterator N, I = sh.root->begin(), E = sh.root->end(); I != E;
 			I = N) {

src/gallium/drivers/r600/sb/sb_context.cpp

@@ -66,27 +66,20 @@ int sb_context::init(r600_isa *isa, sb_hw_chip chip, sb_hw_class cclass) {
 	case HW_CHIP_RS780:
 	case HW_CHIP_RV620:
 	case HW_CHIP_RS880:
-		wavefront_size = 16;
-		stack_entry_size = 8;
-		break;
+
 	case HW_CHIP_RV630:
 	case HW_CHIP_RV635:
 	case HW_CHIP_RV730:
 	case HW_CHIP_RV710:
 	case HW_CHIP_PALM:
 	case HW_CHIP_CEDAR:
-		wavefront_size = 32;
 		stack_entry_size = 8;
 		break;
 	default:
-		wavefront_size = 64;
 		stack_entry_size = 4;
 		break;
 	}
 
-	stack_workaround_8xx = needs_8xx_stack_workaround();
-	stack_workaround_9xx = needs_9xx_stack_workaround();
-
 	return 0;
 }
 

src/gallium/drivers/r600/sb/sb_ir.h

@@ -700,10 +700,7 @@ enum node_flags {
 	NF_DONT_MOVE = (1 << 8),
 
 	// for KILLxx - we want to schedule them as early as possible
-	NF_SCHEDULE_EARLY = (1 << 9),
-
-	// for ALU_PUSH_BEFORE - when set, replace with PUSH + ALU
-	NF_ALU_STACK_WORKAROUND = (1 << 10)
+	NF_SCHEDULE_EARLY = (1 << 9)
 };
 
 inline node_flags operator |(node_flags l, node_flags r) {

src/gallium/drivers/r600/sb/sb_pass.h

@@ -708,9 +708,6 @@ public:
 	void update_ngpr(unsigned gpr);
 	void update_nstack(region_node *r, unsigned add = 0);
 
-	unsigned get_stack_depth(node *n, unsigned &loops, unsigned &ifs,
-	                         unsigned add = 0);
-
 	void cf_peephole();
 
 };

src/gallium/drivers/radeon/r600_pipe_common.c

@@ -234,13 +234,6 @@ bool r600_common_context_init(struct r600_common_context *rctx,
 
 void r600_common_context_cleanup(struct r600_common_context *rctx)
 {
-	if (rctx->rings.gfx.cs) {
-		rctx->ws->cs_destroy(rctx->rings.gfx.cs);
-	}
-	if (rctx->rings.dma.cs) {
-		rctx->ws->cs_destroy(rctx->rings.dma.cs);
-	}
-
 	if (rctx->allocator_so_filled_size) {
 		u_suballocator_destroy(rctx->allocator_so_filled_size);
 	}

src/gallium/drivers/radeon/r600_pipe_common.h

@@ -73,7 +73,7 @@
 #define DBG_PS			(1 << 11)
 #define DBG_CS			(1 << 12)
 /* features */
-#define DBG_HYPERZ		(1 << 13)
+#define DBG_NO_HYPERZ		(1 << 13)
 /* The maximum allowed bit is 15. */
 
 struct r600_common_context;

src/gallium/drivers/radeon/r600_texture.c

@@ -542,7 +542,7 @@ r600_texture_create_object(struct pipe_screen *screen,
 	if (rtex->is_depth &&
 	    !(base->flags & (R600_RESOURCE_FLAG_TRANSFER |
 			     R600_RESOURCE_FLAG_FLUSHED_DEPTH)) &&
-	    (rscreen->debug_flags & DBG_HYPERZ)) {
+	    !(rscreen->debug_flags & DBG_NO_HYPERZ)) {
 		if (rscreen->chip_class >= SI) {
 			/* XXX implement Hyper-Z for SI.
 			 * Reuse the CMASK allocator, which is almost the same as HTILE. */

src/gallium/drivers/radeon/radeon_llvm_emit.c

@@ -173,10 +173,6 @@ unsigned radeon_llvm_compile(LLVMModuleRef M, struct radeon_llvm_binary *binary,
 		}
 	}
 
-	if (elf){
-		elf_end(elf);
-	}
-	FREE(elf_buffer);
 	LLVMDisposeMemoryBuffer(out_buffer);
 	LLVMDisposeTargetMachine(tm);
 	return 0;

src/gallium/drivers/radeon/radeon_llvm_util.c

@@ -30,26 +30,25 @@
 #include <llvm-c/BitReader.h>
 #include <llvm-c/Core.h>
 #include <llvm-c/Target.h>
-#include <llvm-c/Transforms/IPO.h>
 #include <llvm-c/Transforms/PassManagerBuilder.h>
 
-LLVMModuleRef radeon_llvm_parse_bitcode(LLVMContextRef ctx,
-							const unsigned char * bitcode, unsigned bitcode_len)
+LLVMModuleRef radeon_llvm_parse_bitcode(const unsigned char * bitcode,
+							unsigned bitcode_len)
 {
 	LLVMMemoryBufferRef buf;
+	LLVMContextRef ctx = LLVMContextCreate();
 	LLVMModuleRef module;
 
 	buf = LLVMCreateMemoryBufferWithMemoryRangeCopy((const char*)bitcode,
 							bitcode_len, "radeon");
 	LLVMParseBitcodeInContext(ctx, buf, &module, NULL);
-	LLVMDisposeMemoryBuffer(buf);
 	return module;
 }
 
-unsigned radeon_llvm_get_num_kernels(LLVMContextRef ctx,
-				const unsigned char *bitcode, unsigned bitcode_len)
+unsigned radeon_llvm_get_num_kernels(const unsigned char *bitcode,
+				unsigned bitcode_len)
 {
-	LLVMModuleRef mod = radeon_llvm_parse_bitcode(ctx, bitcode, bitcode_len);
+	LLVMModuleRef mod = radeon_llvm_parse_bitcode(bitcode, bitcode_len);
 	return LLVMGetNamedMetadataNumOperands(mod, "opencl.kernels");
 }
 
@@ -59,35 +58,17 @@ static void radeon_llvm_optimize(LLVMModuleRef mod)
 	LLVMTargetDataRef TD = LLVMCreateTargetData(data_layout);
 	LLVMPassManagerBuilderRef builder = LLVMPassManagerBuilderCreate();
 	LLVMPassManagerRef pass_manager = LLVMCreatePassManager();
-
-	/* Functions calls are not supported yet, so we need to inline
-	 * everything.  The most efficient way to do this is to add
-	 * the always_inline attribute to all non-kernel functions
-	 * and then run the Always Inline pass.  The Always Inline
-	 * pass will automaically inline functions with this attribute
-	 * and does not perform the expensive cost analysis that the normal
-	 * inliner does.
-	 */
-
-	LLVMValueRef fn;
-	for (fn = LLVMGetFirstFunction(mod); fn; fn = LLVMGetNextFunction(fn)) {
-		/* All the non-kernel functions have internal linkage */
-		if (LLVMGetLinkage(fn) == LLVMInternalLinkage) {
-			LLVMAddFunctionAttr(fn, LLVMAlwaysInlineAttribute);
-		}
-	}
-
 	LLVMAddTargetData(TD, pass_manager);
-	LLVMAddAlwaysInlinerPass(pass_manager);
+
+	LLVMPassManagerBuilderUseInlinerWithThreshold(builder, 1000000000);
 	LLVMPassManagerBuilderPopulateModulePassManager(builder, pass_manager);
 
 	LLVMRunPassManager(pass_manager, mod);
 	LLVMPassManagerBuilderDispose(builder);
 	LLVMDisposePassManager(pass_manager);
-	LLVMDisposeTargetData(TD);
 }
 
-LLVMModuleRef radeon_llvm_get_kernel_module(LLVMContextRef ctx, unsigned index,
+LLVMModuleRef radeon_llvm_get_kernel_module(unsigned index,
 		const unsigned char *bitcode, unsigned bitcode_len)
 {
 	LLVMModuleRef mod;
@@ -95,7 +76,7 @@ LLVMModuleRef radeon_llvm_get_kernel_module(LLVMContextRef ctx, unsigned index,
 	LLVMValueRef *kernel_metadata;
 	unsigned i;
 
-	mod = radeon_llvm_parse_bitcode(ctx, bitcode, bitcode_len);
+	mod = radeon_llvm_parse_bitcode(bitcode, bitcode_len);
 	num_kernels = LLVMGetNamedMetadataNumOperands(mod, "opencl.kernels");
 	kernel_metadata = MALLOC(num_kernels * sizeof(LLVMValueRef));
 	LLVMGetNamedMetadataOperands(mod, "opencl.kernels", kernel_metadata);

src/gallium/drivers/radeon/radeon_llvm_util.h

@@ -29,11 +29,10 @@
 
 #include <llvm-c/Core.h>
 
-LLVMModuleRef radeon_llvm_parse_bitcode(LLVMContextRef ctx,
-			const unsigned char * bitcode, unsigned bitcode_len);
-unsigned radeon_llvm_get_num_kernels(LLVMContextRef ctx,
-			const unsigned char *bitcode, unsigned bitcode_len);
-LLVMModuleRef radeon_llvm_get_kernel_module(LLVMContextRef ctx, unsigned index,
+LLVMModuleRef radeon_llvm_parse_bitcode(const unsigned char * bitcode,
+							unsigned bitcode_len);
+unsigned radeon_llvm_get_num_kernels(const unsigned char *bitcode, unsigned bitcode_len);
+LLVMModuleRef radeon_llvm_get_kernel_module(unsigned index,
 			const unsigned char *bitcode, unsigned bitcode_len);
 
 #endif

src/gallium/drivers/radeon/radeon_setup_tgsi_llvm.c

@@ -1379,7 +1379,7 @@ void radeon_llvm_finalize_module(struct radeon_llvm_context * ctx)
 	LLVMAddAggressiveDCEPass(gallivm->passmgr);
 	LLVMAddCFGSimplificationPass(gallivm->passmgr);
 
-	/* Run the pass */
+	/* Run the passs */
 	LLVMRunFunctionPassManager(gallivm->passmgr, ctx->main_fn);
 
 	LLVMDisposeBuilder(gallivm->builder);

src/gallium/drivers/radeon/radeon_uvd.c

@@ -58,9 +58,6 @@
 #define NUM_H264_REFS 17
 #define NUM_VC1_REFS 5
 
-#define FB_BUFFER_OFFSET 0x1000
-#define FB_BUFFER_SIZE 2048
-
 /* UVD buffer representation */
 struct ruvd_buffer
 {
@@ -84,7 +81,6 @@ struct ruvd_decoder {
 
 	struct ruvd_buffer		msg_fb_buffers[NUM_BUFFERS];
 	struct ruvd_msg			*msg;
-	uint32_t			*fb;
 
 	struct ruvd_buffer		bs_buffers[NUM_BUFFERS];
 	void*				bs_ptr;
@@ -135,21 +131,16 @@ static void send_cmd(struct ruvd_decoder *dec, unsigned cmd,
 	set_reg(dec, RUVD_GPCOM_VCPU_CMD, cmd << 1);
 }
 
-/* map the next available message/feedback buffer */
-static void map_msg_fb_buf(struct ruvd_decoder *dec)
+/* map the next available message buffer */
+static void map_msg_buf(struct ruvd_decoder *dec)
 {
 	struct ruvd_buffer* buf;
-	uint8_t *ptr;
 
-	/* grab the current message/feedback buffer */
+	/* grap the current message buffer */
 	buf = &dec->msg_fb_buffers[dec->cur_buffer];
 
-	/* and map it for CPU access */
-	ptr = dec->ws->buffer_map(buf->cs_handle, dec->cs, PIPE_TRANSFER_WRITE);
-
-	/* calc buffer offsets */
-	dec->msg = (struct ruvd_msg *)ptr;
-	dec->fb = (uint32_t *)(ptr + FB_BUFFER_OFFSET);
+	/* copy the message into it */
+	dec->msg = dec->ws->buffer_map(buf->cs_handle, dec->cs, PIPE_TRANSFER_WRITE);
 }
 
 /* unmap and send a message command to the VCPU */
@@ -157,8 +148,8 @@ static void send_msg_buf(struct ruvd_decoder *dec)
 {
 	struct ruvd_buffer* buf;
 
-	/* ignore the request if message/feedback buffer isn't mapped */
-	if (!dec->msg || !dec->fb)
+	/* ignore the request if message buffer isn't mapped */
+	if (!dec->msg)
 		return;
 
 	/* grap the current message buffer */
@@ -166,8 +157,6 @@ static void send_msg_buf(struct ruvd_decoder *dec)
 
 	/* unmap the buffer */
 	dec->ws->buffer_unmap(buf->cs_handle);
-	dec->msg = NULL;
-	dec->fb = NULL;
 
 	/* and send it to the hardware */
 	send_cmd(dec, RUVD_CMD_MSG_BUFFER, buf->cs_handle, 0,
@@ -655,7 +644,7 @@ static void ruvd_destroy(struct pipe_video_codec *decoder)
 
 	assert(decoder);
 
-	map_msg_fb_buf(dec);
+	map_msg_buf(dec);
 	memset(dec->msg, 0, sizeof(*dec->msg));
 	dec->msg->size = sizeof(*dec->msg);
 	dec->msg->msg_type = RUVD_MSG_DESTROY;
@@ -784,7 +773,7 @@ static void ruvd_end_frame(struct pipe_video_codec *decoder,
 	memset(dec->bs_ptr, 0, bs_size - dec->bs_size);
 	dec->ws->buffer_unmap(bs_buf->cs_handle);
 
-	map_msg_fb_buf(dec);
+	map_msg_buf(dec);
 	dec->msg->size = sizeof(*dec->msg);
 	dec->msg->msg_type = RUVD_MSG_DECODE;
 	dec->msg->stream_handle = dec->stream_handle;
@@ -824,10 +813,6 @@ static void ruvd_end_frame(struct pipe_video_codec *decoder,
 
 	dec->msg->body.decode.db_surf_tile_config = dec->msg->body.decode.dt_surf_tile_config;
 	dec->msg->body.decode.extension_support = 0x1;
-
-	/* set at least the feedback buffer size */
-	dec->fb[0] = FB_BUFFER_SIZE;
-
 	send_msg_buf(dec);
 
 	send_cmd(dec, RUVD_CMD_DPB_BUFFER, dec->dpb.cs_handle, 0,
@@ -837,7 +822,7 @@ static void ruvd_end_frame(struct pipe_video_codec *decoder,
 	send_cmd(dec, RUVD_CMD_DECODING_TARGET_BUFFER, dt, 0,
 		 RADEON_USAGE_WRITE, RADEON_DOMAIN_VRAM);
 	send_cmd(dec, RUVD_CMD_FEEDBACK_BUFFER, msg_fb_buf->cs_handle,
-		 FB_BUFFER_OFFSET, RADEON_USAGE_WRITE, RADEON_DOMAIN_GTT);
+		 0x1000, RADEON_USAGE_WRITE, RADEON_DOMAIN_GTT);
 	set_reg(dec, RUVD_ENGINE_CNTL, 1);
 
 	flush(dec);
@@ -913,8 +898,7 @@ struct pipe_video_codec *ruvd_create_decoder(struct pipe_context *context,
 
 	bs_buf_size = width * height * 512 / (16 * 16);
 	for (i = 0; i < NUM_BUFFERS; ++i) {
-		unsigned msg_fb_size = FB_BUFFER_OFFSET + FB_BUFFER_SIZE;
-		STATIC_ASSERT(sizeof(struct ruvd_msg) <= FB_BUFFER_OFFSET);
+		unsigned msg_fb_size = align(sizeof(struct ruvd_msg), 0x1000) + 0x1000;
 		if (!create_buffer(dec, &dec->msg_fb_buffers[i], msg_fb_size)) {
 			RUVD_ERR("Can't allocated message buffers.\n");
 			goto error;
@@ -936,7 +920,7 @@ struct pipe_video_codec *ruvd_create_decoder(struct pipe_context *context,
 
 	clear_buffer(dec, &dec->dpb);
 
-	map_msg_fb_buf(dec);
+	map_msg_buf(dec);
 	dec->msg->size = sizeof(*dec->msg);
 	dec->msg->msg_type = RUVD_MSG_CREATE;
 	dec->msg->stream_handle = dec->stream_handle;

src/gallium/drivers/radeonsi/radeonsi_compute.c

@@ -20,7 +20,6 @@ struct si_pipe_compute {
 
         struct pipe_resource *global_buffers[MAX_GLOBAL_BUFFERS];
 
-	LLVMContextRef llvm_ctx;
 };
 
 static void *radeonsi_create_compute_state(
@@ -34,8 +33,6 @@ static void *radeonsi_create_compute_state(
 	const unsigned char *code;
 	unsigned i;
 
-	program->llvm_ctx = LLVMContextCreate();
-
 	header = cso->prog;
 	code = cso->prog + sizeof(struct pipe_llvm_program_header);
 
@@ -44,15 +41,14 @@ static void *radeonsi_create_compute_state(
 	program->private_size = cso->req_private_mem;
 	program->input_size = cso->req_input_mem;
 
-	program->num_kernels = radeon_llvm_get_num_kernels(program->llvm_ctx, code,
+	program->num_kernels = radeon_llvm_get_num_kernels(code,
 							header->num_bytes);
 	program->kernels = CALLOC(sizeof(struct si_pipe_shader),
 							program->num_kernels);
 	for (i = 0; i < program->num_kernels; i++) {
-		LLVMModuleRef mod = radeon_llvm_get_kernel_module(program->llvm_ctx, i,
-							code, header->num_bytes);
+		LLVMModuleRef mod = radeon_llvm_get_kernel_module(i, code,
+							header->num_bytes);
 		si_compile_llvm(rctx, &program->kernels[i], mod);
-		LLVMDisposeModule(mod);
 	}
 
 	return program;
@@ -106,7 +102,6 @@ static void radeonsi_launch_grid(
 	unsigned arg_user_sgpr_count = 2;
 	unsigned i;
 	struct si_pipe_shader *shader = &program->kernels[pc];
-	unsigned lds_blocks;
 
 	pm4->compute_pkt = true;
 	si_cmd_context_control(pm4);
@@ -166,18 +161,9 @@ static void radeonsi_launch_grid(
 		si_pm4_add_bo(pm4, buffer, RADEON_USAGE_READWRITE);
 	}
 
-	/* This register has been moved to R_00CD20_COMPUTE_MAX_WAVE_ID
-	 * and is now per pipe, so it should be handled in the
-	 * kernel if we want to use something other than the default value,
-	 * which is now 0x22f.
-	 */
-	if (rctx->b.chip_class <= SI) {
-		/* XXX: This should be:
-		 * (number of compute units) * 4 * (waves per simd) - 1 */
-
-		si_pm4_set_reg(pm4, R_00B82C_COMPUTE_MAX_WAVE_ID,
-						0x190 /* Default value */);
-	}
+	/* XXX: This should be:
+	 * (number of compute units) * 4 * (waves per simd) - 1 */
+	si_pm4_set_reg(pm4, R_00B82C_COMPUTE_MAX_WAVE_ID, 0x190 /* Default value */);
 
 	shader_va = r600_resource_va(ctx->screen, (void *)shader->bo);
 	si_pm4_add_bo(pm4, shader->bo, RADEON_USAGE_READ);
@@ -198,20 +184,6 @@ static void radeonsi_launch_grid(
 		                        shader->num_sgprs)) - 1) / 8))
 		;
 
-	lds_blocks = shader->lds_size;
-	/* XXX: We are over allocating LDS.  For SI, the shader reports LDS in
-	 * blocks of 256 bytes, so if there are 4 bytes lds allocated in
-	 * the shader and 4 bytes allocated by the state tracker, then
-	 * we will set LDS_SIZE to 512 bytes rather than 256.
-	 */
-	if (rctx->b.chip_class <= SI) {
-		lds_blocks += align(program->local_size, 256) >> 8;
-	} else {
-		lds_blocks += align(program->local_size, 512) >> 9;
-	}
-
-	assert(lds_blocks <= 0xFF);
-
 	si_pm4_set_reg(pm4, R_00B84C_COMPUTE_PGM_RSRC2,
 		S_00B84C_SCRATCH_EN(0)
 		| S_00B84C_USER_SGPR(arg_user_sgpr_count)
@@ -220,7 +192,7 @@ static void radeonsi_launch_grid(
 		| S_00B84C_TGID_Z_EN(1)
 		| S_00B84C_TG_SIZE_EN(1)
 		| S_00B84C_TIDIG_COMP_CNT(2)
-		| S_00B84C_LDS_SIZE(lds_blocks)
+		| S_00B84C_LDS_SIZE(shader->lds_size)
 		| S_00B84C_EXCP_EN(0))
 		;
 	si_pm4_set_reg(pm4, R_00B854_COMPUTE_RESOURCE_LIMITS, 0);
@@ -264,25 +236,7 @@ static void radeonsi_launch_grid(
 }
 
 
-static void si_delete_compute_state(struct pipe_context *ctx, void* state){
-	struct si_pipe_compute *program = (struct si_pipe_compute *)state;
-
-	if (!state) {
-		return;
-	}
-
-	if (program->kernels) {
-		FREE(program->kernels);
-	}
-
-	if (program->llvm_ctx){
-		LLVMContextDispose(program->llvm_ctx);
-	}
-
-	//And then free the program itself.
-	FREE(program);
-}
-
+static void si_delete_compute_state(struct pipe_context *ctx, void* state){}
 static void si_set_compute_resources(struct pipe_context * ctx_,
 		unsigned start, unsigned count,
 		struct pipe_surface ** surfaces) { }

src/gallium/drivers/softpipe/sp_quad_blend.c

@@ -860,8 +860,8 @@ clamp_colors(float (*quadColor)[4])
 {
    unsigned i, j;
 
-   for (i = 0; i < 4; i++) {
-      for (j = 0; j < TGSI_QUAD_SIZE; j++) {
+   for (j = 0; j < TGSI_QUAD_SIZE; j++) {
+      for (i = 0; i < 4; i++) {
          quadColor[i][j] = CLAMP(quadColor[i][j], 0.0F, 1.0F);
       }
    }

src/gallium/drivers/softpipe/sp_texture.c

@@ -60,7 +60,7 @@ softpipe_resource_layout(struct pipe_screen *screen,
    unsigned width = pt->width0;
    unsigned height = pt->height0;
    unsigned depth = pt->depth0;
-   uint64_t buffer_size = 0;
+   unsigned buffer_size = 0;
 
    for (level = 0; level <= pt->last_level; level++) {
       unsigned slices;
@@ -76,8 +76,8 @@ softpipe_resource_layout(struct pipe_screen *screen,
 
       spr->level_offset[level] = buffer_size;
 
-      buffer_size += (uint64_t) util_format_get_nblocksy(pt->format, height) *
-                     slices * spr->stride[level];
+      buffer_size += (util_format_get_nblocksy(pt->format, height) *
+                      slices * spr->stride[level]);
 
       width  = u_minify(width, 1);
       height = u_minify(height, 1);

src/gallium/drivers/svga/svga_context.c

@@ -90,8 +90,6 @@ struct pipe_context *svga_context_create( struct pipe_screen *screen,
    if (svga == NULL)
       goto no_svga;
 
-   LIST_INITHEAD(&svga->dirty_buffers);
-
    svga->pipe.screen = screen;
    svga->pipe.priv = priv;
    svga->pipe.destroy = svga_destroy;
@@ -157,6 +155,8 @@ struct pipe_context *svga_context_create( struct pipe_screen *screen,
 
    svga->dirty = ~0;
 
+   LIST_INITHEAD(&svga->dirty_buffers);
+
    return &svga->pipe;
 
 no_state:

src/gallium/drivers/svga/svga_draw_elements.c

@@ -24,7 +24,6 @@
  **********************************************************/
 
 #include "util/u_inlines.h"
-#include "util/u_prim.h"
 #include "indices/u_indices.h"
 
 #include "svga_cmd.h"
@@ -38,25 +37,17 @@
 
 static enum pipe_error
 translate_indices(struct svga_hwtnl *hwtnl, struct pipe_resource *src,
-                  unsigned offset, unsigned prim, unsigned nr,
-                  unsigned index_size,
+                  unsigned offset, unsigned nr, unsigned index_size,
                   u_translate_func translate, struct pipe_resource **out_buf)
 {
    struct pipe_context *pipe = &hwtnl->svga->pipe;
    struct pipe_transfer *src_transfer = NULL;
    struct pipe_transfer *dst_transfer = NULL;
-   unsigned size;
+   unsigned size = index_size * nr;
    const void *src_map = NULL;
    struct pipe_resource *dst = NULL;
    void *dst_map = NULL;
 
-   /* Need to trim vertex count to make sure we don't write too much data
-    * to the dst buffer in the translate() call.
-    */
-   u_trim_pipe_prim(prim, &nr);
-
-   size = index_size * nr;
-
    dst = pipe_buffer_create(pipe->screen,
                             PIPE_BIND_INDEX_BUFFER, PIPE_USAGE_STATIC, size);
    if (dst == NULL)
@@ -189,7 +180,7 @@ svga_hwtnl_draw_range_elements(struct svga_hwtnl *hwtnl,
       ret = translate_indices(hwtnl,
                               index_buffer,
                               start * index_size,
-                              gen_prim, gen_nr, gen_size, gen_func, &gen_buf);
+                              gen_nr, gen_size, gen_func, &gen_buf);
       if (ret != PIPE_OK)
          goto done;
 

src/gallium/drivers/svga/svga_pipe_blit.c

@@ -148,8 +148,6 @@ static void svga_surface_copy(struct pipe_context *pipe,
 
 #endif
 
-   /* Mark the destination image as being defined */
-   svga_define_texture_level(dtex, dst_face, dst_level);
 }
 
 

src/gallium/drivers/svga/svga_state_fs.c

@@ -199,43 +199,15 @@ make_fs_key(const struct svga_context *svga,
    if (svga->curr.blend->need_white_fragments) {
       key->white_fragments = 1;
    }
-
-#ifdef DEBUG
-   /*
-    * We expect a consistent set of samplers and sampler views.
-    * Do some debug checks/warnings here.
-    */
-   {
-      static boolean warned = FALSE;
-      unsigned i, n = MAX2(svga->curr.num_sampler_views,
-                           svga->curr.num_samplers);
-      /* Only warn once to prevent too much debug output */
-      if (!warned) {
-         if (svga->curr.num_sampler_views != svga->curr.num_samplers) {
-            debug_printf("svga: mismatched number of sampler views (%u) "
-                         "vs. samplers (%u)\n",
-                         svga->curr.num_sampler_views,
-                         svga->curr.num_samplers);
-         }
-         for (i = 0; i < n; i++) {
-            if ((svga->curr.sampler_views[i] == NULL) !=
-                (svga->curr.sampler[i] == NULL))
-               debug_printf("sampler_view[%u] = %p but sampler[%u] = %p\n",
-                            i, svga->curr.sampler_views[i],
-                            i, svga->curr.sampler[i]);
-         }
-         warned = TRUE;
-      }
-   }
-#endif
-
+   
    /* XXX: want to limit this to the textures that the shader actually
     * refers to.
     *
     * SVGA_NEW_TEXTURE_BINDING | SVGA_NEW_SAMPLER
     */
    for (i = 0; i < svga->curr.num_sampler_views; i++) {
-      if (svga->curr.sampler_views[i] && svga->curr.sampler[i]) {
+      if (svga->curr.sampler_views[i]) {
+         assert(svga->curr.sampler[i]);
          assert(svga->curr.sampler_views[i]->texture);
          key->tex[i].texture_target = svga->curr.sampler_views[i]->texture->target;
          if (!svga->curr.sampler[i]->normalized_coords) {

src/gallium/drivers/svga/svga_state_tss.c

@@ -85,7 +85,7 @@ update_tss_binding(struct svga_context *svga,
       struct pipe_sampler_view *sv = svga->curr.sampler_views[i];
 
       /* get min max lod */
-      if (sv && s) {
+      if (sv) {
          min_lod = MAX2(0, (s->view_min_lod + sv->u.tex.first_level));
          max_lod = MIN2(s->view_max_lod + sv->u.tex.first_level,
                         sv->texture->last_level);

src/gallium/include/pipe/p_config.h

@@ -157,16 +157,6 @@
 # define PIPE_ARCH_BIG_ENDIAN
 #endif
 
-#elif defined(__OpenBSD__)
-#include <sys/types.h>
-#include <machine/endian.h>
-
-#if _BYTE_ORDER == _LITTLE_ENDIAN
-# define PIPE_ARCH_LITTLE_ENDIAN
-#elif _BYTE_ORDER == _BIG_ENDIAN
-# define PIPE_ARCH_BIG_ENDIAN
-#endif
-
 #else
 
 #if defined(PIPE_ARCH_X86) || defined(PIPE_ARCH_X86_64) || defined(PIPE_ARCH_ARM) || defined(PIPE_ARCH_AARCH64)

src/gallium/state_trackers/clover/api/context.cpp

@@ -61,24 +61,18 @@ clCreateContextFromType(const cl_context_properties *d_props,
                         void *user_data, cl_int *r_errcode) try {
    cl_platform_id d_platform;
    cl_uint num_platforms;
+   cl_device_id d_dev;
    cl_int ret;
-   std::vector<cl_device_id> devs;
-   cl_uint num_devices;
 
    ret = clGetPlatformIDs(1, &d_platform, &num_platforms);
    if (ret || !num_platforms)
       throw error(CL_INVALID_PLATFORM);
 
-   ret = clGetDeviceIDs(d_platform, type, 0, NULL, &num_devices);
-   if (ret)
-      throw error(CL_DEVICE_NOT_FOUND);
-   devs.resize(num_devices);
-   ret = clGetDeviceIDs(d_platform, type, num_devices, devs.data(), 0);
+   ret = clGetDeviceIDs(d_platform, type, 1, &d_dev, 0);
    if (ret)
       throw error(CL_DEVICE_NOT_FOUND);
 
-   return clCreateContext(d_props, num_devices, devs.data(), pfn_notify,
-                          user_data, r_errcode);
+   return clCreateContext(d_props, 1, &d_dev, pfn_notify, user_data, r_errcode);
 
 } catch (error &e) {
    ret_error(r_errcode, e);

src/gallium/state_trackers/clover/api/program.cpp

@@ -173,15 +173,11 @@ clGetProgramInfo(cl_program d_prog, cl_program_info param,
       break;
 
    case CL_PROGRAM_NUM_DEVICES:
-      buf.as_scalar<cl_uint>() = prog.devices().size() ?
-                                 prog.devices().size() :
-                                 prog.ctx.devs().size();
+      buf.as_scalar<cl_uint>() = prog.devices().size();
       break;
 
    case CL_PROGRAM_DEVICES:
-      buf.as_vector<cl_device_id>() = prog.devices().size() ?
-                                      descs(prog.devices()) :
-                                      descs(prog.ctx.devs());
+      buf.as_vector<cl_device_id>() = descs(prog.devices());
       break;
 
    case CL_PROGRAM_SOURCE:

src/gallium/state_trackers/clover/llvm/invocation.cpp

@@ -117,6 +117,7 @@ namespace {
            const std::string &opts, clang::LangAS::Map& address_spaces) {
 
       clang::CompilerInstance c;
+      clang::CompilerInvocation invocation;
       clang::EmitLLVMOnlyAction act(&llvm::getGlobalContext());
       std::string log;
       llvm::raw_string_ostream s_log(log);

src/gallium/state_trackers/clover/util/range.hpp

@@ -269,8 +269,7 @@ namespace clover {
 
       typename super::const_iterator
       end() const {
-         return { f, tuple::map(advances_by(size()),
-                                tuple::map(begins(), os)) };
+         return { f, tuple::map(ends(), os) };
       }
 
       typename super::size_type

src/gallium/state_trackers/dri/common/dri_context.h

@@ -89,7 +89,6 @@ dri_create_context(gl_api api,
 		   unsigned major_version,
 		   unsigned minor_version,
 		   uint32_t flags,
-		   bool notify_reset,
 		   unsigned *error,
 		   void *sharedContextPrivate);
 

src/gallium/state_trackers/dri/common/dri_screen.c

@@ -360,12 +360,6 @@ dri_destroy_option_cache(struct dri_screen * screen)
    }
 
    free(screen->optionCache.values);
-
-   /* Default values are copied to screen->optionCache->values in
-    * initOptionCache. The info field, however, is a pointer copy, so don't free
-    * that twice.
-    */
-   free(screen->optionCacheDefaults.values);
 }
 
 void

src/gallium/state_trackers/vdpau/device.c

@@ -72,11 +72,6 @@ vdp_imp_device_create_x11(Display *display, int screen, VdpDevice *device,
       goto no_context;
    }
 
-   if (!pscreen->get_param(pscreen, PIPE_CAP_NPOT_TEXTURES)) {
-      ret = VDP_STATUS_NO_IMPLEMENTATION;
-      goto no_context;
-   }
-
    *device = vlAddDataHTAB(dev);
    if (*device == 0) {
       ret = VDP_STATUS_ERROR;
@@ -91,7 +86,6 @@ vdp_imp_device_create_x11(Display *display, int screen, VdpDevice *device,
    return VDP_STATUS_OK;
 
 no_handle:
-   dev->context->destroy(dev->context);
    /* Destroy vscreen */
 no_context:
    vl_screen_destroy(dev->vscreen);

src/gallium/state_trackers/xa/xa_tracker.h

@@ -36,7 +36,7 @@
 
 #include <stdint.h>
 
-#define XA_TRACKER_VERSION_MAJOR 2
+#define XA_TRACKER_VERSION_MAJOR 1
 #define XA_TRACKER_VERSION_MINOR 0
 #define XA_TRACKER_VERSION_PATCH 0
 

src/gallium/targets/egl-static/Makefile.am

@@ -30,8 +30,6 @@
 #
 include $(top_srcdir)/src/gallium/Automake.inc
 
-LDFLAGS += -Wl,--version-script=$(top_srcdir)/src/gallium/targets/egl-static/egl.link
-
 AM_CFLAGS = $(PTHREAD_CFLAGS)
 AM_CPPFLAGS = \
 	$(GALLIUM_CFLAGS) \

src/gallium/targets/egl-static/egl.link

@@ -1,3 +0,0 @@
-VERSION {
-	global: _eglMain; local: *;
-};

src/gallium/targets/pipe-loader/Makefile.am

@@ -22,8 +22,6 @@
 
 include $(top_srcdir)/src/gallium/Automake.inc
 
-LDFLAGS += -Wl,--version-script=$(top_srcdir)/src/gallium/targets/pipe-loader/pipe.link
-
 AM_CPPFLAGS = \
 	$(GALLIUM_CFLAGS) \
 	-I$(top_srcdir)/include \

src/gallium/targets/pipe-loader/pipe.link

@@ -1,3 +0,0 @@
-VERSION {
-	global: driver_descriptor; local: *;
-};

src/gallium/targets/r600/vdpau/Makefile.am

@@ -58,13 +58,17 @@ libvdpau_r600_la_LIBADD = \
 	$(LIBDRM_LIBS) \
 	$(RADEON_LIBS)
 
+if HAVE_MESA_LLVM
 libvdpau_r600_la_LINK = $(CXXLINK) $(libvdpau_r600_la_LDFLAGS)
 # Mention a dummy pure C++ file to trigger generation of the $(LINK) variable
 nodist_EXTRA_libvdpau_r600_la_SOURCES = dummy-cpp.cpp
 
-if HAVE_MESA_LLVM
 libvdpau_r600_la_LDFLAGS += $(LLVM_LDFLAGS)
 libvdpau_r600_la_LIBADD += $(LLVM_LIBS)
+else
+libvdpau_r600_la_LINK = $(LINK) $(libvdpau_r600_la_LDFLAGS)
+# Mention a dummy pure C file to trigger generation of the $(LINK) variable
+nodist_EXTRA_libvdpau_r600_la_SOURCES = dummy-c.c
 endif
 
 # Provide compatibility with scripts for the old Mesa build system for

src/gbm/backends/dri/gbm_dri.c

@@ -104,24 +104,6 @@ dri_get_buffers_with_format(__DRIdrawable * driDrawable,
                                    count, out_count, surf->dri_private);
 }
 
-static int
-image_get_buffers(__DRIdrawable *driDrawable,
-                  unsigned int format,
-                  uint32_t *stamp,
-                  void *loaderPrivate,
-                  uint32_t buffer_mask,
-                  struct __DRIimageList *buffers)
-{
-   struct gbm_dri_surface *surf = loaderPrivate;
-   struct gbm_dri_device *dri = gbm_dri_device(surf->base.gbm);
-
-   if (dri->image_get_buffers == NULL)
-      return 0;
-
-   return dri->image_get_buffers(driDrawable, format, stamp,
-                                 surf->dri_private, buffer_mask, buffers);
-}
-
 static const __DRIuseInvalidateExtension use_invalidate = {
    { __DRI_USE_INVALIDATE, 1 }
 };
@@ -131,20 +113,13 @@ static const __DRIimageLookupExtension image_lookup_extension = {
    dri_lookup_egl_image
 };
 
-static const __DRIdri2LoaderExtension dri2_loader_extension = {
+const __DRIdri2LoaderExtension dri2_loader_extension = {
    { __DRI_DRI2_LOADER, 3 },
    dri_get_buffers,
    dri_flush_front_buffer,
    dri_get_buffers_with_format,
 };
 
-static const __DRIimageLoaderExtension image_loader_extension = {
-   { __DRI_IMAGE_LOADER, 1 },
-   image_get_buffers,
-   dri_flush_front_buffer,
-};
-
-
 struct dri_extension_match {
    const char *name;
    int version;
@@ -283,8 +258,7 @@ dri_screen_create(struct gbm_dri_device *dri)
    dri->extensions[0] = &image_lookup_extension.base;
    dri->extensions[1] = &use_invalidate.base;
    dri->extensions[2] = &dri2_loader_extension.base;
-   dri->extensions[3] = &image_loader_extension.base;
-   dri->extensions[4] = NULL;
+   dri->extensions[3] = NULL;
 
    if (dri->dri2 == NULL)
       return -1;

src/gbm/backends/dri/gbm_driint.h

@@ -52,7 +52,7 @@ struct gbm_dri_device {
    __DRIdri2LoaderExtension *loader;
 
    const __DRIconfig   **driver_configs;
-   const __DRIextension *extensions[5];
+   const __DRIextension *extensions[4];
    const __DRIextension **driver_extensions;
 
    __DRIimage *(*lookup_image)(__DRIscreen *screen, void *image, void *data);
@@ -67,12 +67,6 @@ struct gbm_dri_device {
 			     int *width, int *height,
 			     unsigned int *attachments, int count,
 			     int *out_count, void *data);
-   int (*image_get_buffers)(__DRIdrawable *driDrawable,
-                            unsigned int format,
-                            uint32_t *stamp,
-                            void *loaderPrivate,
-                            uint32_t buffer_mask,
-                            struct __DRIimageList *buffers);
 
    struct wl_drm *wl_drm;
 };