xserver: Branch 'server-1.6-branch'

[Keith Packard]

 glx/glxdri2.c |    5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

New commits:
commit a7a93c12f91e0de72868f17a555215f1795d9e2f
Author: Keith Packard <keithp at keithp.com>
Date:   Mon Jun 29 23:18:55 2009 -0700

    Build against DRI_TEX_BUFFER_VERSION 1
    
    setTexBuffer2 isn't present in this version of the structure, so don't try
    to call it.
    
    Signed-off-by: Keith Packard <keithp at keithp.com>

diff --git a/glx/glxdri2.c b/glx/glxdri2.c
index 0b64298..836fea4 100644
--- a/glx/glxdri2.c
+++ b/glx/glxdri2.c
@@ -222,12 +222,15 @@ __glXDRIbindTexImage(__GLXcontext *baseContext,
     if (texBuffer == NULL)
         return Success;
 
+#if __DRI_TEX_BUFFER_VERSION >= 2
     if (texBuffer->base.version >= 2 && texBuffer->setTexBuffer2 != NULL) {
 	(*texBuffer->setTexBuffer2)(context->driContext,
 				    glxPixmap->target,
 				    glxPixmap->format,
 				    drawable->driDrawable);
-    } else {
+    } else
+#endif
+    {
 	texBuffer->setTexBuffer(context->driContext,
 				glxPixmap->target,
 				drawable->driDrawable);