[ANNOUNCE] xorg-server 1.6.1.902

[Keith Packard]

On Tue, 2009-06-30 at 07:45 +0200, Rémi Cardona wrote:
> Le 30/06/2009 01:03, Keith Packard a écrit :
> > Kristian Høgsberg (1):
> >        Support setTexBuffer2 in AIGLX.
> 
> Keith,
> 
> That patch requires either some #ifdefs to make it build with mesa 7.4, 
> or mesa's minimum version needs to be pushed to 7.5 in configure.ac.

How about this (untested) patch?

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);

-- 
keith.packard at intel.com
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 189 bytes
Desc: This is a digitally signed message part
URL: <http://lists.x.org/archives/xorg/attachments/20090629/2655d4b8/attachment.pgp>