rpms/mesa/devel mesa-fixes.patch,NONE,1.1 mesa.spec,1.187,1.188

[Dave Airlie (airlied)]

Author: airlied

Update of /cvs/pkgs/rpms/mesa/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30724

Modified Files:
	mesa.spec 
Added Files:
	mesa-fixes.patch 
Log Message:
* Thu Aug 14 2008 Dave Airlie <airlied at redhat.com> 7.1-0.38
- 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:

--- NEW FILE mesa-fixes.patch ---
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);
 }


Index: mesa.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mesa/devel/mesa.spec,v
retrieving revision 1.187
retrieving revision 1.188
diff -u -r1.187 -r1.188
--- mesa.spec	14 Aug 2008 06:35:21 -0000	1.187
+++ mesa.spec	14 Aug 2008 12:03:22 -0000	1.188
@@ -28,6 +28,7 @@
 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 @@
 #%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 @@
 - 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 at redhat.com> 7.1-0.37
 - Drop mesa-source subpackage.  Man that feels good.