aboutsummaryrefslogtreecommitdiff
path: root/xorg-server/glx/glxserver.h
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2010-12-01 17:52:55 +0000
committermarha <marha@users.sourceforge.net>2010-12-01 17:52:55 +0000
commita7f914ef9256ee2d287e77384c01181734fd3df2 (patch)
tree720e1f49b7a2aaab8a62271860d3eb78624f4939 /xorg-server/glx/glxserver.h
parent6cbbd31fd2f24fdda51df2de8a8f62ec83b5db03 (diff)
downloadvcxsrv-a7f914ef9256ee2d287e77384c01181734fd3df2.tar.gz
vcxsrv-a7f914ef9256ee2d287e77384c01181734fd3df2.tar.bz2
vcxsrv-a7f914ef9256ee2d287e77384c01181734fd3df2.zip
Synchronised files between glx and mesalib
Diffstat (limited to 'xorg-server/glx/glxserver.h')
-rw-r--r--xorg-server/glx/glxserver.h8
1 files changed, 4 insertions, 4 deletions
diff --git a/xorg-server/glx/glxserver.h b/xorg-server/glx/glxserver.h
index 296d453eb..b9d3933e5 100644
--- a/xorg-server/glx/glxserver.h
+++ b/xorg-server/glx/glxserver.h
@@ -66,7 +66,7 @@ typedef XID GLXDrawable;
typedef struct __GLXclientStateRec __GLXclientState;
typedef struct __GLXdrawable __GLXdrawable;
-typedef struct __GLXcontext __GLXcontext;
+typedef struct glx_context glx_context;
#include "glxscreens.h"
#include "glxdrawable.h"
@@ -94,8 +94,8 @@ void __glXScreenInitVisuals(__GLXscreen *screen);
/*
** The last context used (from the server's persective) is cached.
*/
-extern __GLXcontext *__glXLastContext;
-extern __GLXcontext *__glXForceCurrent(__GLXclientState*, GLXContextTag, int*);
+extern struct glx_context *__glXLastContext;
+extern struct glx_context *__glXForceCurrent(__GLXclientState*, GLXContextTag, int*);
extern ClientPtr __pGlxClient;
@@ -163,7 +163,7 @@ struct __GLXclientStateRec {
** Keep a list of all the contexts that are current for this client's
** threads.
*/
- __GLXcontext **currentContexts;
+ struct glx_context **currentContexts;
GLint numCurrentContexts;
/* Back pointer to X client record */