rpms/xorg-x11-drv-i810/F-10 intel-2.5.0-no-gem-legacy3d.patch, NONE, 1.1 xorg-x11-drv-i810.spec, 1.116, 1.117

[Dave Airlie]

Author: airlied

Update of /cvs/pkgs/rpms/xorg-x11-drv-i810/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29990

Modified Files:
	xorg-x11-drv-i810.spec 
Added Files:
	intel-2.5.0-no-gem-legacy3d.patch 
Log Message:
* Tue Dec 02 2008 Dave Airlie <airlied at redhat.com> 2.5.0-4
- intel-2.5.0-no-gem-legacy3d.patch - enable textures when no GEM


intel-2.5.0-no-gem-legacy3d.patch:

--- NEW FILE intel-2.5.0-no-gem-legacy3d.patch ---
diff -up xf86-video-intel-2.5.0/src/i830_memory.c.dave xf86-video-intel-2.5.0/src/i830_memory.c
--- xf86-video-intel-2.5.0/src/i830_memory.c.dave	2008-12-02 23:36:44.000000000 +1000
+++ xf86-video-intel-2.5.0/src/i830_memory.c	2008-12-02 23:37:29.000000000 +1000
@@ -521,6 +521,8 @@ i830_allocator_init(ScrnInfoPtr pScrn, u
 	    i830_free_memory(pScrn, pI830->memory_manager);
 	    pI830->memory_manager = NULL;
 	}
+    } else {
+	pI830->allocate_classic_textures = TRUE;
     }
 #endif /* XF86DRI */
 


Index: xorg-x11-drv-i810.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-i810/F-10/xorg-x11-drv-i810.spec,v
retrieving revision 1.116
retrieving revision 1.117
diff -u -r1.116 -r1.117
--- xorg-x11-drv-i810.spec	10 Nov 2008 18:47:18 -0000	1.116
+++ xorg-x11-drv-i810.spec	2 Dec 2008 05:40:21 -0000	1.117
@@ -6,7 +6,7 @@
 Summary:   Xorg X11 Intel video driver(s)
 Name:      xorg-x11-drv-i810
 Version:   2.5.0
-Release:   3%{?dist}
+Release:   4%{?dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X Hardware Support
@@ -24,6 +24,7 @@
 #Patch4: intel-fix-flip.patch
 Patch5: intel-2.5.0-no-legacy-3d.patch
 Patch6: intel-2.4.2-dell-quirk.patch
+Patch7: intel-2.5.0-no-gem-legacy3d.patch
 
 ExclusiveArch: %{ix86} x86_64 ia64
 
@@ -56,6 +57,7 @@
 %patch3 -p1 -b .xvfix
 %patch5 -p1 -b .nolegacy3d
 %patch6 -p1 -b .dell
+%patch7 -p1 -b .nogem
 
 %build
 
@@ -98,6 +100,9 @@
 %{_libdir}/libIntelXvMC.so
 
 %changelog
+* Tue Dec 02 2008 Dave Airlie <airlied at redhat.com> 2.5.0-4
+- intel-2.5.0-no-gem-legacy3d.patch - enable textures when no GEM
+
 * Mon Nov 10 2008 Adam Jackson <ajax at redhat.com> 2.5.0-3
 - intel-2.4.2-dell-quirk.patch: No LVDS on Dell Studio Hybrid.