Mesa (master): mesa/st: fix atomic buffer sizing to align with ssbo.

Dave Airlie airlied at kemper.freedesktop.org
Tue Oct 10 23:13:34 UTC 2017


Module: Mesa
Branch: master
Commit: 9926af0e7195c245d6b9d11b0fee6ba146987dbf
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=9926af0e7195c245d6b9d11b0fee6ba146987dbf

Author: Dave Airlie <airlied at redhat.com>
Date:   Fri Sep 15 13:14:56 2017 +1000

mesa/st: fix atomic buffer sizing to align with ssbo.

This respects the size from the range setting like ssbo.

Reviewed-by: Samuel Pitoiset <samuel.pitoiset at gmail.com>
Reviewed-by: Iago Toral Quiroga <itoral at igalia.com>
Signed-off-by: Dave Airlie <airlied at redhat.com>

---

 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 7ebcd08dc4..ee5944fe9b 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,




More information about the mesa-commit mailing list