move dri_bo() to a header file

diff --git a/src/mesa/drivers/dri/intel_winsys/intel_winsys.h b/src/mesa/drivers/dri/intel_winsys/intel_winsys.h
index 6d4a5a4df32f68e71b583949c7474569a347e9b8..2c8aa20c2a3f544e886915c5683d9b9baf8752c5 100644 (file)
--- a/src/mesa/drivers/dri/intel_winsys/intel_winsys.h
+++ b/src/mesa/drivers/dri/intel_winsys/intel_winsys.h
@@ -31,6 +31,8 @@
 struct intel_context;
 struct pipe_context;
 struct pipe_winsys;
+struct pipe_buffer_handle;
+struct _DriBufferObject;
 
 struct pipe_winsys *
 intel_create_pipe_winsys( struct intel_context *intel );
@@ -42,4 +44,22 @@ struct pipe_context *
 intel_create_i915simple( struct intel_context *intel );
 
 
+
+/* Turn the pipe opaque buffer pointer into a dri_bufmgr opaque
+ * buffer pointer...
+ */
+static INLINE struct _DriBufferObject *
+dri_bo( struct pipe_buffer_handle *bo )
+{
+   return (struct _DriBufferObject *)bo;
+}
+
+static INLINE struct pipe_buffer_handle *
+pipe_bo( struct _DriBufferObject *bo )
+{
+   return (struct pipe_buffer_handle *)bo;
+}
+
+
+
 #endif

diff --git a/src/mesa/drivers/dri/intel_winsys/intel_winsys_i915.c b/src/mesa/drivers/dri/intel_winsys/intel_winsys_i915.c
index 51e3055cb0c5a440f0f7ee78db93cd2620e49427..56a27a9c31986b5426ca9cd2b3833dd7ff3f43f4 100644 (file)
--- a/src/mesa/drivers/dri/intel_winsys/intel_winsys_i915.c
+++ b/src/mesa/drivers/dri/intel_winsys/intel_winsys_i915.c
@@ -116,7 +116,7 @@ static void intel_i915_batch_flush( struct i915_winsys *sws )
    struct intel_context *intel = intel_i915_winsys(sws)->intel;
 
    intel_batchbuffer_flush( intel->batch );
-   if (0) intel_i915_batch_wait_idle( sws );
+//   if (0) intel_i915_batch_wait_idle( sws );
 }
 
 

diff --git a/src/mesa/drivers/dri/intel_winsys/intel_winsys_pipe.c b/src/mesa/drivers/dri/intel_winsys/intel_winsys_pipe.c
index 22daac6ea4308432701eb5b578ca0963ee08f371..7f47b93f096aa0fa369ab89295bf49579c494b1d 100644 (file)
--- a/src/mesa/drivers/dri/intel_winsys/intel_winsys_pipe.c
+++ b/src/mesa/drivers/dri/intel_winsys/intel_winsys_pipe.c
@@ -51,21 +51,6 @@ struct intel_pipe_winsys {
 
 
 
-/* Turn the pipe opaque buffer pointer into a dri_bufmgr opaque
- * buffer pointer...
- */
-static inline struct _DriBufferObject *
-dri_bo( struct pipe_buffer_handle *bo )
-{
-   return (struct _DriBufferObject *)bo;
-}
-
-static inline struct pipe_buffer_handle *
-pipe_bo( struct _DriBufferObject *bo )
-{
-   return (struct pipe_buffer_handle *)bo;
-}
-
 /* Turn a pipe winsys into an intel/pipe winsys:
  */
 static inline struct intel_pipe_winsys *