From: Dave Airlie <airlied@redhat.com>
Date: Wed, 11 Oct 2017 23:32:14 +0000 (+1000)
Subject: mesa/bufferobj: fix atomic offset/size get
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=26f1ba94a384718e0e5974c10d4f758459ef0b10;p=mesa.git

mesa/bufferobj: fix atomic offset/size get

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>
---

diff --git a/src/mesa/main/get.c b/src/mesa/main/get.c
index 4c4a4a79c07..e68a93b10ee 100644
--- a/src/mesa/main/get.c
+++ b/src/mesa/main/get.c
@@ -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: