diff options
| author | marha <marha@users.sourceforge.net> | 2014-03-04 12:18:13 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2014-03-04 12:23:48 +0100 |
| commit | 45392e4a0642880b569ea5d4a350cdc395a2c7db (patch) | |
| tree | c3c2a49de903a18c3f8e1bf79684c29337ebcf7c /xorg-server/glx/indirect_texture_compression.c | |
| parent | 5ec0616d4e3c4c6095f4975abbe9c21e5b6af967 (diff) | |
| parent | 321c01267ae1c446f1bd22b642567fcafa016c02 (diff) | |
| download | vcxsrv-45392e4a0642880b569ea5d4a350cdc395a2c7db.tar.gz vcxsrv-45392e4a0642880b569ea5d4a350cdc395a2c7db.tar.bz2 vcxsrv-45392e4a0642880b569ea5d4a350cdc395a2c7db.zip | |
Merge remote-tracking branch 'origin/released'
* origin/released:
libX11 libxcb mesa xserver xcb-proto xkeyboard-config git update 4 Mar 2014
Conflicts:
mesalib/src/mapi/glapi/glapi.h
mesalib/src/mapi/glapi/glthread.c
mesalib/src/mesa/drivers/dri/common/dri_util.c
mesalib/src/mesa/main/bufferobj.c
xorg-server/dix/dispatch.c
xorg-server/hw/xwin/glx/gen_gl_wrappers.py
xorg-server/hw/xwin/winmultiwindowwm.c
Diffstat (limited to 'xorg-server/glx/indirect_texture_compression.c')
| -rw-r--r-- | xorg-server/glx/indirect_texture_compression.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/xorg-server/glx/indirect_texture_compression.c b/xorg-server/glx/indirect_texture_compression.c index 551250dc5..112811e50 100644 --- a/xorg-server/glx/indirect_texture_compression.c +++ b/xorg-server/glx/indirect_texture_compression.c @@ -37,9 +37,6 @@ #include "indirect_dispatch.h" #include "glfunctions.h" -#define glGetCompressedTexImageARB glGetCompressedTexImage - - int __glXDisp_GetCompressedTexImage(struct __GLXclientStateRec *cl, GLbyte * pc) { @@ -59,9 +56,11 @@ __glXDisp_GetCompressedTexImage(struct __GLXclientStateRec *cl, GLbyte * pc) &compsize); if (compsize != 0) { + PFNGLGETCOMPRESSEDTEXIMAGEARBPROC GetCompressedTexImageARB = + __glGetProcAddress("glGetCompressedTexImageARB"); __GLX_GET_ANSWER_BUFFER(answer, cl, compsize, 1); __glXClearErrorOccured(); - glGetCompressedTexImageARB(target, level, answer); + GetCompressedTexImageARB(target, level, answer); } if (__glXErrorOccured()) { @@ -101,9 +100,11 @@ __glXDispSwap_GetCompressedTexImage(struct __GLXclientStateRec *cl, GLbyte * pc) &compsize); if (compsize != 0) { + PFNGLGETCOMPRESSEDTEXIMAGEARBPROC GetCompressedTexImageARB = + __glGetProcAddress("glGetCompressedTexImageARB"); __GLX_GET_ANSWER_BUFFER(answer, cl, compsize, 1); __glXClearErrorOccured(); - glGetCompressedTexImageARB(target, level, answer); + GetCompressedTexImageARB(target, level, answer); } if (__glXErrorOccured()) { |