- Update full mesa stack to pre-7.10 (git 32218e4).

Fixes most of intel SandyBridge rendering issues.
- Set Mesa version to 7.9.801
- obsoletes commit-d316391.diff
- adjusted 0001-Fix-crash-in-swrast-when-setting-a-texture-for-a-pix.patch

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

0001-Fix-crash-in-swrast-when-setting-a-texture-for-a-pix.patch

@@ -11,11 +11,9 @@ To initialize texImage->Data we call ctx->Driver.TexImage2D().
  Mesa-7.9/src/mesa/drivers/dri/swrast/swrast.c |    5 +++++
  1 files changed, 5 insertions(+), 0 deletions(-)
 
-diff --git a/Mesa-7.9/src/mesa/drivers/dri/swrast/swrast.c b/Mesa-7.9/src/mesa/drivers/dri/swrast/swrast.c
-index ff53ffd..233f225 100644
---- a/Mesa-7.9/src/mesa/drivers/dri/swrast/swrast.c
-+++ b/Mesa-7.9/src/mesa/drivers/dri/swrast/swrast.c
-@@ -62,6 +62,7 @@
+--- Mesa-7.9.801-32218e4/src/mesa/drivers/dri/swrast/swrast.c.orig	2010-12-16 15:53:09.000000000 +0100
++++ Mesa-7.9.801-32218e4/src/mesa/drivers/dri/swrast/swrast.c	2010-12-20 15:48:03.000000000 +0100
+@@ -61,6 +61,7 @@
  static void swrastSetTexBuffer2(__DRIcontext *pDRICtx, GLint target,
  				GLint texture_format, __DRIdrawable *dPriv)
  {
@@ -23,17 +21,14 @@ index ff53ffd..233f225 100644
      struct dri_context *dri_ctx;
      int x, y, w, h;
      __DRIscreen *sPriv = dPriv->driScreenPriv;
-@@ -92,6 +93,10 @@ static void swrastSetTexBuffer2(__DRIcontext *pDRICtx, GLint target,
- 
-     _mesa_set_fetch_functions(texImage, 2);
+@@ -90,6 +91,10 @@ static void swrastSetTexBuffer2(__DRIcon
+     _mesa_init_teximage_fields(&dri_ctx->Base, target, texImage,
+ 			       w, h, 1, 0, internalFormat, texFormat);
  
 +    ctx->Driver.TexImage2D(ctx, target, 0, internalFormat,
-+			       w, h, 0, texture_format, GL_UNSIGNED_INT_8_8_8_8,
-+			       NULL, &ctx->Unpack, texObj, texImage);
++			   w, h, 0, texture_format, GL_UNSIGNED_INT_8_8_8_8,
++			   NULL, &ctx->Unpack, texObj, texImage);
 +
      sPriv->swrast_loader->getImage(dPriv, x, y, w, h, (char *)texImage->Data,
  				   dPriv->loaderPrivate);
  
--- 
-1.7.3.1
-

Mesa.changes

@@ -1,3 +1,12 @@
+-------------------------------------------------------------------
+Mon Dec 20 14:34:44 UTC 2010 - sndirsch@novell.com
+
+- Update full mesa stack to pre-7.10 (git 32218e4).
+  Fixes most of intel SandyBridge rendering issues.
+- Set Mesa version to 7.9.801
+- obsoletes commit-d316391.diff
+- adjusted 0001-Fix-crash-in-swrast-when-setting-a-texture-for-a-pix.patch
+
 -------------------------------------------------------------------
 Sat Nov  6 08:36:11 UTC 2010 - sndirsch@novell.com
 

Mesa.spec

@@ -19,10 +19,10 @@
 
 %define enable_nouveau 1
 
-%define _version 7.9
+%define _version 7.9.801-32218e4
 
-Version:        7.9
-Release:        6
+Version:        7.9.801
+Release:        0
 
 Name:           Mesa
 BuildRequires:  gcc-c++ libdrm-devel libexpat-devel pkgconfig python-base xorg-x11-devel
@@ -56,7 +56,6 @@ Patch8:         egl-buildfix.diff
 Patch9:         Mesa_indirect_old_xserver_compatibility.diff
 Patch11:        0001-Fix-crash-in-swrast-when-setting-a-texture-for-a-pix.patch
 # already upstream
-Patch10:        commit-d316391.diff
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 %description
@@ -148,8 +147,7 @@ sed -i 's/REPLACE/%_lib/g' src/glx/Makefile
 sed -i 's/REPLACE/%_lib/g' src/egl/drivers/dri2/Makefile
 %patch8
 %patch9 -p0
-%patch10 -p1
-%patch11 -p2
+%patch11 -p1
 
 %build
 

MesaLib-7.9.801-32218e4.tar.bz2

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

MesaLib-7.9.tar.bz2

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

commit-d316391.diff

@@ -1,23 +0,0 @@
-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) <<