Merge commit 'origin/gallium-0.1' into gallium-0.2

Conflicts:

	src/gallium/winsys/gdi/SConscript

1 files changed, 1 insertions, 24 deletions

diff --git a/src/gallium/auxiliary/pipebuffer/pb_bufmgr_mm.c b/src/gallium/auxiliary/pipebuffer/pb_bufmgr_mm.c
index fd39838bfd..a976d3041a 100644
--- a/src/gallium/auxiliary/pipebuffer/pb_bufmgr_mm.c
+++ b/src/gallium/auxiliary/pipebuffer/pb_bufmgr_mm.c
@@ -29,7 +29,7 @@
  * \file
  * Buffer manager using the old texture memory manager.
  * 
- * \author Jose Fonseca <jrfonseca@tungstengraphics.com>
+ * \author José Fonseca <jrfonseca@tungstengraphics.com>
  */
 
 
@@ -124,27 +124,6 @@ mm_buffer_unmap(struct pb_buffer *buf)
 }
 
 
-static enum pipe_error 
-mm_buffer_validate(struct pb_buffer *buf, 
-                   struct pb_validate *vl,
-                   unsigned flags)
-{
-   struct mm_buffer *mm_buf = mm_buffer(buf);
-   struct mm_pb_manager *mm = mm_buf->mgr;
-   return pb_validate(mm->buffer, vl, flags);
-}
-
-
-static void
-mm_buffer_fence(struct pb_buffer *buf, 
-                struct pipe_fence_handle *fence)
-{
-   struct mm_buffer *mm_buf = mm_buffer(buf);
-   struct mm_pb_manager *mm = mm_buf->mgr;
-   pb_fence(mm->buffer, fence);
-}
-
-
 static void
 mm_buffer_get_base_buffer(struct pb_buffer *buf,
                           struct pb_buffer **base_buf,
@@ -162,8 +141,6 @@ mm_buffer_vtbl = {
       mm_buffer_destroy,
       mm_buffer_map,
       mm_buffer_unmap,
-      mm_buffer_validate,
-      mm_buffer_fence,
       mm_buffer_get_base_buffer
 };