diff options
author | marha <marha@users.sourceforge.net> | 2011-03-30 20:51:05 +0000 |
---|---|---|
committer | marha <marha@users.sourceforge.net> | 2011-03-30 20:51:05 +0000 |
commit | 70a13fe295183aeea369adcb94f2d67e69fab387 (patch) | |
tree | d707644ab424d0517a879b9784a543a899e1ae20 /xorg-server/glx/indirect_texture_compression.c | |
parent | 9b51ee5bcf948185cfcba0600b3da2d241339174 (diff) | |
parent | 140242b0d4aed1d595d6565d088d9567c456d6b4 (diff) | |
download | vcxsrv-70a13fe295183aeea369adcb94f2d67e69fab387.tar.gz vcxsrv-70a13fe295183aeea369adcb94f2d67e69fab387.tar.bz2 vcxsrv-70a13fe295183aeea369adcb94f2d67e69fab387.zip |
svn merge ^/branches/released .
Diffstat (limited to 'xorg-server/glx/indirect_texture_compression.c')
-rw-r--r-- | xorg-server/glx/indirect_texture_compression.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/xorg-server/glx/indirect_texture_compression.c b/xorg-server/glx/indirect_texture_compression.c index 7a0101078..6187415f5 100644 --- a/xorg-server/glx/indirect_texture_compression.c +++ b/xorg-server/glx/indirect_texture_compression.c @@ -48,7 +48,7 @@ int __glXDisp_GetCompressedTexImageARB(struct __GLXclientStateRec *cl, GLbyte *p { xGLXSingleReq * const req = (xGLXSingleReq *) pc; int error; - struct glx_context * const cx = __glXForceCurrent( cl, req->contextTag, & error ); + __GLXcontext * const cx = __glXForceCurrent( cl, req->contextTag, & error ); ClientPtr client = cl->client; @@ -88,7 +88,7 @@ int __glXDispSwap_GetCompressedTexImageARB(struct __GLXclientStateRec *cl, GLbyt { xGLXSingleReq * const req = (xGLXSingleReq *) pc; int error; - struct glx_context * const cx = __glXForceCurrent( cl, bswap_32( req->contextTag ), & error ); + __GLXcontext * const cx = __glXForceCurrent( cl, bswap_32( req->contextTag ), & error ); ClientPtr client = cl->client; |