diff options
| author | marha <marha@users.sourceforge.net> | 2013-12-22 22:04:41 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2013-12-22 22:06:29 +0100 |
| commit | 66215bff25b8961e396ea4a3b1847ac668de3ff4 (patch) | |
| tree | 64e98f6dabdd61a56aa92264176c07d1aa0807df /xorg-server/glx/indirect_texture_compression.c | |
| parent | 1d03b6f684ab1ea6772f00058605a9ebb2910628 (diff) | |
| download | vcxsrv-66215bff25b8961e396ea4a3b1847ac668de3ff4.tar.gz vcxsrv-66215bff25b8961e396ea4a3b1847ac668de3ff4.tar.bz2 vcxsrv-66215bff25b8961e396ea4a3b1847ac668de3ff4.zip | |
Solved compile problems due to latest merge
Diffstat (limited to 'xorg-server/glx/indirect_texture_compression.c')
| -rw-r--r-- | xorg-server/glx/indirect_texture_compression.c | 30 |
1 files changed, 11 insertions, 19 deletions
diff --git a/xorg-server/glx/indirect_texture_compression.c b/xorg-server/glx/indirect_texture_compression.c index a1a946e5c..551250dc5 100644 --- a/xorg-server/glx/indirect_texture_compression.c +++ b/xorg-server/glx/indirect_texture_compression.c @@ -35,11 +35,10 @@ #include "unpack.h" #include "indirect_size_get.h" #include "indirect_dispatch.h" -#include "GL/gl.h" -#include "glapitable.h" -#include "glapi.h" -#include "glthread.h" -#include "dispatch.h" + +#include "glfunctions.h" +#define glGetCompressedTexImageARB glGetCompressedTexImage + int __glXDisp_GetCompressedTexImage(struct __GLXclientStateRec *cl, GLbyte * pc) @@ -56,16 +55,13 @@ __glXDisp_GetCompressedTexImage(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_GetCompressedTexImage(GET_DISPATCH(), - (target, level, answer)); + glGetCompressedTexImageARB(target, level, answer); } if (__glXErrorOccured()) { @@ -86,8 +82,7 @@ __glXDisp_GetCompressedTexImage(struct __GLXclientStateRec *cl, GLbyte * pc) } int -__glXDispSwap_GetCompressedTexImage(struct __GLXclientStateRec *cl, - GLbyte * pc) +__glXDispSwap_GetCompressedTexImage(struct __GLXclientStateRec *cl, GLbyte * pc) { xGLXSingleReq *const req = (xGLXSingleReq *) pc; int error; @@ -102,16 +97,13 @@ __glXDispSwap_GetCompressedTexImage(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_GetCompressedTexImage(GET_DISPATCH(), - (target, level, answer)); + glGetCompressedTexImageARB(target, level, answer); } if (__glXErrorOccured()) { |