Merge remote-tracking branch 'origin/master' into pipe-video

[mesa.git] / src / gallium / state_trackers / egl / x11 / x11_screen.h

diff --git a/src/gallium/state_trackers/egl/x11/x11_screen.h b/src/gallium/state_trackers/egl/x11/x11_screen.h
index a3c5ee1491e31ac128afb85f3ae050642ce141f4..acf1300e9d16e24459851b43c245f2af72c22a01 100644 (file)
--- a/src/gallium/state_trackers/egl/x11/x11_screen.h
+++ b/src/gallium/state_trackers/egl/x11/x11_screen.h
@@ -30,7 +30,7 @@
 #include <X11/Xutil.h>
 #include <X11/extensions/dri2tokens.h>
 #include "GL/gl.h" /* for GL types needed by __GLcontextModes */
-#include "GL/internal/glcore.h"  /* for __GLcontextModes */
+#include "glcore.h"  /* for __GLcontextModes */
 #include "pipe/p_compiler.h"
 #include "common/native.h"
 
@@ -67,12 +67,28 @@ x11_screen_support(struct x11_screen *xscr, enum x11_screen_extension ext);
 const XVisualInfo *
 x11_screen_get_visuals(struct x11_screen *xscr, int *num_visuals);
 
+uint
+x11_drawable_get_depth(struct x11_screen *xscr, Drawable drawable);
+
+#ifdef GLX_DIRECT_RENDERING
+
+/* GLX */
 const __GLcontextModes *
 x11_screen_get_glx_configs(struct x11_screen *xscr);
 
 const __GLcontextModes *
 x11_screen_get_glx_visuals(struct x11_screen *xscr);
 
+__GLcontextModes *
+x11_context_modes_create(unsigned count);
+
+void
+x11_context_modes_destroy(__GLcontextModes *modes);
+
+unsigned
+x11_context_modes_count(const __GLcontextModes *modes);
+
+/* DRI2 */
 const char *
 x11_screen_probe_dri2(struct x11_screen *xscr, int *major, int *minor);
 
@@ -81,14 +97,11 @@ x11_screen_enable_dri2(struct x11_screen *xscr,
                        x11_drawable_invalidate_buffers invalidate_buffers,
                        void *user_data);
 
-__GLcontextModes *
-x11_context_modes_create(unsigned count);
-
-void
-x11_context_modes_destroy(__GLcontextModes *modes);
+char *
+x11_screen_get_device_name(struct x11_screen *xscr);
 
-unsigned
-x11_context_modes_count(const __GLcontextModes *modes);
+int
+x11_screen_authenticate(struct x11_screen *xscr, uint32_t id);
 
 void
 x11_drawable_enable_dri2(struct x11_screen *xscr,
@@ -104,7 +117,6 @@ x11_drawable_get_buffers(struct x11_screen *xscr, Drawable drawable,
                          int *width, int *height, unsigned int *attachments,
                          boolean with_format, int num_ins, int *num_outs);
 
-uint
-x11_drawable_get_depth(struct x11_screen *xscr, Drawable drawable);
+#endif /* GLX_DIRECT_RENDERING */
 
 #endif /* _X11_SCREEN_H_ */