Updating link to change in openSUSE:Factory/Mesa revision 99.0

OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/Mesa?expand=0&rev=ec253640be150c935d32fe3121c4f90f

Mesa.changes

@@ -1,3 +1,16 @@
+-------------------------------------------------------------------
+Thu Oct  7 07:35:31 UTC 2010 - sndirsch@novell.com
+
+- commit-d316391.diff
+  * i965: Fix gen6 pointsize handling to match pre-gen6. Fixes
+    point-line-no-cull (bfo #30532)
+
+-------------------------------------------------------------------
+Tue Oct  5 06:57:26 UTC 2010 - sndirsch@novell.com
+
+- MesaLib 7.9 
+- obsoletes commit-73dab75.diff
+
 -------------------------------------------------------------------
 Thu Sep 30 09:49:13 UTC 2010 - sndirsch@novell.com
 

Mesa.spec

@@ -22,7 +22,7 @@
 %define _version 7.9
 
 Version:        7.9
-Release:        2
+Release:        3
 
 Name:           Mesa
 BuildRequires:  gcc-c++ libdrm-devel libexpat-devel pkgconfig python-base xorg-x11-devel
@@ -43,7 +43,7 @@ Provides:       XFree86-Mesa-64bit = %{version} Mesa-64bit < %{version}
 %endif
 #
 Summary:        System for rendering interactive 3-D graphics
-Source:         MesaLib-%{_version}-rc2.tar.bz2
+Source:         MesaLib-%{_version}.tar.bz2
 Source1:        MesaDemos-7.8.2.tar.bz2
 Source2:        baselibs.conf
 Source3:        README.updates
@@ -55,7 +55,7 @@ Patch1:         dri_driver_dir.diff
 Patch8:         egl-buildfix.diff
 Patch9:         Mesa_indirect_old_xserver_compatibility.diff
 # already upstream
-Patch10:        commit-73dab75.diff
+Patch10:        commit-d316391.diff
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 %description
@@ -135,7 +135,7 @@ Authors:
     Francisco Jerez
 
 %prep
-%setup -n %{name}-%{_version}-rc2 -a1 -b4 -q
+%setup -n %{name}-%{_version} -a1 -b4 -q
 # no need to build (GLUT-)Demos
 rm -rf src/glut progs/{demos,redbook,samples,xdemos,glsl}
 # we use freeglut

MesaLib-7.9-rc2.tar.bz2

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:21dd2333571e0843cc3f306d3e1448e6ef147ae03faa8b7245192720d5b7843f
-size 5676582

MesaLib-7.9.tar.bz2

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:e0cd67f4516d809e18fbc85dc721e84217d524d77d815b59e0c7c2d7ea1129f3
+size 5678494

commit-73dab75.diff

@@ -1,26 +0,0 @@
-commit 73dab75b4165f7d2214a68d4ba8e3cb7aab9b4ac
-Author: Zhenyu Wang <zhenyuw@linux.intel.com>
-Date:   Sun Sep 26 13:15:39 2010 +0800
-
-    i965: fallback lineloop on sandybridge for now
-    
-    Until we fixed GS hang issue.
-
-diff --git a/src/mesa/drivers/dri/i965/brw_draw.c b/src/mesa/drivers/dri/i965/brw_draw.c
-index 16331cc..6a4dda2 100644
---- a/src/mesa/drivers/dri/i965/brw_draw.c
-+++ b/src/mesa/drivers/dri/i965/brw_draw.c
-@@ -204,6 +204,13 @@ static GLboolean check_fallbacks( struct brw_context *brw,
-    GLcontext *ctx = &brw->intel.ctx;
-    GLuint i;
- 
-+   /* XXX FIXME */
-+   if (brw->intel.gen >= 6) {
-+       for (i = 0; i < nr_prims; i++)
-+	   if (prim[i].mode == GL_LINE_LOOP)
-+	       return GL_TRUE;
-+   }
-+
-    /* If we don't require strict OpenGL conformance, never 
-     * use fallbacks.  If we're forcing fallbacks, always
-     * use fallfacks.

commit-d316391.diff

@@ -0,0 +1,23 @@
+commit d3163912c1f15fcb44beb33c5069799d56e1dc16
+Author: Eric Anholt <eric@anholt.net>
+Date:   Wed Oct 6 17:29:29 2010 -0700
+
+    i965: Fix gen6 pointsize handling to match pre-gen6.
+    
+    Fixes point-line-no-cull.
+    Bug #30532
+
+diff --git a/src/mesa/drivers/dri/i965/gen6_sf_state.c b/src/mesa/drivers/dri/i965/gen6_sf_state.c
+index 6c88338..b2a6bd0 100644
+--- a/src/mesa/drivers/dri/i965/gen6_sf_state.c
++++ b/src/mesa/drivers/dri/i965/gen6_sf_state.c
+@@ -125,7 +125,8 @@ upload_sf_state(struct brw_context *brw)
+    }
+ 
+    /* _NEW_POINT */
+-   if (ctx->Point._Attenuated)
++   if (!(ctx->VertexProgram.PointSizeEnabled ||
++	 ctx->Point._Attenuated))
+       dw4 |= GEN6_SF_USE_STATE_POINT_WIDTH;
+ 
+    dw4 |= U_FIXED(CLAMP(ctx->Point.Size, 0.125, 225.875), 3) <<