xserver: Branch 'master'

[Michel Dänzer]

 hw/xfree86/dri/dri.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit ef320bdd5ec3419abba77041d3a4d96a3ff87563
Author: Michel Dänzer <daenzer at vmware.com>
Date:   Mon Feb 23 16:49:51 2009 +0100

    DRI1: Make DRICreateDrawable return TRUE for pixmaps.
    
    GLX_EXT_texture_from_pixmap was broken since commit
    a26c77ff432d2e85a2665fc36fca25143460c476 ('glx: fix retval checks when failures
    occur for drawable creation.')
    
    Signed-off-by: Michel Dänzer <daenzer at vmware.com>

diff --git a/hw/xfree86/dri/dri.c b/hw/xfree86/dri/dri.c
index 871b6a9..c01686d 100644
--- a/hw/xfree86/dri/dri.c
+++ b/hw/xfree86/dri/dri.c
@@ -1289,7 +1289,7 @@ DRICreateDrawable(ScreenPtr pScreen, ClientPtr client, DrawablePtr pDrawable,
 	    *hHWDrawable = pDRIDrawablePriv->hwDrawable;
 	}
     }
-    else { /* pixmap (or for GLX 1.3, a PBuffer) */
+    else if (pDrawable->type != DRAWABLE_PIXMAP) { /* PBuffer */
 	/* NOT_DONE */
 	return FALSE;
     }