diff options
| author | marha <marha@users.sourceforge.net> | 2013-11-04 12:11:17 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2013-11-04 12:11:17 +0100 |
| commit | d79b6645eb21ca82d506ef038b8ea71a1e431f3f (patch) | |
| tree | 8f96f2c0492c134147a32e124ea5d0a7337b2242 /xorg-server/glx/single2swap.c | |
| parent | feb35c5e0724010fc4431e4e4fb24720fcdffe80 (diff) | |
| parent | e4ef724e06621be9325fc41ed886fd404467fdc0 (diff) | |
| download | vcxsrv-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/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 */ |