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

[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 ea0b91c581367ffe8000fa03ab7fd6720b11ae6c..883a4d2b40c439e7e750103c4312796d9717d9a2 100644 (file)
--- a/src/gallium/include/state_tracker/drm_api.h
+++ b/src/gallium/include/state_tracker/drm_api.h
@@ -29,19 +29,19 @@ 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
         */
        /*@{*/
        struct pipe_screen*  (*create_screen)(struct drm_api *api, int drm_fd,
                                              struct drm_create_screen_arg *arg);
-       struct pipe_context* (*create_context)(struct drm_api *api,
-                                              struct pipe_screen *screen);
-        struct pipe_video_context* (*create_video_context)(struct drm_api *api,
-                                                           struct pipe_screen *screen,
-                                                           enum pipe_video_profile profile,
-                                                           enum pipe_video_chroma_format chroma_format,
-                                                           unsigned width, unsigned height);
        /*@}*/
 
        /**