X Strike Force X.Org X11 SVN commit: r1324 - in branches/modular/driver/xf86-video-tdfx-X11R7.0-1.1.1.3/debian: . patches
Author: dnusinow
Date: 2006-02-26 18:00:21 -0500 (Sun, 26 Feb 2006)
New Revision: 1324
Added:
branches/modular/driver/xf86-video-tdfx-X11R7.0-1.1.1.3/debian/patches/
branches/modular/driver/xf86-video-tdfx-X11R7.0-1.1.1.3/debian/patches/01_tdfx_disable_dri_on_16mb_with_highres.diff
branches/modular/driver/xf86-video-tdfx-X11R7.0-1.1.1.3/debian/patches/series
Modified:
branches/modular/driver/xf86-video-tdfx-X11R7.0-1.1.1.3/debian/changelog
branches/modular/driver/xf86-video-tdfx-X11R7.0-1.1.1.3/debian/rules
Log:
* Port patches from trunk
+ general/035_tdfx_disable_dri_on_16mb_with_highres.diff
Modified: branches/modular/driver/xf86-video-tdfx-X11R7.0-1.1.1.3/debian/changelog
===================================================================
--- branches/modular/driver/xf86-video-tdfx-X11R7.0-1.1.1.3/debian/changelog 2006-02-26 22:56:52 UTC (rev 1323)
+++ branches/modular/driver/xf86-video-tdfx-X11R7.0-1.1.1.3/debian/changelog 2006-02-26 23:00:21 UTC (rev 1324)
@@ -1,3 +1,10 @@
+xserver-xorg-video-tdfx (1:1.1.1.3-2) experimental; urgency=low
+
+ * Port patches from trunk
+ + general/035_tdfx_disable_dri_on_16mb_with_highres.diff
+
+ -- David Nusinow <dnusinow@debian.org> Sun, 26 Feb 2006 17:59:47 -0500
+
xserver-xorg-video-tdfx (1:1.1.1.3-1) experimental; urgency=low
* First upload to Debian
Added: branches/modular/driver/xf86-video-tdfx-X11R7.0-1.1.1.3/debian/patches/01_tdfx_disable_dri_on_16mb_with_highres.diff
===================================================================
--- branches/modular/driver/xf86-video-tdfx-X11R7.0-1.1.1.3/debian/patches/01_tdfx_disable_dri_on_16mb_with_highres.diff 2006-02-26 22:56:52 UTC (rev 1323)
+++ branches/modular/driver/xf86-video-tdfx-X11R7.0-1.1.1.3/debian/patches/01_tdfx_disable_dri_on_16mb_with_highres.diff 2006-02-26 23:00:21 UTC (rev 1324)
@@ -0,0 +1,27 @@
+Index: xf86-video-tdfx-X11R7.0-1.1.1.3/src/tdfx_dri.c
+===================================================================
+--- xf86-video-tdfx-X11R7.0-1.1.1.3.orig/src/tdfx_dri.c 2006-01-12 22:55:59.000000000 -0500
++++ xf86-video-tdfx-X11R7.0-1.1.1.3/src/tdfx_dri.c 2006-02-26 17:59:27.000000000 -0500
+@@ -298,6 +298,22 @@
+ return FALSE;
+ }
+
++ /* Disable DRI if using a 16Mb card with virtual resolution higher than
++ * 1024x768 because DRI does not have enough memory available for textures
++ * at higher resolutions, and will not operate correctly.
++ */
++ xf86DrvMsg(pScreen->myNum, X_INFO, "[dri] VideoRAM = %d, VirtualXres = %d, VirtualYres= %d,\n",
++ pScrn->videoRam, pScrn->virtualX, pScrn->virtualY);
++
++ if ( (pTDFX->ChipType == PCI_CHIP_VOODOO3) || (pTDFX->ChipType == PCI_CHIP_BANSHEE) ) {
++ if (pScrn->videoRam <= 16384 && ((pScrn->virtualX * pScrn->virtualY) > (1024 * 768)) ) {
++ xf86DrvMsg(pScreen->myNum, X_WARNING,
++ "[dri] To use DRI, with a 16Mb Voodoo 3 or Banshee card, you must\n"
++ "\tinvoke the server using a maximum resolution of 1024x768 or lower.\n");
++ return FALSE;
++ }
++ }
++
+ /* Check that the GLX, DRI, and DRM modules have been loaded by testing
+ for canonical symbols in each module. */
+ if (!xf86LoaderCheckSymbol("GlxSetVisualConfigs")) return FALSE;
Added: branches/modular/driver/xf86-video-tdfx-X11R7.0-1.1.1.3/debian/patches/series
===================================================================
--- branches/modular/driver/xf86-video-tdfx-X11R7.0-1.1.1.3/debian/patches/series 2006-02-26 22:56:52 UTC (rev 1323)
+++ branches/modular/driver/xf86-video-tdfx-X11R7.0-1.1.1.3/debian/patches/series 2006-02-26 23:00:21 UTC (rev 1324)
@@ -0,0 +1 @@
+01_tdfx_disable_dri_on_16mb_with_highres.diff
Modified: branches/modular/driver/xf86-video-tdfx-X11R7.0-1.1.1.3/debian/rules
===================================================================
--- branches/modular/driver/xf86-video-tdfx-X11R7.0-1.1.1.3/debian/rules 2006-02-26 22:56:52 UTC (rev 1323)
+++ branches/modular/driver/xf86-video-tdfx-X11R7.0-1.1.1.3/debian/rules 2006-02-26 23:00:21 UTC (rev 1324)
@@ -31,7 +31,7 @@
# kbd_drv.a isn't phenomenally useful; kbd_drv.so more so
confflags += --disable-static
-build: build-stamp
+build: patch build-stamp
build-stamp:
dh_testdir
@@ -44,7 +44,7 @@
touch build-stamp
-clean:
+clean: xsfclean
dh_testdir
dh_testroot
rm -f build-stamp
Reply to: