Author: arekm Date: Sat Jan 15 09:13:45 2011 GMT Module: packages Tag: HEAD ---- Log message: - up to 7.9.1
---- Files affected: packages/Mesa: Mesa-git.patch (1.13 -> 1.14) , Mesa.spec (1.264 -> 1.265) ---- Diffs: ================================================================ Index: packages/Mesa/Mesa-git.patch diff -u packages/Mesa/Mesa-git.patch:1.13 packages/Mesa/Mesa-git.patch:1.14 --- packages/Mesa/Mesa-git.patch:1.13 Tue Dec 7 19:49:10 2010 +++ packages/Mesa/Mesa-git.patch Sat Jan 15 10:13:40 2011 @@ -1,3193 +1,151 @@ -diff --git a/Makefile b/Makefile -index b8069f9..b13ed33 100644 ---- a/Makefile -+++ b/Makefile -@@ -347,23 +347,19 @@ GALLIUM_FILES = \ +diff --git a/docs/relnotes-7.9.1.html b/docs/relnotes-7.9.1.html +index dae0ba2..bef4ef1 100644 +--- a/docs/relnotes-7.9.1.html ++++ b/docs/relnotes-7.9.1.html +@@ -1,8 +1,10 @@ + <HTML> + ++<head> + <TITLE>Mesa Release Notes</TITLE> +- +-<head><link rel="stylesheet" type="text/css" href="mesa.css"></head> ++<link rel="stylesheet" type="text/css" href="mesa.css"> ++<meta http-equiv="content-type" content="text/html; charset=utf-8" /> ++</head> - DRI_FILES = \ - $(DIRECTORY)/include/GL/internal/dri_interface.h \ -- $(DIRECTORY)/include/GL/internal/glcore.h \ - $(DIRECTORY)/include/GL/internal/sarea.h \ - $(DIRECTORY)/src/glx/Makefile \ -- $(DIRECTORY)/src/glx/Makefile \ - $(DIRECTORY)/src/glx/*.[ch] \ - $(DIRECTORY)/src/mesa/drivers/dri/Makefile \ - $(DIRECTORY)/src/mesa/drivers/dri/Makefile.template \ - $(DIRECTORY)/src/mesa/drivers/dri/dri.pc.in \ -- $(DIRECTORY)/src/mesa/drivers/dri/common/xmlpool/*.[ch] \ - $(DIRECTORY)/src/mesa/drivers/dri/common/xmlpool/*.po \ - $(DIRECTORY)/src/mesa/drivers/dri/*/*.[chS] \ - $(DIRECTORY)/src/mesa/drivers/dri/*/*.cpp \ - $(DIRECTORY)/src/mesa/drivers/dri/*/*/*.[chS] \ - $(DIRECTORY)/src/mesa/drivers/dri/*/Makefile \ - $(DIRECTORY)/src/mesa/drivers/dri/*/*/Makefile \ -- $(DIRECTORY)/src/mesa/drivers/dri/*/Doxyfile \ -- $(DIRECTORY)/src/mesa/drivers/dri/*/server/*.[ch] -+ $(DIRECTORY)/src/mesa/drivers/dri/*/Doxyfile + <BODY> - SGI_GLU_FILES = \ - $(DIRECTORY)/src/glu/Makefile \ -diff --git a/docs/devinfo.html b/docs/devinfo.html -index df0e726..2d1c125 100644 ---- a/docs/devinfo.html -+++ b/docs/devinfo.html -@@ -145,7 +145,7 @@ Make sure the values in src/mesa/main/version.h are correct. - </p> - - <p> --Update the docs/news.html file and docs/download.html files. -+Update docs/news.html. - </p> - - <p> -@@ -208,10 +208,11 @@ sftp USERNAME,[email protected] - - <p> - Make an announcement on the mailing lists: --<em>m</em><em>e</em><em>s</em><em>a</em><em>3</em><em>d</em><em>-</em><em>d</em><em>e</em><em>v</em><em>@</em><em>l</em><em>i</em><em>s</em><em>t</em><em>s</em><em>.</em><em>s</em><em>f</em><em>.</em><em>n</em><em>e</em><em>t</em>, --<em>m</em><em>e</em><em>s</em><em>a</em><em>3</em><em>d</em><em>-</em><em>u</em><em>s</em><em>e</em><em>r</em><em>s</em><em>@</em><em>l</em><em>i</em><em>s</em><em>t</em><em>s</em><em>.</em><em>s</em><em>f</em><em>.</em><em>n</em><em>e</em><em>t</em> -+ -+<em>m</em><em>e</em><em>s</em><em>a</em><em>-</em><em>d</em><em>e</em><em>v</em><em>@</em><em>l</em><em>i</em><em>s</em><em>t</em><em>s</em><em>.</em><em>f</em><em>r</em><em>e</em><em>e</em><em>d</em><em>e</em><em>s</em><em>k</em><em>t</em><em>o</em><em>p</em><em>.</em><em>o</em><em>r</em><em>g</em>, -+<em>m</em><em>e</em><em>s</em><em>a</em><em>-</em><em>u</em><em>s</em><em>e</em><em>r</em><em>s</em><em>@</em><em>l</em><em>i</em><em>s</em><em>t</em><em>s</em><em>.</em><em>f</em><em>r</em><em>e</em><em>e</em><em>d</em><em>e</em><em>s</em><em>k</em><em>t</em><em>o</em><em>p</em><em>.</em><em>o</em><em>r</em><em>g</em> - and --<em>m</em><em>e</em><em>s</em><em>a</em><em>3</em><em>d</em><em>-</em><em>a</em><em>n</em><em>n</em><em>o</em><em>u</em><em>n</em><em>c</em><em>e</em><em>@</em><em>l</em><em>i</em><em>s</em><em>t</em><em>s</em><em>.</em><em>s</em><em>f</em><em>.</em><em>n</em><em>e</em><em>t</em> -+<em>m</em><em>e</em><em>s</em><em>a</em><em>-</em><em>a</em><em>n</em><em>n</em><em>o</em><em>u</em><em>n</em><em>c</em><em>e</em><em>@</em><em>l</em><em>i</em><em>s</em><em>t</em><em>s</em><em>.</em><em>f</em><em>r</em><em>e</em><em>e</em><em>d</em><em>e</em><em>s</em><em>k</em><em>t</em><em>o</em><em>p</em><em>.</em><em>o</em><em>r</em><em>g</em> - </p> - - -diff --git a/docs/news.html b/docs/news.html -index b3fb8b5..72d38ee 100644 ---- a/docs/news.html -+++ b/docs/news.html -@@ -11,10 +11,18 @@ - <H1>News</H1> - - -+<h2>October 4, 2010</h2> -+ -+<p> -+<a href="relnotes-7.9.html">Mesa 7.9</a> (final) is released. This is a new -+development release. -+</p> -+ -+ - <h2>September 27, 2010</h2> - - <p> --<a href="relnotes-7.9.0.html">Mesa 7.9.0-rc1</a> is released. This is a -+<a href="relnotes-7.9.html">Mesa 7.9.0-rc1</a> is released. This is a - release candidate for the 7.9 development release. - </p> - -diff --git a/docs/relnotes-7.8.2.html b/docs/relnotes-7.8.2.html -index e1b0f2d..1393b2e 100644 ---- a/docs/relnotes-7.8.2.html -+++ b/docs/relnotes-7.8.2.html -@@ -26,7 +26,15 @@ for DRI hardware acceleration. +@@ -26,7 +28,12 @@ for DRI hardware acceleration. <h2>MD5 checksums</h2> <pre> --tbd -+c89b63d253605ed40e8ac370d25a833c MesaLib-7.8.2.tar.gz -+6be2d343a0089bfd395ce02aaf8adb57 MesaLib-7.8.2.tar.bz2 -+a04ad3b06ac5ff3969a003fa7bbf7d5b MesaLib-7.8.2.zip -+7c213f92efeb471f0331670d5079d4c0 MesaDemos-7.8.2.tar.gz -+757d9e2e06f48b1a52848be9b0307ced MesaDemos-7.8.2.tar.bz2 -+8d0e5cfe68b8ebf90265d350ae2c48b1 MesaDemos-7.8.2.zip -+b74482e3f44f35ed395c4aada4fd8240 MesaGLUT-7.8.2.tar.gz -+a471807b65e49c325808ba4551be93ed MesaGLUT-7.8.2.tar.bz2 -+9f190268c42be582ef66e47365ee61e3 MesaGLUT-7.8.2.zip +-TBD. ++78422843ea875ad4eac35b9b8584032b MesaLib-7.9.1.tar.gz ++07dc6cfb5928840b8b9df5bd1b3ae434 MesaLib-7.9.1.tar.bz2 ++c8eaea5b3c3d6dee784bd8c2db91c80f MesaLib-7.9.1.zip ++ee9ecae4ca56fbb2d14dc15e3a0a7640 MesaGLUT-7.9.1.tar.gz ++41fc477d524e7dc5c84da8ef22422bea MesaGLUT-7.9.1.tar.bz2 ++90b287229afdf19317aa989d19462e7a MesaGLUT-7.9.1.zip </pre> -@@ -44,10 +52,95 @@ tbd - <ul> - <li>Fixed Gallium glDrawPixels(GL_DEPTH_COMPONENT). - <li>Fixed Gallium Cell driver to buildable, runable state -+<li>Fixed bad error checking for glFramebufferRenderbuffer(attachment=GL_DEPTH_STENCIL_ATTACHMENT). -+<li>Fixed incorrect Z coordinate handling in "meta" glDraw/CopyPixels. -+ <a href="https://bugs.freedesktop.org/show_bug.cgi?id=23670";>Bug -+ #23670</a>.</li> -+ -+<li>Assorted i965 driver fixes. -+ Including but not limited to: -+ <ul> -+ <li>Fix scissoring when width or height is -+ 0. <a href="https://bugs.freedesktop.org/show_bug.cgi?id=27643";>Bug -+ #27643</a>. -+ <li>Fix bit allocation for number of color regions for -+ ARB_draw_buffers.</li> -+ <li>Set the correct provoking vertex for clipped first-mode -+ trifans. <a href="https://bugs.freedesktop.org/show_bug.cgi?id=24470";>Bug -+ #24470</a>.</li> -+ <li>Use <code>R16G16B16A16_FLOAT</code> for 3-component half-float.</li> -+ <li>Fix assertion for surface tile offset usage on Ironlake.</li> -+ <li>Fix cube map layouts on Ironlake.</li> -+ <li>When an RB gets a new region, clear the old from the state -+ cache. <a href="https://bugs.freedesktop.org/show_bug.cgi?id=24119";>Bug -+ #24119</a>.</li> -+ <li>Reject shaders with uninlined function calls instead of hanging.</li> -+ </ul> -+</li> -+ -+<li>Assorted i915 driver fixes. Including but not limited to: -+ <ul> -+ <li>Fixed texture LOD clamping in i915 driver. -+ <a href="https://bugs.freedesktop.org/show_bug.cgi?id=24846";>Bug -+ #24846</a>.</li> -+ <li>Fix off-by-one for drawing rectangle. -+ <a href="https://bugs.freedesktop.org/show_bug.cgi?id=27408";>Bug -+ #27408</a>.</li> -+ </ul> -+</li> -+ -+<li>Fixed hangs in etracer on 830 and 845 -+ chipsets. <a href="https://bugs.freedesktop.org/show_bug.cgi?id=26557";>Bug -+ #26557</a>.</li> -+<li>Fixed tiling of small textures on all Intel drivers.</li> -+<li>Fixed crash in Savage driver when using <code>_mesa_CopyTexImage2D</code>. -+ <a href="https://bugs.freedesktop.org/show_bug.cgi?id=27652";>Bug -+ #27652</a>.</li> -+ -+<li>Assorted GLX fixes. Including but not limited to: -+ <ul> -+ <li>Fixed <code>__glXInitializeVisualConfigFromTags</code>'s handling of -+ unrecognized fbconfig tags.</li> -+ <li>Fixed regression with <code>GLX_USE_GL</code>. -+ <li>Fixed config chooser logic for 'mask' matching.</li> -+ <li>Report swap events correctly in direct rendered case (DRI2)</li> -+ <li>Fixed build with dri2proto which doesn't define -+ <code>X_DRI2SwapInterval</code>.</li> -+ <li>Get <code>GLX_SCREEN</code> first in <code>__glXQueryContextInfo</code>. -+ <a href="https://bugs.freedesktop.org/show_bug.cgi?id=14245";>Bug -+ #14245</a>.</li> -+ </ul> -+</li> -+ -+<li>Assorted GLSL fixes. Including but not limited to: -+ <ul> -+ <li>Change variable declared assertion into conditional in GLSL -+ compiler. <a href="https://bugs.freedesktop.org/show_bug.cgi?id=27921";>Bug -+ #27921</a>.</li> -+ <li>Fix instruction indexing -+ bugs. <a href="https://bugs.freedesktop.org/show_bug.cgi?id=27566";>Bug -+ #27566</a>.</li> -+ <li>Updated uniform location / offset encoding to be more like -+ other implementations.</li> -+ <li>Don't overwrite a driver's shader infolog with generic failure -+ message.</li> -+ </ul> -+</li> -+ -+<li>Fixed OSMesa build for 16 and 32-bit color channel depth. -+<li>Fixed OSMesa build with hidden symbol visibility. libOSMesa no longer links to libGL. -+ <a href="https://bugs.freedesktop.org/show_bug.cgi?id=28305";>Bug -+ #28305</a>. -+<li>Fixed handling of multiple render targets in fixed-function -+ texture envrionmnent programs.</li> -+<li>Fixed conversion errors in <code>signed_rgba8888[rev]</code> texel -+ fetch.</li> -+<li>Don't set srcLevel on <code>GL_TEXTURE_RECTANGLE_ARB</code> targets.</li> -+<li>Various build fixes for OpenBSD.</li> -+<li>Various build fixes for OS X.</li> -+<li>Various build fixes for GCC 3.3.</li> - </ul> - - --<h2>Changes</h2> --<p>None.</p> - </body> - </html> -diff --git a/docs/relnotes-7.8.3.html b/docs/relnotes-7.8.3.html -new file mode 100644 -index 0000000..1e9f433 ---- /dev/null -+++ b/docs/relnotes-7.8.3.html -@@ -0,0 +1,89 @@ -+<HTML> -+ -+<TITLE>Mesa Release Notes</TITLE> -+ -+<head><link rel="stylesheet" type="text/css" href="mesa.css"></head> -+ -+<BODY> -+ -+<body bgcolor="#eeeeee"> -+ -+<H1>Mesa 7.8.3 Release Notes / (date tbd)</H1> -+ -+<p> -+Mesa 7.8.3 is a bug fix release which fixes bugs found since the 7.8.2 release. -+</p> -+<p> -+Mesa 7.8.3 implements the OpenGL 2.1 API, but the version reported by -+glGetString(GL_VERSION) depends on the particular driver being used. -+Some drivers don't support all the features required in OpenGL 2.1. -+</p> -+<p> -+See the <a href="install.html">Compiling/Installing page</a> for prerequisites -+for DRI hardware acceleration. -+</p> -+ -+ -+<h2>MD5 checksums</h2> -+<pre> -+x MesaLib-7.8.3.tar.gz -+x MesaLib-7.8.3.tar.bz2 -+x MesaLib-7.8.3.zip -+x MesaDemos-7.8.3.tar.gz -+x MesaDemos-7.8.3.tar.bz2 -+x MesaDemos-7.8.3.zip -+x MesaGLUT-7.8.3.tar.gz -+x MesaGLUT-7.8.3.tar.bz2 -+x MesaGLUT-7.8.3.zip -+</pre> -+ -+ -+<h2>New features</h2> -+<p>None.</p> -+ -+ -+<h2>Changes</h2> -+<ul> -+<li>The radeon driver should use less memory when searching for a valid mip -+image.</li> -+</ul> -+ -+ -+<h2>Bug fixes</h2> -+<ul> -+<li>Fix unsupported FB with D24S8 (bug -+ <a href="https://bugs.freedesktop.org/show_bug.cgi?id=23670";>29116</a>)</li> -+<li>Fix ReadPixels crash when reading depth/stencil from an FBO</li> -+<li>Fixed a bug rendering to 16-bit buffers using swrast.</li> -+<li>Fixed a state tracker/TGSI bug that caused crashes when using Windows' -+ memory debugging features.</li> -+<li>Fixed an issue rendering to 32-bit channels with swrast (bug -+ <a href="https://bugs.freedesktop.org/show_bug.cgi?id=29487";>29487</a>)</li> -+<li>GLSL: fix indirect <TT>gl_TextureMatrix</TT> addressing (bug -+ <a href="https://bugs.freedesktop.org/show_bug.cgi?id=28967";>28967</a>)</li> -+<li>GLSL: fix for bug -+ <a href="https://bugs.freedesktop.org/show_bug.cgi?id=27216";>27216</a></li> -+<li>GLSL: fix zw fragcoord entries in some cases (bug -+ <a href="https://bugs.freedesktop.org/show_bug.cgi?id=29183";>29183</a>)</li> -+<li>Fix texture env generation in some cases (bug -+ <a href="https://bugs.freedesktop.org/show_bug.cgi?id=28169";>28169</a>)</li> -+<li>osmesa: a fix for calling <TT>OSMesaMakeCurrent</TT> twice was applied (bug -+ <a href="https://bugs.freedesktop.org/show_bug.cgi?id=10966";>10966</a></li> -+<li>A bug was fixed which could cause Mesa to ignore the -+ <TT>MESA_EXTENSION_OVERRIDE</TT> environment variable.</li> -+<li>A bug related to specular highlights on backfaces was fixed.</li> -+<li>A radeon-specific issue with <TT>glCopyTex(Sub)Image</TT> was -+ corrected.</li> -+<li>radeon/wine: flush command stream in more cases, fixing wine d3d9 -+ tests.</li> -+<li>r600: fix sin+cos normalization.</li> -+<li>r600: (properly) ignore <TT>GL_COORD_REPLACE</TT> when point sprites are -+ disabled.</li> -+<li>radeon: avoid flushing when the context is not current.</li> -+<li>r300c: a bug affecting unaligned BOs was fixed.</li> -+<li>r300c: a hardlock caused by ARB_half_float_vertex incorrectly advertised on some chipsets.</li> -+</ul> -+ -+ -+</body> -+</html> -diff --git a/docs/relnotes-7.9.html b/docs/relnotes-7.9.html -index b09fb1d..fe1fd5e 100644 ---- a/docs/relnotes-7.9.html -+++ b/docs/relnotes-7.9.html -@@ -28,12 +28,12 @@ for DRI hardware acceleration. - - <h2>MD5 checksums</h2> - <pre> --f1f01a7baec255f13e9468fb4b05922a MesaLib-7.9-rc1.tar.gz --7ffbda3b7056c60b8f87e3082d853af1 MesaLib-7.9-rc1.tar.bz2 --9d4650df4e5b530178d6fde840f76664 MesaLib-7.9-rc1.zip --a81c2e7a0c7832e67c768d6f209f2c8f MesaGLUT-7.9-rc1.tar.gz --b4c1c2f0b47a07be10fa2dd42e6a63d7 MesaGLUT-7.9-rc1.tar.bz2 --c9dd7419a19bcb24a1fe556ec2e78451 MesaGLUT-7.9-rc1.zip -+ed65ab425b25895c7f473d0a5e6e64f8 MesaLib-7.9.tar.gz -+82c740c49d572baa6da2b1a1eee90bca MesaLib-7.9.tar.bz2 -+cd2b6ecec759b0457475e94bbb38fedb MesaLib-7.9.zip -+7b54af9fb9b1f6a1a65db2520f50848f MesaGLUT-7.9.tar.gz -+20d07419d1929f833fdb36bced290ad5 MesaGLUT-7.9.tar.bz2 -+62a7edecd7c92675cd6029b05217eb0a MesaGLUT-7.9.zip - </pre> - - -diff --git a/docs/relnotes.html b/docs/relnotes.html -index 47e7f80..4487af9 100644 ---- a/docs/relnotes.html -+++ b/docs/relnotes.html -@@ -14,6 +14,7 @@ The release notes summarize what's new or changed in each Mesa release. - - <UL> - <LI><A HREF="relnotes-7.9.html">7.9 release notes</A> -+<LI><A HREF="relnotes-7.8.3.html">7.8.3 release notes</A> - <LI><A HREF="relnotes-7.8.2.html">7.8.2 release notes</A> - <LI><A HREF="relnotes-7.8.1.html">7.8.1 release notes</A> - <LI><A HREF="relnotes-7.8.html">7.8 release notes</A> -diff --git a/src/egl/drivers/dri2/egl_dri2.c b/src/egl/drivers/dri2/egl_dri2.c -index 9c4ff56..4a6506c 100644 ---- a/src/egl/drivers/dri2/egl_dri2.c -+++ b/src/egl/drivers/dri2/egl_dri2.c -@@ -741,7 +741,7 @@ dri2_create_screen(_EGLDisplay *disp) - if (dri2_dpy->dri2->base.version >= 2) - api_mask = dri2_dpy->dri2->getAPIMask(dri2_dpy->dri_screen); - else -- api_mask = __DRI_API_OPENGL; -+ api_mask = 1 << __DRI_API_OPENGL; - - disp->ClientAPIsMask = 0; - if (api_mask & (1 <<__DRI_API_OPENGL)) -diff --git a/src/egl/main/eglcontext.c b/src/egl/main/eglcontext.c -index bc22913..763b1b3 100644 ---- a/src/egl/main/eglcontext.c -+++ b/src/egl/main/eglcontext.c -@@ -272,10 +272,6 @@ _eglCheckMakeCurrent(_EGLContext *ctx, _EGLSurface *draw, _EGLSurface *read) - if (!surfaceless && (draw == NULL || read == NULL)) - return _eglError(EGL_BAD_MATCH, "eglMakeCurrent"); - -- /* context stealing from another thread is not allowed */ -- if (ctx->Binding && ctx->Binding != t) -- return _eglError(EGL_BAD_ACCESS, "eglMakeCurrent"); -- - /* - * The spec says - * -@@ -283,16 +279,23 @@ _eglCheckMakeCurrent(_EGLContext *ctx, _EGLSurface *draw, _EGLSurface *read) - * bound to contexts in another thread, an EGL_BAD_ACCESS error is - * generated." - * -- * But it also says -+ * and - * - * "at most one context may be bound to a particular surface at a given - * time" -- * -- * The latter is more restrictive so we can check only the latter case. - */ -- if ((draw && draw->CurrentContext && draw->CurrentContext != ctx) || -- (read && read->CurrentContext && read->CurrentContext != ctx)) -+ if (ctx->Binding && ctx->Binding != t) - return _eglError(EGL_BAD_ACCESS, "eglMakeCurrent"); -+ if (draw && draw->CurrentContext && draw->CurrentContext != ctx) { -+ if (draw->CurrentContext->Binding != t || -+ draw->CurrentContext->ClientAPI != ctx->ClientAPI) -+ return _eglError(EGL_BAD_ACCESS, "eglMakeCurrent"); -+ } -+ if (read && read->CurrentContext && read->CurrentContext != ctx) { -+ if (read->CurrentContext->Binding != t || -+ read->CurrentContext->ClientAPI != ctx->ClientAPI) -+ return _eglError(EGL_BAD_ACCESS, "eglMakeCurrent"); -+ } - - /* simply require the configs to be equal */ - if ((draw && draw->Config != ctx->Config) || -diff --git a/src/egl/main/egldriver.h b/src/egl/main/egldriver.h -index c618feb..950774f 100644 ---- a/src/egl/main/egldriver.h -+++ b/src/egl/main/egldriver.h -@@ -4,7 +4,7 @@ - - #include "egltypedefs.h" - #include "eglapi.h" +diff --git a/src/gallium/auxiliary/draw/draw_pt_vsplit_tmp.h b/src/gallium/auxiliary/draw/draw_pt_vsplit_tmp.h +index 3f66f96..75dba8c 100644 +--- a/src/gallium/auxiliary/draw/draw_pt_vsplit_tmp.h ++++ b/src/gallium/auxiliary/draw/draw_pt_vsplit_tmp.h +@@ -258,9 +258,10 @@ vsplit_segment_fan_linear(struct vsplit_frontend *vsplit, unsigned flags, + boolean use_spoken = ((flags & DRAW_SPLIT_BEFORE) != 0); + unsigned nr = 0, i; + +- assert(icount + !!use_spoken <= vsplit->segment_size); ++ assert(icount <= vsplit->segment_size); + + if (use_spoken) { ++ /* replace istart by i0 */ + vsplit->fetch_elts[nr++] = i0; + for (i = 1 ; i < icount; i++) + vsplit->fetch_elts[nr++] = istart + i; +diff --git a/src/mesa/drivers/dri/r600/r700_assembler.c b/src/mesa/drivers/dri/r600/r700_assembler.c +index bee9c3b..024853c 100644 +--- a/src/mesa/drivers/dri/r600/r700_assembler.c ++++ b/src/mesa/drivers/dri/r600/r700_assembler.c +@@ -481,6 +481,8 @@ unsigned int EG_GetNumOperands(GLuint opcode, GLuint nIsOp3) + case EG_OP2_INST_FLT_TO_INT: + case EG_OP2_INST_SIN: + case EG_OP2_INST_COS: ++ case EG_OP2_INST_FLT_TO_INT_FLOOR: ++ case EG_OP2_INST_MOVA_INT: + return 1; + + default: radeon_error( +@@ -3297,23 +3299,76 @@ GLboolean assemble_ARL(r700_AssemblerBase *pAsm) + return GL_FALSE; + } + +- pAsm->D.dst.opcode = SQ_OP2_INST_MOVA_FLOOR; +- setaddrmode_PVSDST(&(pAsm->D.dst), ADDR_ABSOLUTE); +- pAsm->D.dst.rtype = DST_REG_TEMPORARY; +- pAsm->D.dst.reg = 0; +- pAsm->D.dst.writex = 0; +- pAsm->D.dst.writey = 0; +- pAsm->D.dst.writez = 0; +- pAsm->D.dst.writew = 0; - -+#include <stddef.h> - - /** - * Define an inline driver typecast function. -diff --git a/src/gallium/drivers/llvmpipe/lp_bld_depth.c b/src/gallium/drivers/llvmpipe/lp_bld_depth.c -index 99a768a..749ae66 100644 ---- a/src/gallium/drivers/llvmpipe/lp_bld_depth.c -+++ b/src/gallium/drivers/llvmpipe/lp_bld_depth.c -@@ -262,7 +262,7 @@ lp_build_stencil_op_single(struct lp_build_context *bld, - LLVMValueRef writemask = lp_build_const_int_vec(type, stencil->writemask); - mask = LLVMBuildAnd(bld->builder, mask, writemask, ""); - /* res = (res & mask) | (stencilVals & ~mask) */ -- res = lp_build_select_bitwise(bld, writemask, res, stencilVals); -+ res = lp_build_select_bitwise(bld, mask, res, stencilVals); - } - else { - /* res = mask ? res : stencilVals */ -diff --git a/src/gallium/drivers/r300/r300_chipset.c b/src/gallium/drivers/r300/r300_chipset.c -index 48c2409..583e981 100644 ---- a/src/gallium/drivers/r300/r300_chipset.c -+++ b/src/gallium/drivers/r300/r300_chipset.c -@@ -424,4 +424,5 @@ void r300_parse_chipset(struct r300_capabilities* caps) - } - - caps->is_rv350 = caps->family >= CHIP_FAMILY_RV350; -+ caps->dxtc_swizzle = caps->is_r400 || caps->is_r500; - } -diff --git a/src/gallium/drivers/r300/r300_chipset.h b/src/gallium/drivers/r300/r300_chipset.h -index e7ca642..7ea4175 100644 ---- a/src/gallium/drivers/r300/r300_chipset.h -+++ b/src/gallium/drivers/r300/r300_chipset.h -@@ -79,6 +79,8 @@ struct r300_capabilities { - boolean is_r500; - /* Whether or not the second pixel pipe is accessed with the high bit */ - boolean high_second_pipe; -+ /* DXTC texture swizzling. */ -+ boolean dxtc_swizzle; - }; - - /* Enumerations for legibility and telling which card we're running on. */ -diff --git a/src/gallium/drivers/r300/r300_context.c b/src/gallium/drivers/r300/r300_context.c -index 624dadd..46504f5 100644 ---- a/src/gallium/drivers/r300/r300_context.c -+++ b/src/gallium/drivers/r300/r300_context.c -@@ -79,6 +79,9 @@ static void r300_release_referenced_objects(struct r300_context *r300) - NULL); - } - -+ /* The dummy VBO. */ -+ pipe_resource_reference(&r300->dummy_vb, NULL); -+ - /* The SWTCL VBO. */ - pipe_resource_reference(&r300->vbo, NULL); - -@@ -488,6 +491,7 @@ struct pipe_context* r300_create_context(struct pipe_screen* screen, - rtempl.target = PIPE_TEXTURE_2D; - rtempl.format = PIPE_FORMAT_I8_UNORM; - rtempl.bind = PIPE_BIND_SAMPLER_VIEW; -+ rtempl.usage = PIPE_USAGE_IMMUTABLE; - rtempl.width0 = 1; - rtempl.height0 = 1; - rtempl.depth0 = 1; -@@ -501,6 +505,19 @@ struct pipe_context* r300_create_context(struct pipe_screen* screen, - pipe_resource_reference(&tex, NULL); - } - -+ { -+ struct pipe_resource vb = {}; -+ vb.target = PIPE_BUFFER; -+ vb.format = PIPE_FORMAT_R8_UNORM; -+ vb.bind = PIPE_BIND_VERTEX_BUFFER; -+ vb.usage = PIPE_USAGE_IMMUTABLE; -+ vb.width0 = sizeof(float) * 16; -+ vb.height0 = 1; -+ vb.depth0 = 1; -+ -+ r300->dummy_vb = screen->resource_create(screen, &vb); -+ } -+ - return &r300->context; - - fail: -diff --git a/src/gallium/drivers/r300/r300_context.h b/src/gallium/drivers/r300/r300_context.h -index 8f4e2de..743e9da 100644 ---- a/src/gallium/drivers/r300/r300_context.h -+++ b/src/gallium/drivers/r300/r300_context.h -@@ -470,6 +470,10 @@ struct r300_context { - * dummy texture there. */ - struct r300_sampler_view *texkill_sampler; - -+ /* When no vertex buffer is set, this one is used instead to prevent -+ * hardlocks. */ -+ struct pipe_resource *dummy_vb; -+ - /* The currently active query. */ - struct r300_query *query_current; - /* The saved query for blitter operations. */ -diff --git a/src/gallium/drivers/r300/r300_reg.h b/src/gallium/drivers/r300/r300_reg.h -index 6bea783..788c513 100644 ---- a/src/gallium/drivers/r300/r300_reg.h -+++ b/src/gallium/drivers/r300/r300_reg.h -@@ -1520,11 +1520,11 @@ USE OR OTHER DEALINGS IN THE SOFTWARE. - # define R300_TX_TRI_PERF_3_8 (3<<15) - # define R300_ANISO_THRESHOLD_MASK (7<<17) - -+# define R400_DXTC_SWIZZLE_ENABLE (1<<21) - # define R500_MACRO_SWITCH (1<<22) - # define R500_TX_MAX_ANISO(x) ((x) << 23) - # define R500_TX_MAX_ANISO_MASK (63 << 23) - # define R500_TX_ANISO_HIGH_QUALITY (1 << 30) -- - # define R500_BORDER_FIX (1<<31) - - #define R300_TX_FORMAT0_0 0x4480 -diff --git a/src/gallium/drivers/r300/r300_render.c b/src/gallium/drivers/r300/r300_render.c -index 2f00c87..7a3eb09 100644 ---- a/src/gallium/drivers/r300/r300_render.c -+++ b/src/gallium/drivers/r300/r300_render.c -@@ -676,9 +676,6 @@ static void r300_draw_vbo(struct pipe_context* pipe, - { - struct r300_context* r300 = r300_context(pipe); - -- if (!r300->velems->count || !r300->vertex_buffer_count) -- return; -- - if (info->indexed && r300->index_buffer.buffer) { - unsigned offset; - -diff --git a/src/gallium/drivers/r300/r300_screen.c b/src/gallium/drivers/r300/r300_screen.c -index 7f41ff0..c349e7f 100644 ---- a/src/gallium/drivers/r300/r300_screen.c <<Diff was trimmed, longer than 597 lines>> ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/Mesa/Mesa-git.patch?r1=1.13&r2=1.14&f=u http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/Mesa/Mesa.spec?r1=1.264&r2=1.265&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
