From 226e7aee70592a0eb4c8cc2f750999e90e59667f Mon Sep 17 00:00:00 2001 From: =?utf8?q?Marek=20Ol=C5=A1=C3=A1k?= Date: Tue, 26 Nov 2019 20:55:13 -0500 Subject: [PATCH] st/mesa: support UBOs for Selection/Feedback/RasterPos Reviewed-by: Dave Airlie --- src/mesa/state_tracker/st_draw_feedback.c | 39 +++++++++++++++++++++-- 1 file changed, 37 insertions(+), 2 deletions(-) diff --git a/src/mesa/state_tracker/st_draw_feedback.c b/src/mesa/state_tracker/st_draw_feedback.c index 51c8459a083..b02d9d44162 100644 --- a/src/mesa/state_tracker/st_draw_feedback.c +++ b/src/mesa/state_tracker/st_draw_feedback.c @@ -222,11 +222,39 @@ st_feedback_draw_vbo(struct gl_context *ctx, info.has_user_indices = false; } - /* set the constant buffer */ - draw_set_mapped_constant_buffer(st->draw, PIPE_SHADER_VERTEX, 0, + /* set constant buffers */ + draw_set_mapped_constant_buffer(draw, PIPE_SHADER_VERTEX, 0, st->state.constants[PIPE_SHADER_VERTEX].ptr, st->state.constants[PIPE_SHADER_VERTEX].size); + const struct gl_program *prog = &vp->Base.Base; + struct pipe_transfer *ubo_transfer[PIPE_MAX_CONSTANT_BUFFERS] = {0}; + assert(prog->info.num_ubos <= ARRAY_SIZE(ubo_transfer)); + + for (unsigned i = 0; i < prog->info.num_ubos; i++) { + struct gl_buffer_binding *binding = + &st->ctx->UniformBufferBindings[prog->sh.UniformBlocks[i]->Binding]; + struct st_buffer_object *st_obj = st_buffer_object(binding->BufferObject); + struct pipe_resource *buf = st_obj->buffer; + + if (!buf) + continue; + + unsigned offset = binding->Offset; + unsigned size = buf->width0 - offset; + + /* AutomaticSize is FALSE if the buffer was set with BindBufferRange. + * Take the minimum just to be sure. + */ + if (!binding->AutomaticSize) + size = MIN2(size, (unsigned) binding->Size); + + void *ptr = pipe_buffer_map_range(pipe, buf, offset, size, + PIPE_TRANSFER_READ, &ubo_transfer[i]); + + draw_set_mapped_constant_buffer(draw, PIPE_SHADER_VERTEX, 1 + i, ptr, + size); + } /* draw here */ for (i = 0; i < nr_prims; i++) { @@ -249,6 +277,13 @@ st_feedback_draw_vbo(struct gl_context *ctx, draw_vbo(draw, &info); } + for (unsigned i = 0; i < prog->info.num_ubos; i++) { + if (ubo_transfer[i]) { + draw_set_mapped_constant_buffer(draw, PIPE_SHADER_VERTEX, 1 + i, + NULL, 0); + pipe_buffer_unmap(pipe, ubo_transfer[i]); + } + } /* * unmap vertex/index buffers -- 2.30.2