Merge branch 'no-validate' into gallium-0.1

1 files changed, 1 insertions, 24 deletions

diff --git a/src/gallium/auxiliary/pipebuffer/pb_bufmgr_pool.c b/src/gallium/auxiliary/pipebuffer/pb_bufmgr_pool.c
index a6ff37653e..61ac291ed7 100644
--- a/src/gallium/auxiliary/pipebuffer/pb_bufmgr_pool.c
+++ b/src/gallium/auxiliary/pipebuffer/pb_bufmgr_pool.c
@@ -30,7 +30,7 @@
  * \file
  * Batch buffer pool management.
  * 
- * \author Jose Fonseca <jrfonseca-at-tungstengraphics-dot-com>
+ * \author José Fonseca <jrfonseca-at-tungstengraphics-dot-com>
  * \author Thomas Hellström <thomas-at-tungstengraphics-dot-com>
  */
 
@@ -138,27 +138,6 @@ pool_buffer_unmap(struct pb_buffer *buf)
 }
 
 
-static enum pipe_error 
-pool_buffer_validate(struct pb_buffer *buf, 
-                     struct pb_validate *vl,
-                     unsigned flags)
-{
-   struct pool_buffer *pool_buf = pool_buffer(buf);
-   struct pool_pb_manager *pool = pool_buf->mgr;
-   return pb_validate(pool->buffer, vl, flags);
-}
-
-
-static void
-pool_buffer_fence(struct pb_buffer *buf, 
-                  struct pipe_fence_handle *fence)
-{
-   struct pool_buffer *pool_buf = pool_buffer(buf);
-   struct pool_pb_manager *pool = pool_buf->mgr;
-   pb_fence(pool->buffer, fence);
-}
-
-
 static void
 pool_buffer_get_base_buffer(struct pb_buffer *buf,
                             struct pb_buffer **base_buf,
@@ -176,8 +155,6 @@ pool_buffer_vtbl = {
       pool_buffer_destroy,
       pool_buffer_map,
       pool_buffer_unmap,
-      pool_buffer_validate,
-      pool_buffer_fence,
       pool_buffer_get_base_buffer
 };