From: Ilia Mirkin <imirkin@alum.mit.edu>
Date: Sat, 13 Feb 2016 23:37:33 +0000 (-0500)
Subject: st/mesa: empty buffer binding if the buffer's not really there
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=cfbf25ac8f7bfe3e7bd9c8f55cf2c8072b7c9490;p=mesa.git

st/mesa: empty buffer binding if the buffer's not really there

This can happen with 0-sized buffers.

Signed-off-by: Ilia Mirkin <imirkin@alum.mit.edu>
Reviewed-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Reviewed-by: Marek Olšák <marek.olsak@amd.com>
---

diff --git a/src/mesa/state_tracker/st_atom_atomicbuf.c b/src/mesa/state_tracker/st_atom_atomicbuf.c
index d83c3960640..a27dbe0460d 100644
--- a/src/mesa/state_tracker/st_atom_atomicbuf.c
+++ b/src/mesa/state_tracker/st_atom_atomicbuf.c
@@ -58,9 +58,11 @@ st_bind_atomics(struct st_context *st,
          st_buffer_object(binding->BufferObject);
       struct pipe_shader_buffer sb = { 0 };
 
-      sb.buffer = st_obj->buffer;
-      sb.buffer_offset = binding->Offset;
-      sb.buffer_size = st_obj->buffer->width0 - binding->Offset;
+      if (st_obj && st_obj->buffer) {
+         sb.buffer = st_obj->buffer;
+         sb.buffer_offset = binding->Offset;
+         sb.buffer_size = st_obj->buffer->width0 - binding->Offset;
+      }
 
       st->pipe->set_shader_buffers(st->pipe, shader_type,
                                    atomic->Binding, 1, &sb);