diff options
Diffstat (limited to 'xorg-server/glx/render2swap.c')
| -rw-r--r-- | xorg-server/glx/render2swap.c | 69 |
1 files changed, 29 insertions, 40 deletions
diff --git a/xorg-server/glx/render2swap.c b/xorg-server/glx/render2swap.c index 8b5d9daff..e6f73b896 100644 --- a/xorg-server/glx/render2swap.c +++ b/xorg-server/glx/render2swap.c @@ -36,10 +36,6 @@ #include "unpack.h" #include "indirect_size.h" #include "indirect_dispatch.h" -#include "glapitable.h" -#include "glapi.h" -#include "glthread.h" -#include "dispatch.h" void __glXDispSwap_Map1f(GLbyte * pc) @@ -73,7 +69,7 @@ __glXDispSwap_Map1f(GLbyte * pc) } __GLX_SWAP_FLOAT_ARRAY(points, compsize); - CALL_Map1f(GET_DISPATCH(), (target, u1, u2, k, order, points)); + glMap1f(target, u1, u2, k, order, points); } void @@ -117,9 +113,7 @@ __glXDispSwap_Map2f(GLbyte * pc) } __GLX_SWAP_FLOAT_ARRAY(points, compsize); - CALL_Map2f(GET_DISPATCH(), - (target, u1, u2, ustride, uorder, v1, v2, vstride, vorder, - points)); + glMap2f(target, u1, u2, ustride, uorder, v1, v2, vstride, vorder, points); } void @@ -167,7 +161,7 @@ __glXDispSwap_Map1d(GLbyte * pc) #else points = (GLdouble *) pc; #endif - CALL_Map1d(GET_DISPATCH(), (target, u1, u2, k, order, points)); + glMap1d(target, u1, u2, k, order, points); } void @@ -223,9 +217,7 @@ __glXDispSwap_Map2d(GLbyte * pc) #else points = (GLdouble *) pc; #endif - CALL_Map2d(GET_DISPATCH(), - (target, u1, u2, ustride, uorder, v1, v2, vstride, vorder, - points)); + glMap2d(target, u1, u2, ustride, uorder, v1, v2, vstride, vorder, points); } static void @@ -337,39 +329,36 @@ __glXDispSwap_DrawArrays(GLbyte * pc) switch (component) { case GL_VERTEX_ARRAY: - CALL_EnableClientState(GET_DISPATCH(), (GL_VERTEX_ARRAY)); - CALL_VertexPointer(GET_DISPATCH(), (numVals, datatype, stride, pc)); + glEnableClientState(GL_VERTEX_ARRAY); + glVertexPointer(numVals, datatype, stride, pc); break; case GL_NORMAL_ARRAY: - CALL_EnableClientState(GET_DISPATCH(), (GL_NORMAL_ARRAY)); - CALL_NormalPointer(GET_DISPATCH(), (datatype, stride, pc)); + glEnableClientState(GL_NORMAL_ARRAY); + glNormalPointer(datatype, stride, pc); break; case GL_COLOR_ARRAY: - CALL_EnableClientState(GET_DISPATCH(), (GL_COLOR_ARRAY)); - CALL_ColorPointer(GET_DISPATCH(), (numVals, datatype, stride, pc)); + glEnableClientState(GL_COLOR_ARRAY); + glColorPointer(numVals, datatype, stride, pc); break; case GL_INDEX_ARRAY: - CALL_EnableClientState(GET_DISPATCH(), (GL_INDEX_ARRAY)); - CALL_IndexPointer(GET_DISPATCH(), (datatype, stride, pc)); + glEnableClientState(GL_INDEX_ARRAY); + glIndexPointer(datatype, stride, pc); break; case GL_TEXTURE_COORD_ARRAY: - CALL_EnableClientState(GET_DISPATCH(), (GL_TEXTURE_COORD_ARRAY)); - CALL_TexCoordPointer(GET_DISPATCH(), - (numVals, datatype, stride, pc)); + glEnableClientState(GL_TEXTURE_COORD_ARRAY); + glTexCoordPointer(numVals, datatype, stride, pc); break; case GL_EDGE_FLAG_ARRAY: - CALL_EnableClientState(GET_DISPATCH(), (GL_EDGE_FLAG_ARRAY)); - CALL_EdgeFlagPointer(GET_DISPATCH(), - (stride, (const GLboolean *) pc)); + glEnableClientState(GL_EDGE_FLAG_ARRAY); + glEdgeFlagPointer(stride, (const GLboolean *) pc); break; case GL_SECONDARY_COLOR_ARRAY: - CALL_EnableClientState(GET_DISPATCH(), (GL_SECONDARY_COLOR_ARRAY)); - CALL_SecondaryColorPointerEXT(GET_DISPATCH(), - (numVals, datatype, stride, pc)); + glEnableClientState(GL_SECONDARY_COLOR_ARRAY); + glSecondaryColorPointerEXT(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)); + glEnableClientState(GL_FOG_COORD_ARRAY); + glFogCoordPointerEXT(datatype, stride, pc); break; default: break; @@ -378,15 +367,15 @@ __glXDispSwap_DrawArrays(GLbyte * pc) pc += __GLX_PAD(numVals * __glXTypeSize(datatype)); } - CALL_DrawArrays(GET_DISPATCH(), (primType, 0, numVertexes)); + glDrawArrays(primType, 0, numVertexes); /* turn off anything we might have turned on */ - CALL_DisableClientState(GET_DISPATCH(), (GL_VERTEX_ARRAY)); - CALL_DisableClientState(GET_DISPATCH(), (GL_NORMAL_ARRAY)); - CALL_DisableClientState(GET_DISPATCH(), (GL_COLOR_ARRAY)); - CALL_DisableClientState(GET_DISPATCH(), (GL_INDEX_ARRAY)); - CALL_DisableClientState(GET_DISPATCH(), (GL_TEXTURE_COORD_ARRAY)); - CALL_DisableClientState(GET_DISPATCH(), (GL_EDGE_FLAG_ARRAY)); - CALL_DisableClientState(GET_DISPATCH(), (GL_SECONDARY_COLOR_ARRAY)); - CALL_DisableClientState(GET_DISPATCH(), (GL_FOG_COORD_ARRAY)); + glDisableClientState(GL_VERTEX_ARRAY); + glDisableClientState(GL_NORMAL_ARRAY); + glDisableClientState(GL_COLOR_ARRAY); + glDisableClientState(GL_INDEX_ARRAY); + glDisableClientState(GL_TEXTURE_COORD_ARRAY); + glDisableClientState(GL_EDGE_FLAG_ARRAY); + glDisableClientState(GL_SECONDARY_COLOR_ARRAY); + glDisableClientState(GL_FOG_COORD_ARRAY); } |