glx: Stop relying on libGL ABI bugs for glGetCompressedTexImage().
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:
parent
bf4f02337c
commit
87c4551c9c
|
@ -54,9 +54,11 @@ __glXDisp_GetCompressedTexImage(struct __GLXclientStateRec *cl, GLbyte * pc)
|
||||||
&compsize);
|
&compsize);
|
||||||
|
|
||||||
if (compsize != 0) {
|
if (compsize != 0) {
|
||||||
|
PFNGLGETCOMPRESSEDTEXIMAGEARBPROC GetCompressedTexImageARB =
|
||||||
|
__glGetProcAddress("glGetCompressedTexImageARB");
|
||||||
__GLX_GET_ANSWER_BUFFER(answer, cl, compsize, 1);
|
__GLX_GET_ANSWER_BUFFER(answer, cl, compsize, 1);
|
||||||
__glXClearErrorOccured();
|
__glXClearErrorOccured();
|
||||||
glGetCompressedTexImageARB(target, level, answer);
|
GetCompressedTexImageARB(target, level, answer);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (__glXErrorOccured()) {
|
if (__glXErrorOccured()) {
|
||||||
|
@ -96,9 +98,11 @@ __glXDispSwap_GetCompressedTexImage(struct __GLXclientStateRec *cl, GLbyte * pc)
|
||||||
&compsize);
|
&compsize);
|
||||||
|
|
||||||
if (compsize != 0) {
|
if (compsize != 0) {
|
||||||
|
PFNGLGETCOMPRESSEDTEXIMAGEARBPROC GetCompressedTexImageARB =
|
||||||
|
__glGetProcAddress("glGetCompressedTexImageARB");
|
||||||
__GLX_GET_ANSWER_BUFFER(answer, cl, compsize, 1);
|
__GLX_GET_ANSWER_BUFFER(answer, cl, compsize, 1);
|
||||||
__glXClearErrorOccured();
|
__glXClearErrorOccured();
|
||||||
glGetCompressedTexImageARB(target, level, answer);
|
GetCompressedTexImageARB(target, level, answer);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (__glXErrorOccured()) {
|
if (__glXErrorOccured()) {
|
||||||
|
|
Loading…
Reference in New Issue
Block a user