diff options
| author | marha <marha@users.sourceforge.net> | 2013-10-31 08:40:01 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2013-10-31 08:40:01 +0100 |
| commit | e4ef724e06621be9325fc41ed886fd404467fdc0 (patch) | |
| tree | be445314647f682fbb4a1e8b94aeb6ee79cede5f /xorg-server/glx/single2.c | |
| parent | 270d3a1aa4137dc15d7b7e5a0958cc8c0bef9a1a (diff) | |
| download | vcxsrv-e4ef724e06621be9325fc41ed886fd404467fdc0.tar.gz vcxsrv-e4ef724e06621be9325fc41ed886fd404467fdc0.tar.bz2 vcxsrv-e4ef724e06621be9325fc41ed886fd404467fdc0.zip | |
fontconfig glproto libX11 mesa xserver xkeyboard-config git update 31 oct 2013
xserver commit 902ff0b3497d202b86bf9a411e17db7b694d6eaa
xkeyboard-config commit 70bbf18d6cddb7271db1b2e042765ace3c4ac485
libX11 commit 6cb02b166361200da35ba14f52cd9aaa493eb0ea
glproto commit aacc7a51b6161c765b04524e0d2ab31e5e586834
fontconfig commit 525a135ccf53e4bf3363c3143d9cfdf15fba55ab
mesa commit b16b3c8703f198ca0f025b730d582600df79c19c
Diffstat (limited to 'xorg-server/glx/single2.c')
| -rw-r--r-- | xorg-server/glx/single2.c | 18 |
1 files changed, 7 insertions, 11 deletions
diff --git a/xorg-server/glx/single2.c b/xorg-server/glx/single2.c index 9597d29fe..53b661d20 100644 --- a/xorg-server/glx/single2.c +++ b/xorg-server/glx/single2.c @@ -41,10 +41,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) @@ -72,7 +68,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; } @@ -100,7 +96,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; } @@ -123,10 +119,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; @@ -219,7 +215,7 @@ __glXDisp_Flush(__GLXclientState * cl, GLbyte * pc) return error; } - CALL_Flush(GET_DISPATCH(), ()); + glFlush(); cx->hasUnflushedCommands = GL_FALSE; return Success; } @@ -237,7 +233,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 */ @@ -346,7 +342,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) |