Revert "pipebuffer: Ondemand buffer manager."

This reverts commit 17849eafaacfbb2124d86f561a91b707317d3b31.

4 files changed, 0 insertions, 319 deletions

diff --git a/src/gallium/auxiliary/pipebuffer/Makefile b/src/gallium/auxiliary/pipebuffer/Makefile
index 4bcf08f8a53..f9b39d9ce0a 100644
--- a/src/gallium/auxiliary/pipebuffer/Makefile
+++ b/src/gallium/auxiliary/pipebuffer/Makefile
@@ -11,7 +11,6 @@ C_SOURCES = \
 	pb_bufmgr_debug.c \
 	pb_bufmgr_fenced.c \
 	pb_bufmgr_mm.c \
-	pb_bufmgr_ondemand.c \
 	pb_bufmgr_pool.c \
 	pb_bufmgr_slab.c \
 	pb_validate.c \
diff --git a/src/gallium/auxiliary/pipebuffer/SConscript b/src/gallium/auxiliary/pipebuffer/SConscript
index 4acf7218083..56a40dda0d4 100644
--- a/src/gallium/auxiliary/pipebuffer/SConscript
+++ b/src/gallium/auxiliary/pipebuffer/SConscript
@@ -10,7 +10,6 @@ pipebuffer = env.ConvenienceLibrary(
 		'pb_bufmgr_debug.c',
 		'pb_bufmgr_fenced.c',
 		'pb_bufmgr_mm.c',
-		'pb_bufmgr_ondemand.c',
 		'pb_bufmgr_pool.c',
 		'pb_bufmgr_slab.c',
 		'pb_validate.c',
diff --git a/src/gallium/auxiliary/pipebuffer/pb_bufmgr.h b/src/gallium/auxiliary/pipebuffer/pb_bufmgr.h
index 0a8264a9243..8fe2704708f 100644
--- a/src/gallium/auxiliary/pipebuffer/pb_bufmgr.h
+++ b/src/gallium/auxiliary/pipebuffer/pb_bufmgr.h
@@ -183,20 +183,6 @@ pb_alt_manager_create(struct pb_manager *provider1,
 
 
 /** 
- * Ondemand buffer manager.
- * 
- * Buffers are created in malloc'ed memory (fast and cached), and the constents
- * is transfered to a buffer from the provider (typically in slow uncached 
- * memory) when there is an attempt to validate the buffer.
- * 
- * Ideal for situations where one does not know before hand whether a given
- * buffer will effectively be used by the hardware or not. 
- */
-struct pb_manager *
-pb_ondemand_manager_create(struct pb_manager *provider); 
-
-
-/** 
  * Debug buffer manager to detect buffer under- and overflows.
  *
  * Band size should be a multiple of the largest alignment
diff --git a/src/gallium/auxiliary/pipebuffer/pb_bufmgr_ondemand.c b/src/gallium/auxiliary/pipebuffer/pb_bufmgr_ondemand.c
deleted file mode 100644
index ba02a84e62d..00000000000
--- a/src/gallium/auxiliary/pipebuffer/pb_bufmgr_ondemand.c
+++ /dev/null
@@ -1,303 +0,0 @@
-/**************************************************************************
- *
- * Copyright 2008 Tungsten Graphics, Inc., Cedar Park, Texas.
- * 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 TUNGSTEN GRAPHICS 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
- * A variation of malloc buffers which get transferred to real graphics memory
- * when there is an attempt to validate them. 
- * 
- * @author Jose Fonseca <[email protected]>
- */
-
-
-#include "pipe/p_debug.h"
-#include "util/u_memory.h"
-#include "pb_buffer.h"
-#include "pb_bufmgr.h"
-
-
-struct pb_ondemand_manager;
-
-
-struct pb_ondemand_buffer 
-{
-   struct pb_buffer base;
-   
-   struct pb_ondemand_manager *mgr;
-   
-   /** Regular malloc'ed memory */
-   void *data;
-   unsigned mapcount;
-   
-   /** Real buffer */
-   struct pb_buffer *buffer;
-   size_t size;
-   struct pb_desc desc;
-};
-
-
-struct pb_ondemand_manager
-{
-   struct pb_manager base;
-   
-   struct pb_manager *provider;
-};
-
-
-extern const struct pb_vtbl pb_ondemand_buffer_vtbl;
-
-static INLINE struct pb_ondemand_buffer *
-pb_ondemand_buffer(struct pb_buffer *buf)
-{
-   assert(buf);
-   assert(buf->vtbl == &pb_ondemand_buffer_vtbl);
-   return (struct pb_ondemand_buffer *)buf;
-}
-
-static INLINE struct pb_ondemand_manager *
-pb_ondemand_manager(struct pb_manager *mgr)
-{
-   assert(mgr);
-   return (struct pb_ondemand_manager *)mgr;
-}
-
-
-static void
-pb_ondemand_buffer_destroy(struct pb_buffer *_buf)
-{
-   struct pb_ondemand_buffer *buf = pb_ondemand_buffer(_buf);
-   
-   pb_reference(&buf->buffer, NULL);
-   
-   align_free(buf->data);
-   
-   FREE(buf);
-}
-
-
-static void *
-pb_ondemand_buffer_map(struct pb_buffer *_buf, 
-                       unsigned flags)
-{
-   struct pb_ondemand_buffer *buf = pb_ondemand_buffer(_buf);
-
-   if(buf->buffer) {
-      assert(!buf->data);
-      return pb_map(buf->buffer, flags);
-   }
-   else {
-      assert(buf->data);
-      ++buf->mapcount;
-      return buf->data;
-   }
-}
-
-
-static void
-pb_ondemand_buffer_unmap(struct pb_buffer *_buf)
-{
-   struct pb_ondemand_buffer *buf = pb_ondemand_buffer(_buf);
-
-   if(buf->buffer) {
-      assert(!buf->data);
-      pb_unmap(buf->buffer);
-   }
-   else {
-      assert(buf->data);
-      assert(buf->mapcount);
-      if(buf->mapcount)
-         --buf->mapcount;
-   }
-}
-
-
-static enum pipe_error 
-pb_ondemand_buffer_instantiate(struct pb_ondemand_buffer *buf)
-{
-   if(!buf->buffer) {
-      struct pb_manager *provider = buf->mgr->provider;
-      uint8_t *map;
-      
-      assert(!buf->mapcount);
-      
-      buf->buffer = provider->create_buffer(provider, buf->size, &buf->desc);
-      if(!buf->buffer)
-         return PIPE_ERROR_OUT_OF_MEMORY;
-      
-      map = pb_map(buf->buffer, PIPE_BUFFER_USAGE_CPU_READ);
-      if(!map) {
-         pb_reference(&buf->buffer, NULL);
-         return PIPE_ERROR;
-      }
-      
-      memcpy(map, buf->data, buf->size);
-      
-      pb_unmap(buf->buffer);
-      
-      if(!buf->mapcount) {
-         FREE(buf->data);
-         buf->data = NULL;
-      }
-   }
-   
-   return PIPE_OK;
-}
-
-static enum pipe_error 
-pb_ondemand_buffer_validate(struct pb_buffer *_buf, 
-                            struct pb_validate *vl,
-                            unsigned flags)
-{
-   struct pb_ondemand_buffer *buf = pb_ondemand_buffer(_buf);
-   enum pipe_error ret; 
-
-   assert(!buf->mapcount);
-   if(buf->mapcount)
-      return PIPE_ERROR;
-
-   ret = pb_ondemand_buffer_instantiate(buf);
-   if(ret != PIPE_OK)
-      return ret;
-   
-   return pb_validate(buf->buffer, vl, flags);
-}
-
-
-static void
-pb_ondemand_buffer_fence(struct pb_buffer *_buf, 
-                         struct pipe_fence_handle *fence)
-{
-   struct pb_ondemand_buffer *buf = pb_ondemand_buffer(_buf);
-   
-   assert(buf->buffer);
-   if(!buf->buffer)
-      return;
-   
-   pb_fence(buf->buffer, fence);
-}
-
-
-static void
-pb_ondemand_buffer_get_base_buffer(struct pb_buffer *_buf,
-                                   struct pb_buffer **base_buf,
-                                   unsigned *offset)
-{
-   struct pb_ondemand_buffer *buf = pb_ondemand_buffer(_buf);
-
-   if(pb_ondemand_buffer_instantiate(buf) != PIPE_OK) {
-      assert(0);
-      *base_buf = &buf->base;
-      *offset = 0;
-      return;
-   }
-
-   pb_get_base_buffer(buf->buffer, base_buf, offset);
-}
-
-
-const struct pb_vtbl 
-pb_ondemand_buffer_vtbl = {
-      pb_ondemand_buffer_destroy,
-      pb_ondemand_buffer_map,
-      pb_ondemand_buffer_unmap,
-      pb_ondemand_buffer_validate,
-      pb_ondemand_buffer_fence,
-      pb_ondemand_buffer_get_base_buffer
-};
-
-
-static struct pb_buffer *
-pb_ondemand_manager_create_buffer(struct pb_manager *_mgr, 
-                                  size_t size,
-                                  const struct pb_desc *desc) 
-{
-   struct pb_ondemand_manager *mgr = pb_ondemand_manager(_mgr);
-   struct pb_ondemand_buffer *buf;
-   
-   buf = CALLOC_STRUCT(pb_ondemand_buffer);
-   if(!buf)
-      return NULL;
-
-   buf->base.base.refcount = 1;
-   buf->base.base.alignment = desc->alignment;
-   buf->base.base.usage = desc->usage;
-   buf->base.base.size = size;
-   buf->base.vtbl = &pb_ondemand_buffer_vtbl;
-   
-   buf->mgr = mgr;
-   
-   buf->data = align_malloc(size, desc->alignment < sizeof(void*) ? sizeof(void*) : desc->alignment);
-   if(!buf->data) {
-      FREE(buf);
-      return NULL;
-   }
-   
-   buf->size = size;
-   buf->desc = *desc;
-
-   return &buf->base;
-}
-
-
-static void
-pb_ondemand_manager_flush(struct pb_manager *_mgr) 
-{
-   struct pb_ondemand_manager *mgr = pb_ondemand_manager(_mgr);
-   
-   mgr->provider->flush(mgr->provider);
-}
-
-
-static void
-pb_ondemand_manager_destroy(struct pb_manager *_mgr) 
-{
-   struct pb_ondemand_manager *mgr = pb_ondemand_manager(_mgr);
-
-   FREE(mgr);
-}
-
-
-struct pb_manager *
-pb_ondemand_manager_create(struct pb_manager *provider) 
-{
-   struct pb_ondemand_manager *mgr;
-
-   if(!provider)
-      return NULL;
-   
-   mgr = CALLOC_STRUCT(pb_ondemand_manager);
-   if(!mgr)
-      return NULL;
-   
-   mgr->base.destroy = pb_ondemand_manager_destroy;
-   mgr->base.create_buffer = pb_ondemand_manager_create_buffer;
-   mgr->base.flush = pb_ondemand_manager_flush;
-   
-   mgr->provider = provider;
-
-   return &mgr->base;
-}