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

Conflicts:

	src/gallium/winsys/gdi/SConscript

1 files changed, 0 insertions, 20 deletions

diff --git a/src/gallium/auxiliary/pipebuffer/pb_buffer_malloc.c b/src/gallium/auxiliary/pipebuffer/pb_buffer_malloc.c
index 53f497cfb0..1bf22a2ec0 100644
--- a/src/gallium/auxiliary/pipebuffer/pb_buffer_malloc.c
+++ b/src/gallium/auxiliary/pipebuffer/pb_buffer_malloc.c
@@ -81,24 +81,6 @@ malloc_buffer_unmap(struct pb_buffer *buf)
 }
 
 
-static enum pipe_error 
-malloc_buffer_validate(struct pb_buffer *buf, 
-                       struct pb_validate *vl,
-                       unsigned flags)
-{
-   assert(0);
-   return PIPE_ERROR;
-}
-
-
-static void
-malloc_buffer_fence(struct pb_buffer *buf, 
-                    struct pipe_fence_handle *fence)
-{
-   assert(0);
-}
-
-
 static void
 malloc_buffer_get_base_buffer(struct pb_buffer *buf,
                               struct pb_buffer **base_buf,
@@ -114,8 +96,6 @@ malloc_buffer_vtbl = {
       malloc_buffer_destroy,
       malloc_buffer_map,
       malloc_buffer_unmap,
-      malloc_buffer_validate,
-      malloc_buffer_fence,
       malloc_buffer_get_base_buffer
 };