diff options
Diffstat (limited to 'xorg-server/glx/render2swap.c')
| -rw-r--r-- | xorg-server/glx/render2swap.c | 70 |
1 files changed, 41 insertions, 29 deletions
diff --git a/xorg-server/glx/render2swap.c b/xorg-server/glx/render2swap.c index e6f73b896..435fa26ad 100644 --- a/xorg-server/glx/render2swap.c +++ b/xorg-server/glx/render2swap.c @@ -31,11 +31,16 @@ #ifdef HAVE_DIX_CONFIG_H #include <dix-config.h> #endif +#include "glheader.h" #include "glxserver.h" #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) @@ -69,7 +74,7 @@ __glXDispSwap_Map1f(GLbyte * pc) } __GLX_SWAP_FLOAT_ARRAY(points, compsize); - glMap1f(target, u1, u2, k, order, points); + CALL_Map1f(GET_DISPATCH(), (target, u1, u2, k, order, points)); } void @@ -113,7 +118,9 @@ __glXDispSwap_Map2f(GLbyte * pc) } __GLX_SWAP_FLOAT_ARRAY(points, compsize); - glMap2f(target, u1, u2, ustride, uorder, v1, v2, vstride, vorder, points); + CALL_Map2f(GET_DISPATCH(), + (target, u1, u2, ustride, uorder, v1, v2, vstride, vorder, + points)); } void @@ -161,7 +168,7 @@ __glXDispSwap_Map1d(GLbyte * pc) #else points = (GLdouble *) pc; #endif - glMap1d(target, u1, u2, k, order, points); + CALL_Map1d(GET_DISPATCH(), (target, u1, u2, k, order, points)); } void @@ -217,7 +224,9 @@ __glXDispSwap_Map2d(GLbyte * pc) #else points = (GLdouble *) pc; #endif - glMap2d(target, u1, u2, ustride, uorder, v1, v2, vstride, vorder, points); + CALL_Map2d(GET_DISPATCH(), + (target, u1, u2, ustride, uorder, v1, v2, vstride, vorder, + points)); } static void @@ -329,36 +338,39 @@ __glXDispSwap_DrawArrays(GLbyte * pc) switch (component) { case GL_VERTEX_ARRAY: - glEnableClientState(GL_VERTEX_ARRAY); - glVertexPointer(numVals, datatype, stride, pc); + CALL_EnableClientState(GET_DISPATCH(), (GL_VERTEX_ARRAY)); + CALL_VertexPointer(GET_DISPATCH(), (numVals, datatype, stride, pc)); break; case GL_NORMAL_ARRAY: - glEnableClientState(GL_NORMAL_ARRAY); - glNormalPointer(datatype, stride, pc); + CALL_EnableClientState(GET_DISPATCH(), (GL_NORMAL_ARRAY)); + CALL_NormalPointer(GET_DISPATCH(), (datatype, stride, pc)); break; case GL_COLOR_ARRAY: - glEnableClientState(GL_COLOR_ARRAY); - glColorPointer(numVals, datatype, stride, pc); + CALL_EnableClientState(GET_DISPATCH(), (GL_COLOR_ARRAY)); + CALL_ColorPointer(GET_DISPATCH(), (numVals, datatype, stride, pc)); break; case GL_INDEX_ARRAY: - glEnableClientState(GL_INDEX_ARRAY); - glIndexPointer(datatype, stride, pc); + CALL_EnableClientState(GET_DISPATCH(), (GL_INDEX_ARRAY)); + CALL_IndexPointer(GET_DISPATCH(), (datatype, stride, pc)); break; case GL_TEXTURE_COORD_ARRAY: - glEnableClientState(GL_TEXTURE_COORD_ARRAY); - glTexCoordPointer(numVals, datatype, stride, pc); + CALL_EnableClientState(GET_DISPATCH(), (GL_TEXTURE_COORD_ARRAY)); + CALL_TexCoordPointer(GET_DISPATCH(), + (numVals, datatype, stride, pc)); break; case GL_EDGE_FLAG_ARRAY: - glEnableClientState(GL_EDGE_FLAG_ARRAY); - glEdgeFlagPointer(stride, (const GLboolean *) pc); + CALL_EnableClientState(GET_DISPATCH(), (GL_EDGE_FLAG_ARRAY)); + CALL_EdgeFlagPointer(GET_DISPATCH(), + (stride, (const GLboolean *) pc)); break; case GL_SECONDARY_COLOR_ARRAY: - glEnableClientState(GL_SECONDARY_COLOR_ARRAY); - glSecondaryColorPointerEXT(numVals, datatype, stride, pc); + CALL_EnableClientState(GET_DISPATCH(), (GL_SECONDARY_COLOR_ARRAY)); + CALL_SecondaryColorPointer(GET_DISPATCH(), + (numVals, datatype, stride, pc)); break; case GL_FOG_COORD_ARRAY: - glEnableClientState(GL_FOG_COORD_ARRAY); - glFogCoordPointerEXT(datatype, stride, pc); + CALL_EnableClientState(GET_DISPATCH(), (GL_FOG_COORD_ARRAY)); + CALL_FogCoordPointer(GET_DISPATCH(), (datatype, stride, pc)); break; default: break; @@ -367,15 +379,15 @@ __glXDispSwap_DrawArrays(GLbyte * pc) pc += __GLX_PAD(numVals * __glXTypeSize(datatype)); } - glDrawArrays(primType, 0, numVertexes); + CALL_DrawArrays(GET_DISPATCH(), (primType, 0, numVertexes)); /* turn off anything we might have turned on */ - 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); + 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)); } |