Merge remote-tracking branch 'mareko/r300g-draw-instanced' into pipe-video

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

diff --git a/src/gallium/state_trackers/egl/x11/native_x11.h b/src/gallium/state_trackers/egl/x11/native_x11.h
index 1678403b45974e3db6f9ee06c86a20df0041eeb0..8945117276e83698e95bb45615ae7ac14b68e698 100644 (file)
--- a/src/gallium/state_trackers/egl/x11/native_x11.h
+++ b/src/gallium/state_trackers/egl/x11/native_x11.h
@@ -26,16 +26,17 @@
 #ifndef _NATIVE_X11_H_
 #define _NATIVE_X11_H_
 
-#include "state_tracker/drm_api.h"
 #include "common/native.h"
+#include <X11/Xlib.h>
 
 struct native_display *
-x11_create_ximage_display(EGLNativeDisplayType dpy,
-                          struct native_event_handler *event_handler);
+x11_create_ximage_display(Display *dpy,
+                          struct native_event_handler *event_handler,
+                          void *user_data);
 
 struct native_display *
-x11_create_dri2_display(EGLNativeDisplayType dpy,
+x11_create_dri2_display(Display *dpy,
                         struct native_event_handler *event_handler,
-                        struct drm_api *api);
+                        void *user_data);
 
 #endif /* _NATIVE_X11_H_ */