xserver: Branch 'xorg-server-1.4-apple'

[George Peter Staplin]

 hw/xquartz/darwin.c |    7 +++++++
 1 file changed, 7 insertions(+)

New commits:
commit 373b8a5f32509722e06d8776109e6c3f06645ee0
Author: George Staplin <gstaplin at apple.com>
Date:   Sun Nov 9 18:35:10 2008 -0700

    XQuartz: Disable 2 calls to miSetVisualTypesAndMasks that seem to be unnecessary, and possibly wrong (with regard to masks and bits per RGB).
    
    Use the settings queried from the system in xprScreen.c, rather than those 2 calls.
    
    The 2 calls increased the total number of visuals a great deal (when using GLXEXT),
    and not all of the visuals were usable with GLX.  Some of the visuals aren't usable
    with GLX still, such as DirectColor, but that seems to be acceptable based on my
    understanding of the manual that states "a subset of visuals are made available
    for OpenGL rendering."

diff --git a/hw/xquartz/darwin.c b/hw/xquartz/darwin.c
index 5e30ab2..e4b804f 100644
--- a/hw/xquartz/darwin.c
+++ b/hw/xquartz/darwin.c
@@ -222,10 +222,17 @@ static Bool DarwinAddScreen(int index, ScreenPtr pScreen, int argc, char **argv)
 // TODO: Make PseudoColor visuals not suck in TrueColor mode  
 //    if(dfb->depth > 8)
 //        miSetVisualTypesAndMasks(8, PseudoColorMask, 8, PseudoColor, 0, 0, 0);
+
+#if 0
+    /*
+     * These aren't used anymore.  xpr/xprScreen.c initializes the dfb struct
+     * above based on the display properties.
+     */
     if(dfb->depth > 15)
         miSetVisualTypesAndMasks(15, LARGE_VISUALS, 5, TrueColor, 0x7c00, 0x03e0, 0x001f);
     if(dfb->depth > 24)
         miSetVisualTypesAndMasks(24, LARGE_VISUALS, 8, TrueColor, 0x00ff0000, 0x0000ff00, 0x000000ff);
+#endif
 
     miSetPixmapDepths();