diff options
Diffstat (limited to 'xorg-server/glx/single2swap.c')
| -rw-r--r-- | xorg-server/glx/single2swap.c | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/xorg-server/glx/single2swap.c b/xorg-server/glx/single2swap.c index 47ff3e4c7..e410d30e1 100644 --- a/xorg-server/glx/single2swap.c +++ b/xorg-server/glx/single2swap.c @@ -38,10 +38,6 @@ #include "glxext.h" #include "indirect_dispatch.h" #include "unpack.h" -#include "glapitable.h" -#include "glapi.h" -#include "glthread.h" -#include "dispatch.h" int __glXDispSwap_FeedbackBuffer(__GLXclientState * cl, GLbyte * pc) @@ -74,7 +70,7 @@ __glXDispSwap_FeedbackBuffer(__GLXclientState * cl, GLbyte * pc) } cx->feedbackBufSize = size; } - CALL_FeedbackBuffer(GET_DISPATCH(), (size, type, cx->feedbackBuf)); + glFeedbackBuffer(size, type, cx->feedbackBuf); cx->hasUnflushedCommands = GL_TRUE; return Success; } @@ -106,7 +102,7 @@ __glXDispSwap_SelectBuffer(__GLXclientState * cl, GLbyte * pc) } cx->selectBufSize = size; } - CALL_SelectBuffer(GET_DISPATCH(), (size, cx->selectBuf)); + glSelectBuffer(size, cx->selectBuf); cx->hasUnflushedCommands = GL_TRUE; return Success; } @@ -134,10 +130,10 @@ __glXDispSwap_RenderMode(__GLXclientState * cl, GLbyte * pc) pc += __GLX_SINGLE_HDR_SIZE; __GLX_SWAP_INT(pc); newMode = *(GLenum *) pc; - retval = CALL_RenderMode(GET_DISPATCH(), (newMode)); + retval = glRenderMode(newMode); /* Check that render mode worked */ - CALL_GetIntegerv(GET_DISPATCH(), (GL_RENDER_MODE, &newModeCheck)); + glGetIntegerv(GL_RENDER_MODE, &newModeCheck); if (newModeCheck != newMode) { /* Render mode change failed. Bail */ newMode = newModeCheck; @@ -238,7 +234,7 @@ __glXDispSwap_Flush(__GLXclientState * cl, GLbyte * pc) return error; } - CALL_Flush(GET_DISPATCH(), ()); + glFlush(); cx->hasUnflushedCommands = GL_FALSE; return Success; } @@ -259,7 +255,7 @@ __glXDispSwap_Finish(__GLXclientState * cl, GLbyte * pc) } /* Do a local glFinish */ - CALL_Finish(GET_DISPATCH(), ()); + glFinish(); cx->hasUnflushedCommands = GL_FALSE; /* Send empty reply packet to indicate finish is finished */ |