Module: Mesa Branch: 9.1 Commit: 65b251f4b0dfd80c303b73ff954f30b0d004d2dc URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=65b251f4b0dfd80c303b73ff954f30b0d004d2dc
Author: Marek Olšák <[email protected]> Date: Fri Apr 26 01:54:41 2013 +0200 st/mesa: fix a couple of issues in st_bind_ubos - don't reference a buffer for a local variable (that's never useful unless it can be the only reference to the buffer) - check if the buffer is not NULL - set buffer_size as specified with BindBufferRange NOTE: This is a candidate for the 9.1 branch. Reviewed-by: Fredrik Höglund <[email protected]> Reviewed-by: Brian Paul <[email protected]> (cherry picked from commit a17e87d4ebd84c1a01c3821c04ed9d8d7c763983) --- src/mesa/state_tracker/st_atom_constbuf.c | 20 ++++++++++++++++---- 1 files changed, 16 insertions(+), 4 deletions(-) diff --git a/src/mesa/state_tracker/st_atom_constbuf.c b/src/mesa/state_tracker/st_atom_constbuf.c index b92a248..c7eb079 100644 --- a/src/mesa/state_tracker/st_atom_constbuf.c +++ b/src/mesa/state_tracker/st_atom_constbuf.c @@ -192,13 +192,25 @@ static void st_bind_ubos(struct st_context *st, binding = &st->ctx->UniformBufferBindings[shader->UniformBlocks[i].Binding]; st_obj = st_buffer_object(binding->BufferObject); - pipe_resource_reference(&cb.buffer, st_obj->buffer); - cb.buffer_size = st_obj->buffer->width0 - binding->Offset; - cb.buffer_offset = binding->Offset; + cb.buffer = st_obj->buffer; + + if (cb.buffer) { + cb.buffer_offset = binding->Offset; + cb.buffer_size = cb.buffer->width0 - binding->Offset; + + /* AutomaticSize is FALSE if the buffer was set with BindBufferRange. + * Take the minimum just to be sure. + */ + if (!binding->AutomaticSize) + cb.buffer_size = MIN2(cb.buffer_size, binding->Size); + } + else { + cb.buffer_offset = 0; + cb.buffer_size = 0; + } st->pipe->set_constant_buffer(st->pipe, shader_type, 1 + i, &cb); - pipe_resource_reference(&cb.buffer, NULL); } } _______________________________________________ mesa-commit mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/mesa-commit
