aboutsummaryrefslogtreecommitdiff
path: root/xorg-server/glx/single2.c
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2013-11-04 12:11:17 +0100
committermarha <marha@users.sourceforge.net>2013-11-04 12:11:17 +0100
commitd79b6645eb21ca82d506ef038b8ea71a1e431f3f (patch)
tree8f96f2c0492c134147a32e124ea5d0a7337b2242 /xorg-server/glx/single2.c
parentfeb35c5e0724010fc4431e4e4fb24720fcdffe80 (diff)
parente4ef724e06621be9325fc41ed886fd404467fdc0 (diff)
downloadvcxsrv-d79b6645eb21ca82d506ef038b8ea71a1e431f3f.tar.gz
vcxsrv-d79b6645eb21ca82d506ef038b8ea71a1e431f3f.tar.bz2
vcxsrv-d79b6645eb21ca82d506ef038b8ea71a1e431f3f.zip
Merge remote-tracking branch 'origin/released'
* origin/released: fontconfig glproto libX11 mesa xserver xkeyboard-config git update 31 oct 2013 Conflicts: xorg-server/glx/dispatch.h xorg-server/glx/glapi.c xorg-server/glx/glapi.h xorg-server/glx/glapi_gentable.c xorg-server/glx/glapitable.h xorg-server/glx/glprocs.h xorg-server/glx/glxcmdsswap.c xorg-server/glx/glxdri.c xorg-server/glx/glxext.c xorg-server/glx/glxext.h xorg-server/glx/indirect_dispatch.c xorg-server/glx/indirect_dispatch.h xorg-server/glx/indirect_dispatch_swap.c xorg-server/glx/indirect_reqsize.c xorg-server/glx/indirect_reqsize.h xorg-server/glx/indirect_size.h xorg-server/glx/indirect_size_get.c xorg-server/glx/indirect_size_get.h xorg-server/glx/indirect_table.c xorg-server/glx/indirect_texture_compression.c xorg-server/glx/render2.c xorg-server/glx/render2swap.c
Diffstat (limited to 'xorg-server/glx/single2.c')
-rw-r--r--xorg-server/glx/single2.c18
1 files changed, 7 insertions, 11 deletions
diff --git a/xorg-server/glx/single2.c b/xorg-server/glx/single2.c
index 4bf65ed93..2719697ed 100644
--- a/xorg-server/glx/single2.c
+++ b/xorg-server/glx/single2.c
@@ -42,10 +42,6 @@
#include "glxext.h"
#include "indirect_dispatch.h"
#include "unpack.h"
-#include "glapitable.h"
-#include "glapi.h"
-#include "glthread.h"
-#include "dispatch.h"
int
__glXDisp_FeedbackBuffer(__GLXclientState * cl, GLbyte * pc)
@@ -73,7 +69,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;
}
@@ -101,7 +97,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;
}
@@ -124,10 +120,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;
@@ -218,7 +214,7 @@ __glXDisp_Flush(__GLXclientState * cl, GLbyte * pc)
return error;
}
- CALL_Flush(GET_DISPATCH(), ());
+ glFlush();
cx->hasUnflushedCommands = GL_FALSE;
return Success;
}
@@ -236,7 +232,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 */
@@ -345,7 +341,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)