diff options
| author | marha <marha@users.sourceforge.net> | 2013-10-31 08:40:01 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2013-10-31 08:40:01 +0100 |
| commit | e4ef724e06621be9325fc41ed886fd404467fdc0 (patch) | |
| tree | be445314647f682fbb4a1e8b94aeb6ee79cede5f /xorg-server/glx/indirect_texture_compression.c | |
| parent | 270d3a1aa4137dc15d7b7e5a0958cc8c0bef9a1a (diff) | |
| download | vcxsrv-e4ef724e06621be9325fc41ed886fd404467fdc0.tar.gz vcxsrv-e4ef724e06621be9325fc41ed886fd404467fdc0.tar.bz2 vcxsrv-e4ef724e06621be9325fc41ed886fd404467fdc0.zip | |
fontconfig glproto libX11 mesa xserver xkeyboard-config git update 31 oct 2013
xserver commit 902ff0b3497d202b86bf9a411e17db7b694d6eaa
xkeyboard-config commit 70bbf18d6cddb7271db1b2e042765ace3c4ac485
libX11 commit 6cb02b166361200da35ba14f52cd9aaa493eb0ea
glproto commit aacc7a51b6161c765b04524e0d2ab31e5e586834
fontconfig commit 525a135ccf53e4bf3363c3143d9cfdf15fba55ab
mesa commit b16b3c8703f198ca0f025b730d582600df79c19c
Diffstat (limited to 'xorg-server/glx/indirect_texture_compression.c')
| -rw-r--r-- | xorg-server/glx/indirect_texture_compression.c | 27 |
1 files changed, 8 insertions, 19 deletions
diff --git a/xorg-server/glx/indirect_texture_compression.c b/xorg-server/glx/indirect_texture_compression.c index 5c2d06b42..94de47dd6 100644 --- a/xorg-server/glx/indirect_texture_compression.c +++ b/xorg-server/glx/indirect_texture_compression.c @@ -34,13 +34,9 @@ #include "unpack.h" #include "indirect_size_get.h" #include "indirect_dispatch.h" -#include "glapitable.h" -#include "glapi.h" -#include "glthread.h" -#include "dispatch.h" int -__glXDisp_GetCompressedTexImageARB(struct __GLXclientStateRec *cl, GLbyte * pc) +__glXDisp_GetCompressedTexImage(struct __GLXclientStateRec *cl, GLbyte * pc) { xGLXSingleReq *const req = (xGLXSingleReq *) pc; int error; @@ -54,16 +50,13 @@ __glXDisp_GetCompressedTexImageARB(struct __GLXclientStateRec *cl, GLbyte * pc) GLint compsize = 0; char *answer = NULL, answerBuffer[200]; - CALL_GetTexLevelParameteriv(GET_DISPATCH(), - (target, level, - GL_TEXTURE_COMPRESSED_IMAGE_SIZE, - &compsize)); + glGetTexLevelParameteriv(target, level, GL_TEXTURE_COMPRESSED_IMAGE_SIZE, + &compsize); if (compsize != 0) { __GLX_GET_ANSWER_BUFFER(answer, cl, compsize, 1); __glXClearErrorOccured(); - CALL_GetCompressedTexImageARB(GET_DISPATCH(), - (target, level, answer)); + glGetCompressedTexImageARB(target, level, answer); } if (__glXErrorOccured()) { @@ -84,8 +77,7 @@ __glXDisp_GetCompressedTexImageARB(struct __GLXclientStateRec *cl, GLbyte * pc) } int -__glXDispSwap_GetCompressedTexImageARB(struct __GLXclientStateRec *cl, - GLbyte * pc) +__glXDispSwap_GetCompressedTexImage(struct __GLXclientStateRec *cl, GLbyte * pc) { xGLXSingleReq *const req = (xGLXSingleReq *) pc; int error; @@ -100,16 +92,13 @@ __glXDispSwap_GetCompressedTexImageARB(struct __GLXclientStateRec *cl, GLint compsize = 0; char *answer = NULL, answerBuffer[200]; - CALL_GetTexLevelParameteriv(GET_DISPATCH(), - (target, level, - GL_TEXTURE_COMPRESSED_IMAGE_SIZE, - &compsize)); + glGetTexLevelParameteriv(target, level, GL_TEXTURE_COMPRESSED_IMAGE_SIZE, + &compsize); if (compsize != 0) { __GLX_GET_ANSWER_BUFFER(answer, cl, compsize, 1); __glXClearErrorOccured(); - CALL_GetCompressedTexImageARB(GET_DISPATCH(), - (target, level, answer)); + glGetCompressedTexImageARB(target, level, answer); } if (__glXErrorOccured()) { |