[PC-BSD Commits] r470 - in pcbsd/trunk/system-overlay/PCBSD/xorg-gui: settings templates/driver templates/header

svn at pcbsd.org svn at pcbsd.org
Thu Jul 12 22:09:40 PDT 2007


Author: kris
Date: 2007-07-13 06:09:40 +0100 (Fri, 13 Jul 2007)
New Revision: 470

Added:
   pcbsd/trunk/system-overlay/PCBSD/xorg-gui/templates/driver/ati-3d-enable.template
   pcbsd/trunk/system-overlay/PCBSD/xorg-gui/templates/driver/intel-3d-enable.template
   pcbsd/trunk/system-overlay/PCBSD/xorg-gui/templates/header/ati-3d-enable.xorg.conf
   pcbsd/trunk/system-overlay/PCBSD/xorg-gui/templates/header/intel-3d-enable.xorg.conf
Modified:
   pcbsd/trunk/system-overlay/PCBSD/xorg-gui/settings/alias.txt
   pcbsd/trunk/system-overlay/PCBSD/xorg-gui/settings/drivers.txt
   pcbsd/trunk/system-overlay/PCBSD/xorg-gui/templates/driver/intel.template
   pcbsd/trunk/system-overlay/PCBSD/xorg-gui/templates/header/intel.xorg.conf
   pcbsd/trunk/system-overlay/PCBSD/xorg-gui/templates/header/xorg.conf.generic
Log:

Added new templates for 3d enabled support for intel / ati cards, this will
allow users to pick 3d-accelerated support or not for their desktop. 



Modified: pcbsd/trunk/system-overlay/PCBSD/xorg-gui/settings/alias.txt
===================================================================
--- pcbsd/trunk/system-overlay/PCBSD/xorg-gui/settings/alias.txt	2007-07-13 04:40:17 UTC (rev 469)
+++ pcbsd/trunk/system-overlay/PCBSD/xorg-gui/settings/alias.txt	2007-07-13 05:09:40 UTC (rev 470)
@@ -1,6 +1,7 @@
 apmi:apm
 ark:ark
 ati:ati
+ati-3d-enable:ati-3d-enable
 chips:chips
 cirrus:cirrus
 cyrix:cyrix
@@ -8,6 +9,7 @@
 i128:i128
 i740:i740
 intel:intel
+intel-3d-enable:intel-3d-enable
 imstt:imstt
 mga:mga
 neomagic:neomagic

Modified: pcbsd/trunk/system-overlay/PCBSD/xorg-gui/settings/drivers.txt
===================================================================
--- pcbsd/trunk/system-overlay/PCBSD/xorg-gui/settings/drivers.txt	2007-07-13 04:40:17 UTC (rev 469)
+++ pcbsd/trunk/system-overlay/PCBSD/xorg-gui/settings/drivers.txt	2007-07-13 05:09:40 UTC (rev 470)
@@ -1,6 +1,7 @@
 apm
 ark
 ati
+ati-3d-enable
 chips
 cirrus
 cyrix
@@ -8,6 +9,7 @@
 i128
 i740
 intel
+intel-3d-enable
 imstt
 mga
 neomagic

Added: pcbsd/trunk/system-overlay/PCBSD/xorg-gui/templates/driver/ati-3d-enable.template

Added: pcbsd/trunk/system-overlay/PCBSD/xorg-gui/templates/driver/intel-3d-enable.template

Modified: pcbsd/trunk/system-overlay/PCBSD/xorg-gui/templates/driver/intel.template
===================================================================
--- pcbsd/trunk/system-overlay/PCBSD/xorg-gui/templates/driver/intel.template	2007-07-13 04:40:17 UTC (rev 469)
+++ pcbsd/trunk/system-overlay/PCBSD/xorg-gui/templates/driver/intel.template	2007-07-13 05:09:40 UTC (rev 470)
@@ -16,11 +16,6 @@
         #Option     "FPScale"            	# [<bool>]
         #Option     "FPTweak"            	# <i>
     Identifier     "Card0"
-    Option         "AllowGLXWithComposite" "True"
-    Option         "RenderAccel" "True"
-    Option         "AddARGBGLXVisuals" "True"
-    Option         "XAANoOffscreenPixmaps" "True"
-    Option	   "DRI" "True"
-    Driver         "i810"
-    VendorName     "i810 Video Driver"
+    Driver         "intel"
+    VendorName     "Intel Video Driver"
 EndSection

Added: pcbsd/trunk/system-overlay/PCBSD/xorg-gui/templates/header/ati-3d-enable.xorg.conf

Added: pcbsd/trunk/system-overlay/PCBSD/xorg-gui/templates/header/intel-3d-enable.xorg.conf

Modified: pcbsd/trunk/system-overlay/PCBSD/xorg-gui/templates/header/intel.xorg.conf
===================================================================
--- pcbsd/trunk/system-overlay/PCBSD/xorg-gui/templates/header/intel.xorg.conf	2007-07-13 04:40:17 UTC (rev 469)
+++ pcbsd/trunk/system-overlay/PCBSD/xorg-gui/templates/header/intel.xorg.conf	2007-07-13 05:09:40 UTC (rev 470)
@@ -6,7 +6,6 @@
     InputDevice    "Mouse0" "CorePointer"
     InputDevice    "Keyboard0" "CoreKeyboard"
     Option	   "Clone" "off"
-    Option	   "AIGLX" "true"
 EndSection
 
 Section "Files"
@@ -29,9 +28,7 @@
 Section "Module"
     Load           "ddc"
     Load           "dbe"
-    Load	   "dri"
     Load           "extmod"
-    Load	   "glx"
     Load           "xtrap"
     Load           "freetype"
 EndSection
@@ -52,11 +49,3 @@
     Option         "ZAxisMapping" "4 5"
     Option         "Emulate3Buttons"
 EndSection
-
-Section "DRI"
-    Mode 0666
-EndSection
-
-Section "Extensions" 
-    Option	"Composite" "Enable"
-EndSection

Modified: pcbsd/trunk/system-overlay/PCBSD/xorg-gui/templates/header/xorg.conf.generic
===================================================================
--- pcbsd/trunk/system-overlay/PCBSD/xorg-gui/templates/header/xorg.conf.generic	2007-07-13 04:40:17 UTC (rev 469)
+++ pcbsd/trunk/system-overlay/PCBSD/xorg-gui/templates/header/xorg.conf.generic	2007-07-13 05:09:40 UTC (rev 470)
@@ -28,9 +28,7 @@
 Section "Module"
     Load           "ddc"
     Load           "dbe"
-    Load	   "dri"
     Load           "extmod"
-    Load	   "glx"
     Load           "xtrap"
     Load           "freetype"
 EndSection
@@ -51,11 +49,3 @@
     Option         "ZAxisMapping" "4 5"
     Option         "Emulate3Buttons"
 EndSection
-
-Section "DRI"
-    Mode 0666
-EndSection
-
-Section "Extensions" 
-    Option	"Composite" "Enable"
-EndSection



More information about the Commits mailing list