From 65f49134aa53133afdc160f05d092eecfbd46aee Mon Sep 17 00:00:00 2001
From: Dave Airlie <airlied@fedoraproject.org>
Date: Thu, 14 Aug 2008 12:03:22 +0000
Subject: [PATCH] - latest Mesa snapshot - re-enable tex offset - add r300
 command buffer support on top of snapshot - disable osmesa version patch --
 (ajax???) - fix mesa build on intel driver

---
 mesa-fixes.patch | 48 ++++++++++++++++++++++++++++++++++++++++++++++++
 mesa.spec        |  3 +++
 2 files changed, 51 insertions(+)
 create mode 100644 mesa-fixes.patch

diff --git a/mesa-fixes.patch b/mesa-fixes.patch
new file mode 100644
index 0000000..2abf8e5
--- /dev/null
+++ b/mesa-fixes.patch
@@ -0,0 +1,48 @@
+diff --git a/src/mesa/drivers/dri/intel/intel_regions.c b/src/mesa/drivers/dri/intel/intel_regions.c
+index 91b835d..ddfdce3 100644
+--- a/src/mesa/drivers/dri/intel/intel_regions.c
++++ b/src/mesa/drivers/dri/intel/intel_regions.c
+@@ -455,8 +455,7 @@ static struct intel_region *
+ intel_recreate_static(struct intel_context *intel,
+ 		      const char *name,
+ 		      struct intel_region *region,
+-		      intelRegion *region_desc,
+-		      GLuint mem_type)
++		      intelRegion *region_desc)
+ {
+    intelScreenPrivate *intelScreen = intel->intelScreen;
+    int ret;
+@@ -537,22 +536,19 @@ intel_recreate_static_regions(struct intel_context *intel)
+    intel->front_region =
+       intel_recreate_static(intel, "front",
+ 			    intel->front_region,
+-			    &intelScreen->front,
+-			    DRM_BO_FLAG_MEM_TT);
++			    &intelScreen->front);
+ 
+    intel->back_region =
+       intel_recreate_static(intel, "back",
+ 			    intel->back_region,
+-			    &intelScreen->back,
+-			    DRM_BO_FLAG_MEM_TT);
++			    &intelScreen->back);
+ 
+ #ifdef I915
+    if (intelScreen->third.handle) {
+       intel->third_region =
+ 	 intel_recreate_static(intel, "third",
+ 			       intel->third_region,
+-			       &intelScreen->third,
+-			       DRM_BO_FLAG_MEM_TT);
++			       &intelScreen->third);
+    }
+ #endif /* I915 */
+ 
+@@ -562,6 +558,5 @@ intel_recreate_static_regions(struct intel_context *intel)
+    intel->depth_region =
+       intel_recreate_static(intel, "depth",
+ 			    intel->depth_region,
+-			    &intelScreen->depth,
+-			    DRM_BO_FLAG_MEM_TT);
++			    &intelScreen->depth);
+ }
diff --git a/mesa.spec b/mesa.spec
index 48c9148..fea6fda 100644
--- a/mesa.spec
+++ b/mesa.spec
@@ -28,6 +28,7 @@ Source2: %{manpages}.tar.bz2
 Source3: make-git-snapshot.sh
 
 Patch0: mesa-7.1pre-osmesa-version.patch
+Patch1: mesa-fixes.patch
 Patch2: mesa-7.1pre-nukeglthread-debug.patch
 
 Patch5: r300-cmdbuf.patch
@@ -161,6 +162,7 @@ This package provides some demo applications for testing Mesa.
 #%setup -q -n Mesa-%{version}pre -b1 -b2
 %setup -q -n mesa-%{gitdate} -b2
 #patch0 -p1 -b .osmesa
+%patch1 -p1 -b .fixes
 %patch2 -p1 -b .intel-glthread
 %patch5 -p1 -b .r300cmdbuf
 %patch7 -p1 -b .dricore
@@ -402,6 +404,7 @@ rm -rf $RPM_BUILD_ROOT
 - latest Mesa snapshot - re-enable tex offset
 - add r300 command buffer support on top of snapshot
 - disable osmesa version patch -- (ajax???)
+- fix mesa build on intel driver
 
 * Fri Jun 27 2008 Adam Jackson <ajax@redhat.com> 7.1-0.37
 - Drop mesa-source subpackage.  Man that feels good.