Merge commit 'origin/master' into gallium-sw-api-2

Conflicts:
	src/gallium/drivers/llvmpipe/lp_setup.c
	src/gallium/drivers/softpipe/sp_texture.c
	src/gallium/drivers/softpipe/sp_winsys.h
	src/gallium/state_trackers/egl/common/egl_g3d.c
	src/gallium/state_trackers/egl/x11/native_x11.c
	src/gallium/state_trackers/egl/x11/native_x11.h
	src/gallium/state_trackers/egl/x11/native_ximage.c

1 files changed, 29 insertions, 28 deletions

diff --git a/src/gallium/include/state_tracker/drm_api.h b/src/gallium/include/state_tracker/drm_api.h
index e9fa9b4d2a..fe7ef253ef 100644
--- a/src/gallium/include/state_tracker/drm_api.h
+++ b/src/gallium/include/state_tracker/drm_api.h
@@ -17,6 +17,32 @@ enum drm_create_screen_mode {
 	DRM_CREATE_MAX
 };
 
+#define DRM_API_HANDLE_TYPE_SHARED 0
+#define DRM_API_HANDLE_TYPE_KMS    1
+
+/**
+ * For use with pipe_screen::{texture_from_handle|texture_get_handle}.
+ */
+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.
+	 */
+	unsigned type;
+	/**
+	 * Input to texture_from_handle.
+	 * Output for texture_get_handle.
+	 */
+	unsigned handle;
+	/**
+	 * Input to texture_from_handle.
+	 * Output for texture_get_handle.
+	 */
+	unsigned stride;
+};
+
 /**
  * Modes other than DRM_CREATE_NORMAL derive from this struct.
  */
@@ -28,6 +54,8 @@ struct drm_create_screen_arg {
 
 struct drm_api
 {
+	void (*destroy)(struct drm_api *api);
+
         const char *name;
 
 	/**
@@ -36,37 +64,10 @@ struct drm_api
 	const char *driver_name;
 
 	/**
-	 * Special buffer functions
+	 * Create a pipe srcreen.
 	 */
-	/*@{*/
 	struct pipe_screen*  (*create_screen)(struct drm_api *api, int drm_fd,
 	                                      struct drm_create_screen_arg *arg);
-	/*@}*/
-
-	/**
-	 * Special buffer functions
-	 */
-	/*@{*/
-	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_texture *texture,
-	                                     unsigned *stride,
-	                                     unsigned *handle);
-	/*@}*/
-
-	void (*destroy)(struct drm_api *api);
 };
 
 extern struct drm_api * drm_api_create(void);