diff options
| author | marha <marha@users.sourceforge.net> | 2012-11-20 16:33:58 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2012-11-20 16:37:03 +0100 |
| commit | fc83ab987c84518c31793515c4f99a0df8ccd1cc (patch) | |
| tree | 2f8e01251e2faba8369f28b85ba9c48de87136c6 /xorg-server/glx | |
| parent | 96f2a4b36eb811fa1f12dcde03bffc86cfd1781d (diff) | |
| download | vcxsrv-fc83ab987c84518c31793515c4f99a0df8ccd1cc.tar.gz vcxsrv-fc83ab987c84518c31793515c4f99a0df8ccd1cc.tar.bz2 vcxsrv-fc83ab987c84518c31793515c4f99a0df8ccd1cc.zip | |
Solved compile problems due to latest merge
Diffstat (limited to 'xorg-server/glx')
| -rw-r--r-- | xorg-server/glx/indirect_texture_compression.c | 8 | ||||
| -rw-r--r-- | xorg-server/glx/render2.c | 4 | ||||
| -rw-r--r-- | xorg-server/glx/render2swap.c | 4 |
3 files changed, 8 insertions, 8 deletions
diff --git a/xorg-server/glx/indirect_texture_compression.c b/xorg-server/glx/indirect_texture_compression.c index 56e6ef84d..77f4162f9 100644 --- a/xorg-server/glx/indirect_texture_compression.c +++ b/xorg-server/glx/indirect_texture_compression.c @@ -42,7 +42,7 @@ #include "dispatch.h" int -__glXDisp_GetCompressedTexImageARB(struct __GLXclientStateRec *cl, GLbyte * pc) +__glXDisp_GetCompressedTexImage(struct __GLXclientStateRec *cl, GLbyte * pc) { xGLXSingleReq *const req = (xGLXSingleReq *) pc; int error; @@ -64,7 +64,7 @@ __glXDisp_GetCompressedTexImageARB(struct __GLXclientStateRec *cl, GLbyte * pc) if (compsize != 0) { __GLX_GET_ANSWER_BUFFER(answer, cl, compsize, 1); __glXClearErrorOccured(); - CALL_GetCompressedTexImageARB(GET_DISPATCH(), + CALL_GetCompressedTexImage(GET_DISPATCH(), (target, level, answer)); } @@ -86,7 +86,7 @@ __glXDisp_GetCompressedTexImageARB(struct __GLXclientStateRec *cl, GLbyte * pc) } int -__glXDispSwap_GetCompressedTexImageARB(struct __GLXclientStateRec *cl, +__glXDispSwap_GetCompressedTexImage(struct __GLXclientStateRec *cl, GLbyte * pc) { xGLXSingleReq *const req = (xGLXSingleReq *) pc; @@ -110,7 +110,7 @@ __glXDispSwap_GetCompressedTexImageARB(struct __GLXclientStateRec *cl, if (compsize != 0) { __GLX_GET_ANSWER_BUFFER(answer, cl, compsize, 1); __glXClearErrorOccured(); - CALL_GetCompressedTexImageARB(GET_DISPATCH(), + CALL_GetCompressedTexImage(GET_DISPATCH(), (target, level, answer)); } diff --git a/xorg-server/glx/render2.c b/xorg-server/glx/render2.c index 4eef3d434..01e33d5c9 100644 --- a/xorg-server/glx/render2.c +++ b/xorg-server/glx/render2.c @@ -243,12 +243,12 @@ __glXDisp_DrawArrays(GLbyte * pc) break; case GL_SECONDARY_COLOR_ARRAY: CALL_EnableClientState(GET_DISPATCH(), (GL_SECONDARY_COLOR_ARRAY)); - CALL_SecondaryColorPointerEXT(GET_DISPATCH(), + CALL_SecondaryColorPointer(GET_DISPATCH(), (numVals, datatype, stride, pc)); break; case GL_FOG_COORD_ARRAY: CALL_EnableClientState(GET_DISPATCH(), (GL_FOG_COORD_ARRAY)); - CALL_FogCoordPointerEXT(GET_DISPATCH(), (datatype, stride, pc)); + CALL_FogCoordPointer(GET_DISPATCH(), (datatype, stride, pc)); break; default: break; diff --git a/xorg-server/glx/render2swap.c b/xorg-server/glx/render2swap.c index f7525fad1..435fa26ad 100644 --- a/xorg-server/glx/render2swap.c +++ b/xorg-server/glx/render2swap.c @@ -365,12 +365,12 @@ __glXDispSwap_DrawArrays(GLbyte * pc) break; case GL_SECONDARY_COLOR_ARRAY: CALL_EnableClientState(GET_DISPATCH(), (GL_SECONDARY_COLOR_ARRAY)); - CALL_SecondaryColorPointerEXT(GET_DISPATCH(), + CALL_SecondaryColorPointer(GET_DISPATCH(), (numVals, datatype, stride, pc)); break; case GL_FOG_COORD_ARRAY: CALL_EnableClientState(GET_DISPATCH(), (GL_FOG_COORD_ARRAY)); - CALL_FogCoordPointerEXT(GET_DISPATCH(), (datatype, stride, pc)); + CALL_FogCoordPointer(GET_DISPATCH(), (datatype, stride, pc)); break; default: break; |