svn merge ^/branches/released .

1 files changed, 251 insertions, 0 deletions

diff --git a/mesalib/src/gallium/auxiliary/util/u_upload_mgr.c b/mesalib/src/gallium/auxiliary/util/u_upload_mgr.c
new file mode 100644
index 000000000..e2e7829fb
--- /dev/null
+++ b/mesalib/src/gallium/auxiliary/util/u_upload_mgr.c
@@ -0,0 +1,251 @@
+/**************************************************************************

+ * 

+ * 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.

+ * 

+ **************************************************************************/

+

+/* Helper utility for uploading user buffers & other data, and

+ * coalescing small buffers into larger ones.

+ */

+

+#include "pipe/p_defines.h"

+#include "util/u_inlines.h"

+#include "pipe/p_context.h"

+#include "util/u_memory.h"

+#include "util/u_math.h"

+

+#include "u_upload_mgr.h"

+

+

+struct u_upload_mgr {

+   struct pipe_context *pipe;

+

+   unsigned default_size;  /* Minimum size of the upload buffer, in bytes. */

+   unsigned alignment;     /* Alignment of each sub-allocation. */

+   unsigned bind;          /* Bitmask of PIPE_BIND_* flags. */

+

+   struct pipe_resource *buffer;   /* Upload buffer. */

+   struct pipe_transfer *transfer; /* Transfer object for the upload buffer. */

+   uint8_t *map;    /* Pointer to the mapped upload buffer. */

+   unsigned size;   /* Actual size of the upload buffer. */

+   unsigned offset; /* Aligned offset to the upload buffer, pointing

+                     * at the first unused byte. */

+};

+

+

+struct u_upload_mgr *u_upload_create( struct pipe_context *pipe,

+                                      unsigned default_size,

+                                      unsigned alignment,

+                                      unsigned bind )

+{

+   struct u_upload_mgr *upload = CALLOC_STRUCT( u_upload_mgr );

+   if (!upload)

+      return NULL;

+

+   upload->pipe = pipe;

+   upload->default_size = default_size;

+   upload->alignment = alignment;

+   upload->bind = bind;

+   upload->buffer = NULL;

+

+   return upload;

+}

+

+/* Release old buffer.

+ * 

+ * This must usually be called prior to firing the command stream

+ * which references the upload buffer, as many memory managers will

+ * cause subsequent maps of a fired buffer to wait.

+ *

+ * Can improve this with a change to pipe_buffer_write to use the

+ * DONT_WAIT bit, but for now, it's easiest just to grab a new buffer.

+ */

+void u_upload_flush( struct u_upload_mgr *upload )

+{

+   /* Unmap and unreference the upload buffer. */

+   if (upload->transfer) {

+      if (upload->offset) {

+         pipe_buffer_flush_mapped_range(upload->pipe, upload->transfer,

+                                        0, upload->offset);

+      }

+      pipe_transfer_unmap(upload->pipe, upload->transfer);

+      pipe_transfer_destroy(upload->pipe, upload->transfer);

+      upload->transfer = NULL;

+   }

+   pipe_resource_reference( &upload->buffer, NULL );

+   upload->size = 0;

+}

+

+

+void u_upload_destroy( struct u_upload_mgr *upload )

+{

+   u_upload_flush( upload );

+   FREE( upload );

+}

+

+

+static enum pipe_error 

+u_upload_alloc_buffer( struct u_upload_mgr *upload,

+                       unsigned min_size )

+{

+   unsigned size;

+

+   /* Release the old buffer, if present:

+    */

+   u_upload_flush( upload );

+

+   /* Allocate a new one: 

+    */

+   size = align(MAX2(upload->default_size, min_size), 4096);

+

+   upload->buffer = pipe_buffer_create( upload->pipe->screen,

+                                        upload->bind,

+                                        PIPE_USAGE_STREAM,

+                                        size );

+   if (upload->buffer == NULL) 

+      goto fail;

+

+   /* Map the new buffer. */

+   upload->map = pipe_buffer_map_range(upload->pipe, upload->buffer,

+                                       0, size,

+                                       PIPE_TRANSFER_WRITE |

+                                       PIPE_TRANSFER_FLUSH_EXPLICIT,

+                                       &upload->transfer);

+   

+   upload->size = size;

+

+   upload->offset = 0;

+   return 0;

+

+fail:

+   if (upload->buffer)

+      pipe_resource_reference( &upload->buffer, NULL );

+

+   return PIPE_ERROR_OUT_OF_MEMORY;

+}

+

+enum pipe_error u_upload_alloc( struct u_upload_mgr *upload,

+                                unsigned min_out_offset,

+                                unsigned size,

+                                unsigned *out_offset,

+                                struct pipe_resource **outbuf,

+                                boolean *flushed,

+                                void **ptr )

+{

+   unsigned alloc_size = align( size, upload->alignment );

+   unsigned alloc_offset = align(min_out_offset, upload->alignment);

+   unsigned offset;

+

+   /* Make sure we have enough space in the upload buffer

+    * for the sub-allocation. */

+   if (MAX2(upload->offset, alloc_offset) + alloc_size > upload->size) {

+      enum pipe_error ret = u_upload_alloc_buffer(upload,

+                                                  alloc_offset + alloc_size);

+      if (ret)

+         return ret;

+

+      *flushed = TRUE;

+   } else {

+      *flushed = FALSE;

+   }

+

+   offset = MAX2(upload->offset, alloc_offset);

+

+   assert(offset < upload->buffer->width0);

+   assert(offset + size <= upload->buffer->width0);

+   assert(size);

+

+   /* Emit the return values: */

+   *ptr = upload->map + offset;

+   pipe_resource_reference( outbuf, upload->buffer );

+   *out_offset = offset;

+

+   upload->offset = offset + alloc_size;

+   return PIPE_OK;

+}

+

+enum pipe_error u_upload_data( struct u_upload_mgr *upload,

+                               unsigned min_out_offset,

+                               unsigned size,

+                               const void *data,

+                               unsigned *out_offset,

+                               struct pipe_resource **outbuf,

+                               boolean *flushed )

+{

+   uint8_t *ptr;

+   enum pipe_error ret = u_upload_alloc(upload, min_out_offset, size,

+                                        out_offset, outbuf, flushed,

+                                        (void**)&ptr);

+   if (ret)

+      return ret;

+

+   memcpy(ptr, data, size);

+   return PIPE_OK;

+}

+

+

+/* As above, but upload the full contents of a buffer.  Useful for

+ * uploading user buffers, avoids generating an explosion of GPU

+ * buffers if you have an app that does lots of small vertex buffer

+ * renders or DrawElements calls.

+ */

+enum pipe_error u_upload_buffer( struct u_upload_mgr *upload,

+                                 unsigned min_out_offset,

+                                 unsigned offset,

+                                 unsigned size,

+                                 struct pipe_resource *inbuf,

+                                 unsigned *out_offset,

+                                 struct pipe_resource **outbuf,

+                                 boolean *flushed )

+{

+   enum pipe_error ret = PIPE_OK;

+   struct pipe_transfer *transfer = NULL;

+   const char *map = NULL;

+

+   map = (const char *)pipe_buffer_map(upload->pipe,

+				       inbuf,

+				       PIPE_TRANSFER_READ,

+				       &transfer);

+

+   if (map == NULL) {

+      ret = PIPE_ERROR_OUT_OF_MEMORY;

+      goto done;

+   }

+

+   if (0)

+      debug_printf("upload ptr %p ofs %d sz %d\n", map, offset, size);

+

+   ret = u_upload_data( upload,

+                        min_out_offset,

+                        size,

+                        map + offset,

+                        out_offset,

+                        outbuf, flushed );

+

+done:

+   if (map)

+      pipe_buffer_unmap( upload->pipe, transfer );

+

+   return ret;

+}