From 665d6d6c1e5ebbb925e73bd3637d228def5a977d Mon Sep 17 00:00:00 2001
From: =?utf8?q?Jos=C3=A9=20Fonseca?= <jfonseca@vmware.com>
Date: Wed, 28 Jan 2009 15:52:39 +0000
Subject: [PATCH] pipebuffer: Export the pipe buffer winsys hooks.

---
 src/gallium/auxiliary/pipebuffer/pb_buffer.h |  4 -
 src/gallium/auxiliary/pipebuffer/pb_winsys.c |  9 ++-
 src/gallium/auxiliary/pipebuffer/pb_winsys.h | 79 ++++++++++++++++++++
 3 files changed, 84 insertions(+), 8 deletions(-)
 create mode 100644 src/gallium/auxiliary/pipebuffer/pb_winsys.h

diff --git a/src/gallium/auxiliary/pipebuffer/pb_buffer.h b/src/gallium/auxiliary/pipebuffer/pb_buffer.h
index 4f1a8a38942..a4650e469fb 100644
--- a/src/gallium/auxiliary/pipebuffer/pb_buffer.h
+++ b/src/gallium/auxiliary/pipebuffer/pb_buffer.h
@@ -240,10 +240,6 @@ pb_malloc_buffer_create(size_t size,
                         const struct pb_desc *desc);
 
 
-void 
-pb_init_winsys(struct pipe_winsys *winsys);
-
-
 #ifdef __cplusplus
 }
 #endif
diff --git a/src/gallium/auxiliary/pipebuffer/pb_winsys.c b/src/gallium/auxiliary/pipebuffer/pb_winsys.c
index 28d137dbc43..e2f1008cc2a 100644
--- a/src/gallium/auxiliary/pipebuffer/pb_winsys.c
+++ b/src/gallium/auxiliary/pipebuffer/pb_winsys.c
@@ -38,6 +38,7 @@
 #include "util/u_memory.h"
 
 #include "pb_buffer.h"
+#include "pb_winsys.h"
 
 
 /**
@@ -110,7 +111,7 @@ pb_user_buffer_vtbl = {
 };
 
 
-static struct pipe_buffer *
+struct pipe_buffer *
 pb_winsys_user_buffer_create(struct pipe_winsys *winsys,
                              void *data, 
                              unsigned bytes) 
@@ -132,7 +133,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 +143,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 +152,7 @@ pb_winsys_buffer_unmap(struct pipe_winsys *winsys,
 }
 
 
-static void
+void
 pb_winsys_buffer_destroy(struct pipe_winsys *winsys,
                          struct pipe_buffer *buf)
 {
diff --git a/src/gallium/auxiliary/pipebuffer/pb_winsys.h b/src/gallium/auxiliary/pipebuffer/pb_winsys.h
new file mode 100644
index 00000000000..7cf6f8e3f0a
--- /dev/null
+++ b/src/gallium/auxiliary/pipebuffer/pb_winsys.h
@@ -0,0 +1,79 @@
+/**************************************************************************
+ *
+ * Copyright 2009 VMWare, Inc.
+ * All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sub license, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the
+ * next paragraph) shall be included in all copies or substantial portions
+ * of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.
+ * IN NO EVENT SHALL VMWARE AND/OR ITS SUPPLIERS BE LIABLE FOR
+ * ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+ * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+ * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ *
+ **************************************************************************/
+
+/**
+ * @file
+ * Drop-in replacements for winsys buffer callbacks.
+ *
+ * The requirement to use this functions is that all pipe_buffers must be in
+ * fact pb_buffers.
+ * 
+ * @author Jose Fonseca <jfonseca@vmware.com>
+ */
+
+#ifndef PB_WINSYS_H_
+#define PB_WINSYS_H_
+
+
+#include "pipe/p_compiler.h"
+#include "pipe/p_debug.h"
+#include "pipe/p_state.h"
+#include "pipe/p_inlines.h"
+
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+
+struct pipe_buffer *
+pb_winsys_user_buffer_create(struct pipe_winsys *winsys,
+			     void *data, 
+			     unsigned bytes);
+                                
+void *
+pb_winsys_buffer_map(struct pipe_winsys *winsys,
+		     struct pipe_buffer *buf,
+		     unsigned flags);
+
+void
+pb_winsys_buffer_unmap(struct pipe_winsys *winsys,
+		       struct pipe_buffer *buf);
+
+void
+pb_winsys_buffer_destroy(struct pipe_winsys *winsys,
+			 struct pipe_buffer *buf);
+
+void 
+pb_init_winsys(struct pipe_winsys *winsys);
+
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /*PB_WINSYS_H_*/
-- 
2.30.2