diff options
| author | marha <marha@users.sourceforge.net> | 2013-11-08 11:47:30 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2013-11-08 11:47:30 +0100 |
| commit | c8483dc2831dc37d93a36804022f6b064f5962ea (patch) | |
| tree | 599f145a848e10b75a1a8c314ed9c51031446506 /xorg-server/glx/indirect_texture_compression.c | |
| parent | c97d11aec40d8fa07d6b456bf8694133a77d35f4 (diff) | |
| download | vcxsrv-c8483dc2831dc37d93a36804022f6b064f5962ea.tar.gz vcxsrv-c8483dc2831dc37d93a36804022f6b064f5962ea.tar.bz2 vcxsrv-c8483dc2831dc37d93a36804022f6b064f5962ea.zip | |
Solved compilation and link problems after last merge
Diffstat (limited to 'xorg-server/glx/indirect_texture_compression.c')
| -rwxr-xr-x[-rw-r--r--] | xorg-server/glx/indirect_texture_compression.c | 25 |
1 files changed, 18 insertions, 7 deletions
diff --git a/xorg-server/glx/indirect_texture_compression.c b/xorg-server/glx/indirect_texture_compression.c index 32f5487ac..a1a946e5c 100644..100755 --- a/xorg-server/glx/indirect_texture_compression.c +++ b/xorg-server/glx/indirect_texture_compression.c @@ -36,6 +36,10 @@ #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" int __glXDisp_GetCompressedTexImage(struct __GLXclientStateRec *cl, GLbyte * pc) @@ -52,13 +56,16 @@ __glXDisp_GetCompressedTexImage(struct __GLXclientStateRec *cl, GLbyte * pc) GLint compsize = 0; char *answer = NULL, answerBuffer[200]; - glGetTexLevelParameteriv(target, level, GL_TEXTURE_COMPRESSED_IMAGE_SIZE, - &compsize); + CALL_GetTexLevelParameteriv(GET_DISPATCH(), + (target, level, + GL_TEXTURE_COMPRESSED_IMAGE_SIZE, + &compsize)); if (compsize != 0) { __GLX_GET_ANSWER_BUFFER(answer, cl, compsize, 1); __glXClearErrorOccured(); - glGetCompressedTexImageARB(target, level, answer); + CALL_GetCompressedTexImage(GET_DISPATCH(), + (target, level, answer)); } if (__glXErrorOccured()) { @@ -79,7 +86,8 @@ __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; @@ -94,13 +102,16 @@ __glXDispSwap_GetCompressedTexImage(struct __GLXclientStateRec *cl, GLbyte * pc) GLint compsize = 0; char *answer = NULL, answerBuffer[200]; - glGetTexLevelParameteriv(target, level, GL_TEXTURE_COMPRESSED_IMAGE_SIZE, - &compsize); + CALL_GetTexLevelParameteriv(GET_DISPATCH(), + (target, level, + GL_TEXTURE_COMPRESSED_IMAGE_SIZE, + &compsize)); if (compsize != 0) { __GLX_GET_ANSWER_BUFFER(answer, cl, compsize, 1); __glXClearErrorOccured(); - glGetCompressedTexImageARB(target, level, answer); + CALL_GetCompressedTexImage(GET_DISPATCH(), + (target, level, answer)); } if (__glXErrorOccured()) { |