xorg7.2 upgrade and glxgears

[vehemens]

I have the following error when running glxgears using the ATI driver:

X Error of failed request:  BadRequest (invalid request code or no such 
operation)
  Major opcode of failed request:  158 (DAMAGE)
  Minor opcode of failed request:  4 ()
  Serial number of failed request:  37
  Current serial number in output stream:  38

Also mesa-demos won't build with the NVIDIA patches.  Here are my patches to 
the makefile and a revised yuvrect_client.c patch (i.e. elif to else).

--- Makefile.orig       Wed May  2 09:27:18 2007
+++ Makefile    Sat May 12 00:50:41 2007
@@ -96,9 +96,7 @@
 .endif
 
 .if defined(WITH_NVIDIA_GL)
-CFLAGS+=       -DWITH_NVIDIA_GL=1
-.else
-CFLAGS+=       -DWITH_NVIDIA_GL=0
+CFLAGS+=       -DWITH_NVIDIA_GL
 .endif
 
 .include <bsd.port.post.mk>


--- progs/xdemos/yuvrect_client.c.orig  Sat May 12 01:19:47 2007
+++ progs/xdemos/yuvrect_client.c       Sat May 12 01:19:47 2007
@@ -140,7 +140,11 @@
       exit(0);
    }
    
-   glx_memory = glXAllocateMemoryMESA(dpy, screen, ImgWidth * ImgHeight * 2, 
0, 0 ,0);
+   #ifdef WITH_NVIDIA_GL
+       glx_memory = glXAllocateMemoryNV(ImgWidth * ImgHeight * 2, 0, 0 ,0);
+   #else
+       glx_memory = glXAllocateMemoryMESA(dpy, screen, ImgWidth * ImgHeight * 
2, 0, 0 ,0);
+   #endif
    if (!glx_memory)
    {
      fprintf(stderr,"Failed to allocate MESA memory\n");
@@ -317,7 +321,11 @@
    glXSwapBuffers(dpy, win);
    event_loop(dpy, win);
 
-   glXFreeMemoryMESA(dpy, DefaultScreen(dpy), glx_memory);
+   #ifdef WITH_NVIDIA_GL
+      glXFreeMemoryNV(glx_memory);
+   #else
+      glXFreeMemoryMESA(dpy, DefaultScreen(dpy), glx_memory);
+   #endif
    glXDestroyContext(dpy, ctx);
    XDestroyWindow(dpy, win);
    XCloseDisplay(dpy);