Mesa (gallium-winsys-handle): st/drm: Don't use pipe defines

[Jakob Bornecrantz]

Module: Mesa
Branch: gallium-winsys-handle
Commit: 5d0b9767ff4c24c404ce34170f75f8c8fbbba141
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=5d0b9767ff4c24c404ce34170f75f8c8fbbba141

Author: Jakob Bornecrantz <jakob at vmware.com>
Date:   Wed Feb 17 20:45:12 2010 +0000

st/drm: Don't use pipe defines

Don't force winsys to include p_defines to read the flags

---

 src/gallium/include/state_tracker/drm_api.h   |    7 +++++--
 src/gallium/state_trackers/xorg/xorg_crtc.c   |    2 +-
 src/gallium/state_trackers/xorg/xorg_dri2.c   |    2 +-
 src/gallium/state_trackers/xorg/xorg_driver.c |    1 +
 4 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/gallium/include/state_tracker/drm_api.h b/src/gallium/include/state_tracker/drm_api.h
index bac2137..d3edddd 100644
--- a/src/gallium/include/state_tracker/drm_api.h
+++ b/src/gallium/include/state_tracker/drm_api.h
@@ -17,16 +17,19 @@ 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.
+	 * 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 usage;
+	unsigned type;
 	/**
 	 * Input to texture_from_handle.
 	 * Output for texture_get_handle.
diff --git a/src/gallium/state_trackers/xorg/xorg_crtc.c b/src/gallium/state_trackers/xorg/xorg_crtc.c
index 3b20f00..4a77f54 100644
--- a/src/gallium/state_trackers/xorg/xorg_crtc.c
+++ b/src/gallium/state_trackers/xorg/xorg_crtc.c
@@ -210,7 +210,7 @@ crtc_load_cursor_argb_ga3d(xf86CrtcPtr crtc, CARD32 * image)
 	templat.height0 = 64;
 
 	memset(&whandle, 0, sizeof(whandle));
-	whandle.usage = PIPE_TEXTURE_USAGE_PRIMARY;
+	whandle.type = DRM_API_HANDLE_TYPE_KMS;
 
 	crtcp->cursor_tex = ms->screen->texture_create(ms->screen,
 						       &templat);
diff --git a/src/gallium/state_trackers/xorg/xorg_dri2.c b/src/gallium/state_trackers/xorg/xorg_dri2.c
index fe2b305..5472285 100644
--- a/src/gallium/state_trackers/xorg/xorg_dri2.c
+++ b/src/gallium/state_trackers/xorg/xorg_dri2.c
@@ -155,7 +155,7 @@ dri2_do_create_buffer(DrawablePtr pDraw, DRI2BufferPtr buffer, unsigned int form
 	FatalError("NO TEXTURE IN DRI2\n");
 
     memset(&whandle, 0, sizeof(whandle));
-    whandle.usage = PIPE_TEXTURE_USAGE_DISPLAY_TARGET;
+    whandle.type = DRM_API_HANDLE_TYPE_SHARED;
 
     ms->screen->texture_get_handle(ms->screen, tex, &whandle);
 
diff --git a/src/gallium/state_trackers/xorg/xorg_driver.c b/src/gallium/state_trackers/xorg/xorg_driver.c
index e35b6e4..a7fb98a 100644
--- a/src/gallium/state_trackers/xorg/xorg_driver.c
+++ b/src/gallium/state_trackers/xorg/xorg_driver.c
@@ -921,6 +921,7 @@ drv_create_front_buffer_ga3d(ScrnInfoPtr pScrn)
 	return FALSE;
 
     memset(&whandle, 0, sizeof(whandle));
+    whandle.type = DRM_API_HANDLE_TYPE_KMS;
 
     if (!ms->screen->texture_get_handle(ms->screen, tex, &whandle))
 	goto err_destroy;