andreacavalli/xserver-multidpi
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

glx: Stop relying on libGL ABI bugs for glGetCompressedTexImage().

Browse Source 
In theory, the linux libGL ABI exposes just GL 1.2 plus GLX 1.3.  But,
thanks to libglapi, we're letting glGetCompressedTexImageARB() be
exposed too.  The GLX code was inappropriately relying on it by using
GL_GLEXT_PROTOTYPES.

Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
This commit is contained in:
Eric Anholt 2014-01-27 11:36:05 -08:00 committed by Keith Packard
parent bf4f02337c
commit 87c4551c9c
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
glx/indirect_texture_compression.c
View File

@ -54,9 +54,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()) {
@ -96,9 +98,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()) {