fdo-mirrors/xserver
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/xorg/xserver.git synced 2026-01-22 13:30:28 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

GLX_MESA_render_texture -> GLX_EXT_texture_from_pixmap

Browse source
This commit is contained in:
David Reveman 2006-02-06 19:48:39 +00:00
parent cbcc1fcd60
commit fe5943e9e1
4 changed files with 26 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
ChangeLog
View file

@ -1,3 +1,16 @@
2006-02-06 David Reveman <davidr@novell.com>
* GL/glx/glxscreens.c: GLX_MESA_render_texture ->
GLX_EXT_texture_from_pixmap.
* GL/glx/glxcmdsswap.c (__glXSwapVendorPrivate):
* GL/glx/glxcmds.c (__glXVendorPrivate): X_GLXvop_BindTexImageMESA ->
X_GLXvop_BindTexImageEXT and X_GLXvop_ReleaseTexImageMESA ->
X_GLXvop_ReleaseTexImageEXT.
* GL/glx/glxcmdsswap.c (__glXSwapBindTexImageEXT):
(__glXSwapReleaseTexImageEXT): Correct types for drawId and buffer.
2006-02-02 David Reveman <davidr@novell.com>
* GL/glx/glxscreens.c: Allow support for GL_NV_texture_env_combine4 and

4
GL/glx/glxcmds.c
View file

@ -2297,9 +2297,9 @@ int __glXVendorPrivate(__GLXclientState *cl, GLbyte *pc)
return Success;
case X_GLXvop_BindSwapBarrierSGIX:
return __glXBindSwapBarrierSGIX(cl, pc);
case X_GLXvop_BindTexImageMESA:
case X_GLXvop_BindTexImageEXT:
return __glXBindTexImageEXT(cl, pc);
case X_GLXvop_ReleaseTexImageMESA:
case X_GLXvop_ReleaseTexImageEXT:
return __glXReleaseTexImageEXT(cl, pc);
}
#endif

20
GL/glx/glxcmdsswap.c
View file

@ -410,15 +410,15 @@ int __glXSwapGetDrawableAttributesSGIX(__GLXclientState *cl, char *pc)
int __glXSwapBindTexImageEXT(__GLXclientState *cl, GLchar *pc)
{
xGLXVendorPrivateReq *req = (xGLXVendorPrivateReq *) pc;
GLXDrawable *drawId;
int *buffer;
CARD32 *drawId;
INT32 *buffer;
__GLX_DECLARE_SWAP_VARIABLES;
pc += __GLX_VENDPRIV_HDR_SIZE;
drawId = ((GLXDrawable *) (pc));
buffer = ((int *) (pc + 4));
drawId = ((CARD32 *) (pc));
buffer = ((INT32 *) (pc + 4));
__GLX_SWAP_SHORT(&req->length);
__GLX_SWAP_INT(&req->contextTag);
@ -431,15 +431,15 @@ int __glXSwapBindTexImageEXT(__GLXclientState *cl, GLchar *pc)
int __glXSwapReleaseTexImageEXT(__GLXclientState *cl, GLchar *pc)
{
xGLXVendorPrivateReq *req = (xGLXVendorPrivateReq *) pc;
GLXDrawable *drawId;
int *buffer;
CARD32 *drawId;
INT32 *buffer;
__GLX_DECLARE_SWAP_VARIABLES;
pc += __GLX_VENDPRIV_HDR_SIZE;
drawId = ((GLXDrawable *) (pc));
buffer = ((int *) (pc + 4));
drawId = ((CARD32 *) (pc));
buffer = ((INT32 *) (pc + 4));
__GLX_SWAP_SHORT(&req->length);
__GLX_SWAP_INT(&req->contextTag);
@ -1083,9 +1083,9 @@ int __glXSwapVendorPrivate(__GLXclientState *cl, GLbyte *pc)
__GLX_SWAP_INT(pc + 4);
CALL_SamplePatternSGIS( GET_DISPATCH(), (*(GLenum *)(pc + 4)) );
return Success;
case X_GLXvop_BindTexImageMESA:
case X_GLXvop_BindTexImageEXT:
return __glXSwapBindTexImageEXT(cl, pc);
case X_GLXvop_ReleaseTexImageMESA:
case X_GLXvop_ReleaseTexImageEXT:
return __glXSwapReleaseTexImageEXT(cl, pc);
}
#endif

2
GL/glx/glxscreens.c
View file

@ -142,7 +142,7 @@ static char GLXServerExtensions[] =
"GLX_SGIX_swap_barrier "
#endif
"GLX_SGIX_fbconfig "
"GLX_MESA_render_texture "
"GLX_EXT_texture_from_pixmap "
;
/*