Merge branch 'mesa_7_7_branch'

[mesa.git] / src / gallium / include / state_tracker / drm_api.h

diff --git a/src/gallium/include/state_tracker/drm_api.h b/src/gallium/include/state_tracker/drm_api.h
index 7a38b508fbe3dcb9be5b0e7f06433a86988b07f7..b248a81880866e4e25e6e31713383c06ab5d8a89 100644 (file)
--- a/src/gallium/include/state_tracker/drm_api.h
+++ b/src/gallium/include/state_tracker/drm_api.h
@@ -28,6 +28,13 @@ struct drm_create_screen_arg {
 
 struct drm_api
 {
+        const char *name;
+
+       /**
+        * Kernel driver name, as accepted by drmOpenByName.
+        */
+       const char *driver_name;
+
        /**
         * Special buffer functions
         */
@@ -42,21 +49,22 @@ struct drm_api
         * Special buffer functions
         */
        /*@{*/
-       boolean (*buffer_from_texture)(struct drm_api *api,
-                                      struct pipe_texture *texture,
-                                      struct pipe_buffer **buffer,
-                                      unsigned *stride);
-       struct pipe_buffer* (*buffer_from_handle)(struct drm_api *api,
-                                                 struct pipe_screen *screen,
-                                                  const char *name,
-                                                  unsigned handle);
-       boolean (*handle_from_buffer)(struct drm_api *api,
-                                     struct pipe_screen *screen,
-                                     struct pipe_buffer *buffer,
-                                     unsigned *handle);
-       boolean (*global_handle_from_buffer)(struct drm_api *api,
+       struct pipe_texture*
+           (*texture_from_shared_handle)(struct drm_api *api,
+                                         struct pipe_screen *screen,
+                                         struct pipe_texture *templ,
+                                         const char *name,
+                                         unsigned stride,
+                                         unsigned handle);
+       boolean (*shared_handle_from_texture)(struct drm_api *api,
+                                             struct pipe_screen *screen,
+                                             struct pipe_texture *texture,
+                                             unsigned *stride,
+                                             unsigned *handle);
+       boolean (*local_handle_from_texture)(struct drm_api *api,
                                             struct pipe_screen *screen,
-                                            struct pipe_buffer *buffer,
+                                            struct pipe_texture *texture,
+                                            unsigned *stride,
                                             unsigned *handle);
        /*@}*/