aboutsummaryrefslogtreecommitdiff
path: root/xorg-server/glx/singlepix.c
diff options
context:
space:
mode:
Diffstat (limited to 'xorg-server/glx/singlepix.c')
-rw-r--r--xorg-server/glx/singlepix.c20
1 files changed, 12 insertions, 8 deletions
diff --git a/xorg-server/glx/singlepix.c b/xorg-server/glx/singlepix.c
index a0a6a7918..98dc7c2e8 100644
--- a/xorg-server/glx/singlepix.c
+++ b/xorg-server/glx/singlepix.c
@@ -30,6 +30,10 @@
#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
+#else
+
+#include "glheader.h"
+
#endif
#include "glxserver.h"
@@ -49,7 +53,7 @@ int __glXDisp_ReadPixels(__GLXclientState *cl, GLbyte *pc)
GLenum format, type;
GLboolean swapBytes, lsbFirst;
GLint compsize;
- __GLXcontext *cx;
+ struct glx_context *cx;
ClientPtr client = cl->client;
int error;
char *answer, answerBuffer[200];
@@ -100,7 +104,7 @@ int __glXDisp_GetTexImage(__GLXclientState *cl, GLbyte *pc)
GLint level, compsize;
GLenum format, type, target;
GLboolean swapBytes;
- __GLXcontext *cx;
+ struct glx_context *cx;
ClientPtr client = cl->client;
int error;
char *answer, answerBuffer[200];
@@ -158,7 +162,7 @@ int __glXDisp_GetTexImage(__GLXclientState *cl, GLbyte *pc)
int __glXDisp_GetPolygonStipple(__GLXclientState *cl, GLbyte *pc)
{
GLboolean lsbFirst;
- __GLXcontext *cx;
+ struct glx_context *cx;
ClientPtr client = cl->client;
int error;
GLubyte answerBuffer[200];
@@ -194,7 +198,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;
char *answer, answerBuffer[200];
@@ -273,7 +277,7 @@ static int GetConvolutionFilter(__GLXclientState *cl, GLbyte *pc,
GLint compsize;
GLenum format, type, target;
GLboolean swapBytes;
- __GLXcontext *cx;
+ struct glx_context *cx;
ClientPtr client = cl->client;
int error;
char *answer, answerBuffer[200];
@@ -347,7 +351,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;
char *answer, answerBuffer[200];
@@ -410,7 +414,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;
char *answer, answerBuffer[200];
@@ -465,7 +469,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;
char *answer, answerBuffer[200];