aboutsummaryrefslogtreecommitdiff
path: root/xorg-server/glx/single2swap.c
diff options
context:
space:
mode:
Diffstat (limited to 'xorg-server/glx/single2swap.c')
-rw-r--r--xorg-server/glx/single2swap.c14
1 files changed, 9 insertions, 5 deletions
diff --git a/xorg-server/glx/single2swap.c b/xorg-server/glx/single2swap.c
index 62f3a5eac..f47e0aaff 100644
--- a/xorg-server/glx/single2swap.c
+++ b/xorg-server/glx/single2swap.c
@@ -30,6 +30,10 @@
#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
+#else
+
+#include "glheader.h"
+
#endif
#include "glxserver.h"
@@ -47,7 +51,7 @@ int __glXDispSwap_FeedbackBuffer(__GLXclientState *cl, GLbyte *pc)
GLsizei size;
GLenum type;
__GLX_DECLARE_SWAP_VARIABLES;
- __GLXcontext *cx;
+ struct glx_context *cx;
int error;
__GLX_SWAP_INT(&((xGLXSingleReq *)pc)->contextTag);
@@ -78,7 +82,7 @@ int __glXDispSwap_FeedbackBuffer(__GLXclientState *cl, GLbyte *pc)
int __glXDispSwap_SelectBuffer(__GLXclientState *cl, GLbyte *pc)
{
- __GLXcontext *cx;
+ struct glx_context *cx;
GLsizei size;
__GLX_DECLARE_SWAP_VARIABLES;
int error;
@@ -110,7 +114,7 @@ int __glXDispSwap_SelectBuffer(__GLXclientState *cl, GLbyte *pc)
int __glXDispSwap_RenderMode(__GLXclientState *cl, GLbyte *pc)
{
ClientPtr client;
- __GLXcontext *cx;
+ struct glx_context *cx;
xGLXRenderModeReply reply;
GLint nitems=0, retBytes=0, retval, newModeCheck;
GLubyte *retBuffer = NULL;
@@ -218,7 +222,7 @@ int __glXDispSwap_RenderMode(__GLXclientState *cl, GLbyte *pc)
int __glXDispSwap_Flush(__GLXclientState *cl, GLbyte *pc)
{
- __GLXcontext *cx;
+ struct glx_context *cx;
int error;
__GLX_DECLARE_SWAP_VARIABLES;
@@ -235,7 +239,7 @@ int __glXDispSwap_Flush(__GLXclientState *cl, GLbyte *pc)
int __glXDispSwap_Finish(__GLXclientState *cl, GLbyte *pc)
{
- __GLXcontext *cx;
+ struct glx_context *cx;
ClientPtr client;
int error;
__GLX_DECLARE_SWAP_VARIABLES;