diff options
| author | dawes <dawes> | 2000-12-21 19:55:22 +0000 |
|---|---|---|
| committer | dawes <dawes> | 2000-12-21 19:55:22 +0000 |
| commit | 3e247253a50748508feb9cc899b061333eedc3ca (patch) | |
| tree | 036df313fc8da477fb4f36e6430cc09fd9fee58d /xc | |
| parent | d1f23866b00997b86835d361a8535afdb67781ed (diff) | |
merge fix
Diffstat (limited to 'xc')
| -rw-r--r-- | xc/programs/Xserver/hw/xfree86/doc/sgml/DRI.sgml | 15 |
1 files changed, 0 insertions, 15 deletions
diff --git a/xc/programs/Xserver/hw/xfree86/doc/sgml/DRI.sgml b/xc/programs/Xserver/hw/xfree86/doc/sgml/DRI.sgml index d09e442c1..a6b699450 100644 --- a/xc/programs/Xserver/hw/xfree86/doc/sgml/DRI.sgml +++ b/xc/programs/Xserver/hw/xfree86/doc/sgml/DRI.sgml @@ -77,7 +77,6 @@ <p> <sect1>CPU Architectures <p> -<<<<<<< DRI.sgml The architectures currently supported by the DRI have grown from the initial Intel i386 systems to now include the Alpha Processor and the Sun SPARC machines. @@ -94,10 +93,6 @@ 3DNow! is supported in most versions of Linux. Like the SSE optimizations, a runtime check is made to determine if the CPU can execute 3DNow! instructions. -======= - The Architectures currently supported by the DRI have grown - from the initial Intel i386 based machines to now include, - the Alpha Processor and the Sun SPARC machines. The build environment for both of these new architectures have a pre-build environment that will correctly build the @@ -125,7 +120,6 @@ obtained from the following URL. http://www.support.compaq.com/alpha-tools/software/index.html ->>>>>>> 1.1.1.8 Alpha systems can benefit from several compile-time optimizations which are described in the DRI Compile Guide. @@ -711,11 +705,7 @@ should be installed in /lib/modules/2.4.x/kernel/driver/char/drm/. It will be automatically loaded by the Xserver if needed. <p> -<<<<<<< DRI.sgml - The DRI 3D driver should be in -======= The DRI 3D driver for the Voodoo3 should be in ->>>>>>> 1.1.1.8 <tt>/usr/X11R6/lib/modules/dri/tdfx_dri.so</tt>. This will be automatically loaded by libGL.so. <p> @@ -803,10 +793,6 @@ Using <tt/glColorMask(r, g, b, a)/ when r!=g or g!=b. </itemize> <item> -<<<<<<< DRI.sgml - The Voodoo4/5 driver reverts to software rendering under the - same conditions as Voodoo3, but with three exceptions. -======= The lowest mipmap level is sometimes miscolored in trilinear- sampled polygons. </itemize> @@ -900,7 +886,6 @@ <item> The Voodoo5 driver reverts to software rendering under the same conditions Voodoo3 with three exceptions. ->>>>>>> 1.1.1.8 First, stencil operations are implemented in hardware when the screen is configured for 32 bits/pixel. Second, the <tt/GL_BLEND/ texture env mode is fully supported in |