aboutsummaryrefslogtreecommitdiff
path: root/xorg-server/glx/single2.c
diff options
context:
space:
mode:
Diffstat (limited to 'xorg-server/glx/single2.c')
-rw-r--r--xorg-server/glx/single2.c39
1 files changed, 18 insertions, 21 deletions
diff --git a/xorg-server/glx/single2.c b/xorg-server/glx/single2.c
index c199ed1cb..8d4d1d061 100644
--- a/xorg-server/glx/single2.c
+++ b/xorg-server/glx/single2.c
@@ -38,17 +38,12 @@
#include <stdlib.h>
#include "glxserver.h"
+#include "glxutil.h"
#include "glxext.h"
-#include "singlesize.h"
-#include "unpack.h"
#include "indirect_dispatch.h"
-#include "indirect_size_get.h"
-#include "glapitable.h"
-#include "glapi.h"
-#include "glthread.h"
-#include "dispatch.h"
+#include "unpack.h"
-#include "glxutil.h"
+#include "glfunctions.h"
int
__glXDisp_FeedbackBuffer(__GLXclientState * cl, GLbyte * pc)
@@ -76,7 +71,7 @@ __glXDisp_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;
}
@@ -104,7 +99,7 @@ __glXDisp_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;
}
@@ -127,10 +122,10 @@ __glXDisp_RenderMode(__GLXclientState * cl, GLbyte * pc)
pc += __GLX_SINGLE_HDR_SIZE;
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;
@@ -197,12 +192,14 @@ __glXDisp_RenderMode(__GLXclientState * cl, GLbyte * pc)
*/
noChangeAllowed:;
client = cl->client;
- reply.type = X_Reply;
- reply.sequenceNumber = client->sequence;
- reply.length = nitems;
- reply.retval = retval;
- reply.size = nitems;
- reply.newMode = newMode;
+ reply = (xGLXRenderModeReply) {
+ .type = X_Reply,
+ .sequenceNumber = client->sequence,
+ .length = nitems,
+ .retval = retval,
+ .size = nitems,
+ .newMode = newMode
+ };
WriteToClient(client, sz_xGLXRenderModeReply, &reply);
if (retBytes) {
WriteToClient(client, retBytes, retBuffer);
@@ -221,7 +218,7 @@ __glXDisp_Flush(__GLXclientState * cl, GLbyte * pc)
return error;
}
- CALL_Flush(GET_DISPATCH(), ());
+ glFlush();
cx->hasUnflushedCommands = GL_FALSE;
return Success;
}
@@ -239,7 +236,7 @@ __glXDisp_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 */
@@ -348,7 +345,7 @@ DoGetString(__GLXclientState * cl, GLbyte * pc, GLboolean need_swap)
pc += __GLX_SINGLE_HDR_SIZE;
name = *(GLenum *) (pc + 0);
- string = (const char *) CALL_GetString(GET_DISPATCH(), (name));
+ string = (const char *) glGetString(name);
client = cl->client;
if (string == NULL)