mesa/bufferobj: fix atomic offset/size get
authorDave Airlie <airlied@redhat.com>
Wed, 11 Oct 2017 23:32:14 +0000 (09:32 +1000)
committerDave Airlie <airlied@redhat.com>
Thu, 12 Oct 2017 21:53:34 +0000 (07:53 +1000)
When I realigned the bufferobj code, I didn't see the getters
were different, realign the getters to work the same as ssbo.

Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=103214
Fixes: 65d3ef7cd (mesa: align atomic buffer handling code with ubo/ssbo (v1.1))
Reviewed-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Tested-by: Mark Janes <mark.a.janes@intel.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
src/mesa/main/get.c

index 4c4a4a79c078449ec650e46d2bdc049630d03809..e68a93b10ee1913e86904ae9be363674564bd0df 100644 (file)
@@ -2349,7 +2349,8 @@ find_value_indexed(const char *func, GLenum pname, GLuint index, union value *v)
          goto invalid_enum;
       if (index >= ctx->Const.MaxAtomicBufferBindings)
          goto invalid_value;
-      v->value_int64 = ctx->AtomicBufferBindings[index].Offset;
+      v->value_int64 = ctx->AtomicBufferBindings[index].Offset < 0 ? 0 :
+                       ctx->AtomicBufferBindings[index].Offset;
       return TYPE_INT64;
 
    case GL_ATOMIC_COUNTER_BUFFER_SIZE:
@@ -2357,7 +2358,8 @@ find_value_indexed(const char *func, GLenum pname, GLuint index, union value *v)
          goto invalid_enum;
       if (index >= ctx->Const.MaxAtomicBufferBindings)
          goto invalid_value;
-      v->value_int64 = ctx->AtomicBufferBindings[index].Size;
+      v->value_int64 = ctx->AtomicBufferBindings[index].Size < 0 ? 0 :
+                       ctx->AtomicBufferBindings[index].Size;
       return TYPE_INT64;
 
    case GL_VERTEX_BINDING_DIVISOR: