Mesa (master): mesa/bufferobj: fix atomic offset/size get
Dave Airlie
airlied at kemper.freedesktop.org
Thu Oct 12 21:54:01 UTC 2017
Module: Mesa
Branch: master
Commit: 26f1ba94a384718e0e5974c10d4f758459ef0b10
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=26f1ba94a384718e0e5974c10d4f758459ef0b10
Author: Dave Airlie <airlied at redhat.com>
Date: Thu Oct 12 09:32:14 2017 +1000
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 at gmail.com>
Tested-by: Mark Janes <mark.a.janes at intel.com>
Signed-off-by: Dave Airlie <airlied at redhat.com>
---
src/mesa/main/get.c | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/src/mesa/main/get.c b/src/mesa/main/get.c
index 4c4a4a79c0..e68a93b10e 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:
More information about the mesa-commit
mailing list