From: Adam Jackson Date: Mon, 1 May 2006 22:25:18 +0000 (+0000) Subject: Update function signatures for EXT_tfp entrypoints. X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=015762455764e3b467f0df769d51d0ed0ea3ee2c;p=mesa.git Update function signatures for EXT_tfp entrypoints. --- diff --git a/include/GL/glx.h b/include/GL/glx.h index f4cc50b90f4..165d105b882 100644 --- 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 c34bbc5d215..d0f5e9a3629 100644 --- 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; } /**