summaryrefslogtreecommitdiff
path: root/src/gallium/state_trackers/egl/x11/glxinit.h
diff options
context:
space:
mode:
authorKristian Høgsberg <krh@bitplanet.net>2010-07-28 22:18:14 -0400
committerKristian Høgsberg <krh@bitplanet.net>2010-07-28 22:18:58 -0400
commitaa44bd9189848b91619335207b8ec3be5679f982 (patch)
treea40a9a8361e3eebbc35491002a2f077b260530ce /src/gallium/state_trackers/egl/x11/glxinit.h
parent42c1f27149828e5b5143f5e53ca3bd7c04a4e762 (diff)
Untangle gallium/egl/glx source sharing mess and make it compile again
Diffstat (limited to 'src/gallium/state_trackers/egl/x11/glxinit.h')
-rw-r--r--src/gallium/state_trackers/egl/x11/glxinit.h19
1 files changed, 15 insertions, 4 deletions
diff --git a/src/gallium/state_trackers/egl/x11/glxinit.h b/src/gallium/state_trackers/egl/x11/glxinit.h
index 1cc7c460fe..4078aef2fe 100644
--- a/src/gallium/state_trackers/egl/x11/glxinit.h
+++ b/src/gallium/state_trackers/egl/x11/glxinit.h
@@ -2,10 +2,21 @@
#define GLXINIT_INCLUDED
#include <X11/Xlib.h>
-#include "glxclient.h"
+#include <GL/gl.h>
-/* this is used by DRI loaders */
-extern void
-_gl_context_modes_destroy(__GLcontextModes * modes);
+typedef struct {
+ __GLcontextModes *configs;
+ char *serverGLXexts;
+} __GLXscreenConfigs;
+
+typedef struct {
+ Display *dpy;
+ __GLXscreenConfigs **screenConfigs;
+ char *serverGLXversion;
+ int majorOpcode;
+ struct x11_screen *xscr;
+} __GLXdisplayPrivate;
+
+extern __GLXdisplayPrivate *__glXInitialize(Display * dpy);
#endif /* GLXINIT_INCLUDED */