From: Dave Airlie <airlied@redhat.com>
Date: Fri, 15 Sep 2017 03:14:56 +0000 (+1000)
Subject: mesa/st: fix atomic buffer sizing to align with ssbo.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=9926af0e7195c245d6b9d11b0fee6ba146987dbf;p=mesa.git

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@gmail.com>
Reviewed-by: Iago Toral Quiroga <itoral@igalia.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
---

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,