Update function signatures for EXT_tfp entrypoints.

diff --git a/include/GL/glx.h b/include/GL/glx.h
index f4cc50b90f439e63030eb228ea522a3152203aaf..165d105b882f918318350f7db850c500329fb177 100644 (file)
--- a/include/GL/glx.h
+++ b/include/GL/glx.h
@@ -425,8 +425,8 @@ typedef int (*PFNGLXGETSWAPINTERVALMESAPROC)(void);
 
 /* XXX need enums/tokens! */
 
-extern Bool glXBindTexImageEXT(Display *dpy, GLXDrawable drawable, int buffer, const int *attrib_list);
-extern Bool glXReleaseTexImageEXT(Display *dpy, GLXDrawable drawable, int buffer);
+extern void glXBindTexImageEXT(Display *dpy, GLXDrawable drawable, int buffer, const int *attrib_list);
+extern void glXReleaseTexImageEXT(Display *dpy, GLXDrawable drawable, int buffer);
 
 #endif /* GLX_EXT_texture_from_pixmap */
 

diff --git a/src/glx/x11/glxcmds.c b/src/glx/x11/glxcmds.c
index c34bbc5d21550adc3368a8586bfe8a8777211d70..d0f5e9a3629dd0e8da7c47357e10166e38b98863 100644 (file)
--- a/src/glx/x11/glxcmds.c
+++ b/src/glx/x11/glxcmds.c
@@ -2641,7 +2641,7 @@ PUBLIC Bool glXSet3DfxModeMESA( int mode )
 }
 /*@}*/
 
-PUBLIC Bool glXBindTexImageEXT(Display *dpy,
+PUBLIC void glXBindTexImageEXT(Display *dpy,
                               GLXDrawable drawable,
                               int buffer,
                               const int *attrib_list)
@@ -2656,7 +2656,7 @@ PUBLIC Bool glXBindTexImageEXT(Display *dpy,
     unsigned int i;
 
     if (gc == NULL)
-       return False;
+       return;
 
     i = 0;
     if (attrib_list) {
@@ -2666,12 +2666,12 @@ PUBLIC Bool glXBindTexImageEXT(Display *dpy,
  
 #ifdef GLX_DIRECT_RENDERING
     if (gc->isDirect)
-       return False;
+       return;
 #endif
 
     opcode = __glXSetupForCommand(dpy);
     if (!opcode)
-       return False;
+       return;
 
     LockDisplay(dpy);
     GetReqExtra(GLXVendorPrivate, 12 + 8 * i,req);
@@ -2701,11 +2701,9 @@ PUBLIC Bool glXBindTexImageEXT(Display *dpy,
 
     UnlockDisplay(dpy);
     SyncHandle();
-
-    return True;
 }
 
-PUBLIC Bool glXReleaseTexImageEXT(Display *dpy,
+PUBLIC void glXReleaseTexImageEXT(Display *dpy,
                                  GLXDrawable drawable,
                                  int buffer)
 {
@@ -2716,16 +2714,16 @@ PUBLIC Bool glXReleaseTexImageEXT(Display *dpy,
     CARD8 opcode;
 
     if (gc == NULL)
-       return False;
+       return;
 
 #ifdef GLX_DIRECT_RENDERING
     if (gc->isDirect)
-       return False;
+       return;
 #endif
 
     opcode = __glXSetupForCommand(dpy);
     if (!opcode)
-       return False;
+       return;
 
     LockDisplay(dpy);
     GetReqExtra(GLXVendorPrivate, sizeof(CARD32)+sizeof(INT32),req);
@@ -2742,8 +2740,6 @@ PUBLIC Bool glXReleaseTexImageEXT(Display *dpy,
 
     UnlockDisplay(dpy);
     SyncHandle();
-
-    return True;
 }
 
 /**