diff options
| author | marha <marha@users.sourceforge.net> | 2010-01-14 17:14:58 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2010-01-14 17:14:58 +0000 |
| commit | 8bbcd844049eb1296ccd25aca75bf3b08f28facb (patch) | |
| tree | a4b168a1b2c686548550719b094e982124696f3d /xorg-server/glx/glxserver.h | |
| parent | 5eaf49ad7feec1f2043ecb1b90c04c534ce29f46 (diff) | |
| parent | b152ebf4b66368e1cbfda1ae81cef29bf9c00bb7 (diff) | |
| download | vcxsrv-8bbcd844049eb1296ccd25aca75bf3b08f28facb.tar.gz vcxsrv-8bbcd844049eb1296ccd25aca75bf3b08f28facb.tar.bz2 vcxsrv-8bbcd844049eb1296ccd25aca75bf3b08f28facb.zip | |
svn merge ^/branches/released .
Diffstat (limited to 'xorg-server/glx/glxserver.h')
| -rw-r--r-- | xorg-server/glx/glxserver.h | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/xorg-server/glx/glxserver.h b/xorg-server/glx/glxserver.h index 7f2f2dd76..296d453eb 100644 --- a/xorg-server/glx/glxserver.h +++ b/xorg-server/glx/glxserver.h @@ -57,7 +57,14 @@ #include <GL/glext.h>
#include <GL/glxproto.h>
-/* For glxscreens.h */
+/*
+** GLX resources.
+*/
+typedef XID GLXContextID;
+typedef XID GLXPixmap;
+typedef XID GLXDrawable;
+
+typedef struct __GLXclientStateRec __GLXclientState;
typedef struct __GLXdrawable __GLXdrawable;
typedef struct __GLXcontext __GLXcontext;
@@ -72,15 +79,6 @@ typedef struct __GLXcontext __GLXcontext; #define False 0
#endif
-/*
-** GLX resources.
-*/
-typedef XID GLXContextID;
-typedef XID GLXPixmap;
-typedef XID GLXDrawable;
-
-typedef struct __GLXclientStateRec __GLXclientState;
-
extern __GLXscreen *glxGetScreen(ScreenPtr pScreen);
extern __GLXclientState *glxGetClient(ClientPtr pClient);
@@ -252,4 +250,6 @@ extern int __glXImageSize(GLenum format, GLenum type, extern unsigned glxMajorVersion;
extern unsigned glxMinorVersion;
+extern int __glXEventBase;
+
#endif /* !__GLX_server_h__ */
|