From dc836edf49a08a7fd77fc1f127818b0550558581 Mon Sep 17 00:00:00 2001
From: Kristian Høgsberg <krh@redhat.com>
Date: Wed, 2 Apr 2008 19:04:57 -0400
Subject: Initialize GLX_EXT_texture_from_pixmap attributes correctly.

---
 src/glx/x11/dri_glx.c | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

(limited to 'src/glx/x11')

diff --git a/src/glx/x11/dri_glx.c b/src/glx/x11/dri_glx.c
index 31ade0da2a..004af0bf3c 100644
--- a/src/glx/x11/dri_glx.c
+++ b/src/glx/x11/dri_glx.c
@@ -508,11 +508,11 @@ static const struct { unsigned int attrib, offset; } attribMap[] = {
     __ATTRIB(__DRI_ATTRIB_OPTIMAL_PBUFFER_HEIGHT,	optimalPbufferHeight),
 #if 0
     __ATTRIB(__DRI_ATTRIB_SWAP_METHOD,			swapMethod),
+#endif
     __ATTRIB(__DRI_ATTRIB_BIND_TO_TEXTURE_RGB,		bindToTextureRgb),
     __ATTRIB(__DRI_ATTRIB_BIND_TO_TEXTURE_RGBA,		bindToTextureRgba),
     __ATTRIB(__DRI_ATTRIB_BIND_TO_MIPMAP_TEXTURE,	bindToMipmapTexture),
     __ATTRIB(__DRI_ATTRIB_YINVERTED,			yInverted),
-#endif
 };
 
 #define ARRAY_SIZE(a) (sizeof (a) / sizeof ((a)[0]))
@@ -564,8 +564,6 @@ driConfigEqual(const __DRIcoreExtension *core,
 		return GL_FALSE;
 	    break;
 
-#if 0
-	/* The X server doesn't send these, so ignore them for now. */
 	case __DRI_ATTRIB_BIND_TO_TEXTURE_TARGETS:
 	    glxValue = 0;
 	    if (value & __DRI_ATTRIB_TEXTURE_1D_BIT)
@@ -577,7 +575,6 @@ driConfigEqual(const __DRIcoreExtension *core,
 	    if (glxValue != modes->bindToTextureTargets)
 		return GL_FALSE;
 	    break;	
-#endif
 
 	default:
 	    if (!scalarEqual(modes, attrib, value))
-- 
cgit v1.2.3