From 9926af0e7195c245d6b9d11b0fee6ba146987dbf Mon Sep 17 00:00:00 2001 From: Dave Airlie Date: Fri, 15 Sep 2017 13:14:56 +1000 Subject: [PATCH] mesa/st: fix atomic buffer sizing to align with ssbo. This respects the size from the range setting like ssbo. Reviewed-by: Samuel Pitoiset Reviewed-by: Iago Toral Quiroga Signed-off-by: Dave Airlie --- src/mesa/state_tracker/st_atom_atomicbuf.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/mesa/state_tracker/st_atom_atomicbuf.c b/src/mesa/state_tracker/st_atom_atomicbuf.c index 7ebcd08dc43..ee5944fe9b4 100644 --- a/src/mesa/state_tracker/st_atom_atomicbuf.c +++ b/src/mesa/state_tracker/st_atom_atomicbuf.c @@ -62,6 +62,12 @@ st_bind_atomics(struct st_context *st, struct gl_program *prog, sb.buffer = st_obj->buffer; sb.buffer_offset = binding->Offset; sb.buffer_size = st_obj->buffer->width0 - binding->Offset; + + /* AutomaticSize is FALSE if the buffer was set with BindBufferRange. + * Take the minimum just to be sure. + */ + if (!binding->AutomaticSize) + sb.buffer_size = MIN2(sb.buffer_size, (unsigned) binding->Size); } st->pipe->set_shader_buffers(st->pipe, shader_type, -- 2.30.2