From ada3d8f31ef3aeeb73d6d365738a2d1968ced596 Mon Sep 17 00:00:00 2001 From: Marek Olšák Date: Tue, 31 May 2016 19:06:45 +0200 Subject: gallium/u_suballoc: allow different alignment for each allocation MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Just move the alignment parameter from u_suballocator_create to u_suballocator_alloc. Reviewed-by: Alex Deucher Tested-by: Grazvydas Ignotas Tested-by: Dieter Nützel --- src/gallium/auxiliary/util/u_suballoc.c | 22 ++++++++++------------ 1 file changed, 10 insertions(+), 12 deletions(-) (limited to 'src/gallium/auxiliary/util/u_suballoc.c') diff --git a/src/gallium/auxiliary/util/u_suballoc.c b/src/gallium/auxiliary/util/u_suballoc.c index 3f9ede075f2..5aaddbcb55c 100644 --- a/src/gallium/auxiliary/util/u_suballoc.c +++ b/src/gallium/auxiliary/util/u_suballoc.c @@ -41,7 +41,6 @@ struct u_suballocator { struct pipe_context *pipe; unsigned size; /* Size of the whole buffer, in bytes. */ - unsigned alignment; /* Alignment of each sub-allocation. */ unsigned bind; /* Bitmask of PIPE_BIND_* flags. */ enum pipe_resource_usage usage; boolean zero_buffer_memory; /* If the buffer contents should be zeroed. */ @@ -58,8 +57,7 @@ struct u_suballocator { * cleared to 0 after the allocation. */ struct u_suballocator * -u_suballocator_create(struct pipe_context *pipe, unsigned size, - unsigned alignment, unsigned bind, +u_suballocator_create(struct pipe_context *pipe, unsigned size, unsigned bind, enum pipe_resource_usage usage, boolean zero_buffer_memory) { @@ -68,8 +66,7 @@ u_suballocator_create(struct pipe_context *pipe, unsigned size, return NULL; allocator->pipe = pipe; - allocator->size = align(size, alignment); - allocator->alignment = alignment; + allocator->size = size; allocator->bind = bind; allocator->usage = usage; allocator->zero_buffer_memory = zero_buffer_memory; @@ -85,17 +82,18 @@ u_suballocator_destroy(struct u_suballocator *allocator) void u_suballocator_alloc(struct u_suballocator *allocator, unsigned size, - unsigned *out_offset, struct pipe_resource **outbuf) + unsigned alignment, unsigned *out_offset, + struct pipe_resource **outbuf) { - unsigned alloc_size = align(size, allocator->alignment); + allocator->offset = align(allocator->offset, alignment); /* Don't allow allocations larger than the buffer size. */ - if (alloc_size > allocator->size) + if (size > allocator->size) goto fail; /* Make sure we have enough space in the buffer. */ if (!allocator->buffer || - allocator->offset + alloc_size > allocator->size) { + allocator->offset + size > allocator->size) { /* Allocate a new buffer. */ pipe_resource_reference(&allocator->buffer, NULL); allocator->offset = 0; @@ -117,15 +115,15 @@ u_suballocator_alloc(struct u_suballocator *allocator, unsigned size, } } - assert(allocator->offset % allocator->alignment == 0); + assert(allocator->offset % alignment == 0); assert(allocator->offset < allocator->buffer->width0); - assert(allocator->offset + alloc_size <= allocator->buffer->width0); + assert(allocator->offset + size <= allocator->buffer->width0); /* Return the buffer. */ *out_offset = allocator->offset; pipe_resource_reference(outbuf, allocator->buffer); - allocator->offset += alloc_size; + allocator->offset += size; return; fail: -- cgit v1.2.3