gallium: make p_winsys internal

[mesa.git] / src / gallium / auxiliary / pipebuffer / pb_winsys.c

diff --git a/src/gallium/auxiliary/pipebuffer/pb_winsys.c b/src/gallium/auxiliary/pipebuffer/pb_winsys.c
index 28d137dbc43d9e96dd5b0f00e2afe64243f84acc..d26800be488c1d08898c358412e3f2e6514737cf 100644 (file)
--- a/src/gallium/auxiliary/pipebuffer/pb_winsys.c
+++ b/src/gallium/auxiliary/pipebuffer/pb_winsys.c
@@ -30,14 +30,15 @@
  * Implementation of client buffer (also designated as "user buffers"), which
  * are just state-tracker owned data masqueraded as buffers.
  * 
- * \author José Fonseca <jrfonseca@tungstengraphics.com>
+ * \author Jose Fonseca <jrfonseca@tungstengraphics.com>
  */
 
 
-#include "pipe/p_winsys.h"
+#include "pipe/internal/p_winsys_screen.h"
 #include "util/u_memory.h"
 
 #include "pb_buffer.h"
+#include "pb_winsys.h"
 
 
 /**
@@ -91,6 +92,24 @@ pb_user_buffer_unmap(struct pb_buffer *buf)
 }
 
 
+static enum pipe_error 
+pb_user_buffer_validate(struct pb_buffer *buf, 
+                        struct pb_validate *vl,
+                        unsigned flags)
+{
+   assert(0);
+   return PIPE_ERROR;
+}
+
+
+static void
+pb_user_buffer_fence(struct pb_buffer *buf, 
+                     struct pipe_fence_handle *fence)
+{
+   assert(0);
+}
+
+
 static void
 pb_user_buffer_get_base_buffer(struct pb_buffer *buf,
                                struct pb_buffer **base_buf,
@@ -106,11 +125,13 @@ pb_user_buffer_vtbl = {
       pb_user_buffer_destroy,
       pb_user_buffer_map,
       pb_user_buffer_unmap,
+      pb_user_buffer_validate,
+      pb_user_buffer_fence,
       pb_user_buffer_get_base_buffer
 };
 
 
-static struct pipe_buffer *
+struct pipe_buffer *
 pb_winsys_user_buffer_create(struct pipe_winsys *winsys,
                              void *data, 
                              unsigned bytes) 
@@ -132,7 +153,7 @@ pb_winsys_user_buffer_create(struct pipe_winsys *winsys,
 }
 
 
-static void *
+void *
 pb_winsys_buffer_map(struct pipe_winsys *winsys,
                      struct pipe_buffer *buf,
                      unsigned flags)
@@ -142,7 +163,7 @@ pb_winsys_buffer_map(struct pipe_winsys *winsys,
 }
 
 
-static void
+void
 pb_winsys_buffer_unmap(struct pipe_winsys *winsys,
                        struct pipe_buffer *buf)
 {
@@ -151,7 +172,7 @@ pb_winsys_buffer_unmap(struct pipe_winsys *winsys,
 }
 
 
-static void
+void
 pb_winsys_buffer_destroy(struct pipe_winsys *winsys,
                          struct pipe_buffer *buf)
 {