Import Mesa 11.2.2

1 files changed, 19 insertions, 16 deletions

diff --git a/lib/mesa/src/gallium/auxiliary/vl/vl_winsys.h b/lib/mesa/src/gallium/auxiliary/vl/vl_winsys.h
index f6b47c964..1af7653d6 100644
--- a/lib/mesa/src/gallium/auxiliary/vl/vl_winsys.h
+++ b/lib/mesa/src/gallium/auxiliary/vl/vl_winsys.h
@@ -42,28 +42,31 @@ struct pipe_loader_device;
 
 struct vl_screen
 {
-   struct pipe_screen *pscreen;
-   struct pipe_loader_device *dev;
-};
+   void (*destroy)(struct vl_screen *vscreen);
+
+   struct pipe_resource *
+   (*texture_from_drawable)(struct vl_screen *vscreen, void *drawable);
 
-struct vl_screen*
-vl_screen_create(Display *display, int screen);
+   struct u_rect *
+   (*get_dirty_area)(struct vl_screen *vscreen);
 
-void vl_screen_destroy(struct vl_screen *vscreen);
+   uint64_t
+   (*get_timestamp)(struct vl_screen *vscreen, void *drawable);
 
-struct pipe_resource*
-vl_screen_texture_from_drawable(struct vl_screen *vscreen, Drawable drawable);
+   void
+   (*set_next_timestamp)(struct vl_screen *vscreen, uint64_t stamp);
 
-struct u_rect *
-vl_screen_get_dirty_area(struct vl_screen *vscreen);
+   void *
+   (*get_private)(struct vl_screen *vscreen);
 
-uint64_t
-vl_screen_get_timestamp(struct vl_screen *vscreen, Drawable drawable);
+   struct pipe_screen *pscreen;
+   struct pipe_loader_device *dev;
+};
 
-void
-vl_screen_set_next_timestamp(struct vl_screen *vscreen, uint64_t stamp);
+struct vl_screen *
+vl_dri2_screen_create(Display *display, int screen);
 
-void*
-vl_screen_get_private(struct vl_screen *vscreen);
+struct vl_screen *
+vl_drm_screen_create(int fd);
 
 #endif