aboutsummaryrefslogtreecommitdiff
path: root/xorg-server/glx/singlepixswap.c
diff options
context:
space:
mode:
Diffstat (limited to 'xorg-server/glx/singlepixswap.c')
-rw-r--r--xorg-server/glx/singlepixswap.c20
1 files changed, 12 insertions, 8 deletions
diff --git a/xorg-server/glx/singlepixswap.c b/xorg-server/glx/singlepixswap.c
index a7febc9a6..b6b2a07b0 100644
--- a/xorg-server/glx/singlepixswap.c
+++ b/xorg-server/glx/singlepixswap.c
@@ -30,6 +30,10 @@
#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
+#else
+
+#include "glheader.h"
+
#endif
#include "glxserver.h"
@@ -50,7 +54,7 @@ int __glXDispSwap_ReadPixels(__GLXclientState *cl, GLbyte *pc)
GLboolean swapBytes, lsbFirst;
GLint compsize;
__GLX_DECLARE_SWAP_VARIABLES;
- __GLXcontext *cx;
+ struct glx_context *cx;
ClientPtr client = cl->client;
int error;
char *answer, answerBuffer[200];
@@ -112,7 +116,7 @@ int __glXDispSwap_GetTexImage(__GLXclientState *cl, GLbyte *pc)
GLenum format, type, target;
GLboolean swapBytes;
__GLX_DECLARE_SWAP_VARIABLES;
- __GLXcontext *cx;
+ struct glx_context *cx;
ClientPtr client = cl->client;
int error;
char *answer, answerBuffer[200];
@@ -181,7 +185,7 @@ int __glXDispSwap_GetTexImage(__GLXclientState *cl, GLbyte *pc)
int __glXDispSwap_GetPolygonStipple(__GLXclientState *cl, GLbyte *pc)
{
GLboolean lsbFirst;
- __GLXcontext *cx;
+ struct glx_context *cx;
ClientPtr client = cl->client;
int error;
GLubyte answerBuffer[200];
@@ -219,7 +223,7 @@ static int GetSeparableFilter(__GLXclientState *cl, GLbyte *pc, GLXContextTag ta
GLint compsize, compsize2;
GLenum format, type, target;
GLboolean swapBytes;
- __GLXcontext *cx;
+ struct glx_context *cx;
ClientPtr client = cl->client;
int error;
__GLX_DECLARE_SWAP_VARIABLES;
@@ -304,7 +308,7 @@ static int GetConvolutionFilter(__GLXclientState *cl, GLbyte *pc, GLXContextTag
GLint compsize;
GLenum format, type, target;
GLboolean swapBytes;
- __GLXcontext *cx;
+ struct glx_context *cx;
ClientPtr client = cl->client;
int error;
__GLX_DECLARE_SWAP_VARIABLES;
@@ -383,7 +387,7 @@ static int GetHistogram(__GLXclientState *cl, GLbyte *pc, GLXContextTag tag)
GLint compsize;
GLenum format, type, target;
GLboolean swapBytes, reset;
- __GLXcontext *cx;
+ struct glx_context *cx;
ClientPtr client = cl->client;
int error;
__GLX_DECLARE_SWAP_VARIABLES;
@@ -451,7 +455,7 @@ static int GetMinmax(__GLXclientState *cl, GLbyte *pc, GLXContextTag tag)
GLint compsize;
GLenum format, type, target;
GLboolean swapBytes, reset;
- __GLXcontext *cx;
+ struct glx_context *cx;
ClientPtr client = cl->client;
int error;
__GLX_DECLARE_SWAP_VARIABLES;
@@ -511,7 +515,7 @@ static int GetColorTable(__GLXclientState *cl, GLbyte *pc, GLXContextTag tag)
GLint compsize;
GLenum format, type, target;
GLboolean swapBytes;
- __GLXcontext *cx;
+ struct glx_context *cx;
ClientPtr client = cl->client;
int error;
__GLX_DECLARE_SWAP_VARIABLES;