Squashed commit of the following:

[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 d3edddd5d4e0f13d3b5c760e941baa5ade0c818d..50c8c1cf191a7d738024f1e6a1e802acfd4e47fc 100644 (file)
--- a/src/gallium/include/state_tracker/drm_api.h
+++ b/src/gallium/include/state_tracker/drm_api.h
@@ -8,11 +8,12 @@ struct pipe_screen;
 struct pipe_winsys;
 struct pipe_buffer;
 struct pipe_context;
-struct pipe_texture;
+struct pipe_resource;
 
 enum drm_create_screen_mode {
        DRM_CREATE_NORMAL = 0,
        DRM_CREATE_DRI1,
+       DRM_CREATE_DRISW,
        DRM_CREATE_DRIVER = 1024,
        DRM_CREATE_MAX
 };
@@ -26,8 +27,9 @@ enum drm_create_screen_mode {
 struct winsys_handle
 {
        /**
-        * Unused for texture_from_handle, always DRM_API_HANDLE_TYPE_SHARED.
-        * Input to texture_get_handle, use TEXTURE_USAGE to select handle for kms or ipc.
+        * Unused for texture_from_handle, always
+        * DRM_API_HANDLE_TYPE_SHARED.  Input to texture_get_handle,
+        * use TEXTURE_USAGE to select handle for kms or ipc.
         */
        unsigned type;
        /**