xserver: Branch 'master'

[Ian Romanick]

 glx/extension_string.c |    2 +-
 glx/glxscreens.c       |    1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

New commits:
commit d1ad43a8bc3a93a9cddcb4b0be1d722993bf5dd6
Author: Ian Romanick <ian.d.romanick at intel.com>
Date:   Thu Feb 12 14:05:10 2009 -0800

    Enable pbuffers
    
    If a driver does not actually support pbuffer rendering, it can just
    not enable any pbuffer fbconfigs.

diff --git a/glx/extension_string.c b/glx/extension_string.c
index a4b202a..9d110cf 100644
--- a/glx/extension_string.c
+++ b/glx/extension_string.c
@@ -80,7 +80,7 @@ static const struct extension_info known_glx_extensions[] = {
    { GLX(SGI_swap_control),            VER(0,0), N, },
    { GLX(SGIS_multisample),            VER(0,0), Y, },
    { GLX(SGIX_fbconfig),               VER(1,3), Y, },
-   { GLX(SGIX_pbuffer),                VER(1,3), N, },
+   { GLX(SGIX_pbuffer),                VER(1,3), Y, },
    { GLX(SGIX_visual_select_group),    VER(0,0), Y, },
    { NULL }
 };
diff --git a/glx/glxscreens.c b/glx/glxscreens.c
index 2656355..87119fb 100644
--- a/glx/glxscreens.c
+++ b/glx/glxscreens.c
@@ -177,6 +177,7 @@ static char GLXServerExtensions[] =
                         "GLX_SGIX_swap_barrier "
 #endif
 			"GLX_SGIX_fbconfig "
+			"GLX_SGIX_pbuffer "
 			"GLX_MESA_copy_sub_buffer "
 			;