xserver: Branch 'master'

[Ian Romanick]

 GL/glx/extension_string.c |    3 +--
 1 files changed, 1 insertion(+), 2 deletions(-)

New commits:
diff-tree 2fb7b8795a9a36cce61f6449f6ca26ffd1b071f0 (from 1c8851ad491dd02d1c79e620b46384956838ed42)
Author: Ian Romanick <idr at us.ibm.com>
Date:   Tue Aug 29 16:35:32 2006 -0700

    Minor extension tweaks.
    
    GLX_EXT_texture_from_pixmap should always be enabled.
    GLX_SGI_video_sync is only for direct rendering and should never
    appear in the server's string.

diff --git a/GL/glx/extension_string.c b/GL/glx/extension_string.c
index 963b18a..8f13963 100644
--- a/GL/glx/extension_string.c
+++ b/GL/glx/extension_string.c
@@ -70,7 +70,7 @@ static const struct extension_info known
    { GLX(ARB_multisample),             VER(1,4), Y, },
 
    { GLX(EXT_import_context),          VER(0,0), Y, },
-   { GLX(EXT_texture_from_pixmap),     VER(0,0), N, },
+   { GLX(EXT_texture_from_pixmap),     VER(0,0), Y, },
    { GLX(EXT_visual_info),             VER(0,0), Y, },
    { GLX(EXT_visual_rating),           VER(0,0), Y, },
 
@@ -79,7 +79,6 @@ static const struct extension_info known
    { GLX(SGI_make_current_read),       VER(1,3), N, },
 #if 0 /* GLX protocol not yet supported for these. */
    { GLX(SGI_swap_control),            VER(0,0), N, },
-   { GLX(SGI_video_sync),              VER(0,0), N, },
 #endif
    { GLX(SGIS_multisample),            VER(0,0), Y, },
    { GLX(SGIX_fbconfig),               VER(1,3), Y, },