Mesa (master): glsl: fix check SSBOs support for builtin functions

Samuel Iglesias Gonsálvez samuelig at kemper.freedesktop.org
Fri Oct 16 10:48:35 UTC 2015


Module: Mesa
Branch: master
Commit: ccbb52ac1117aa99144785bc032dd459f24b8ba1
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=ccbb52ac1117aa99144785bc032dd459f24b8ba1

Author: Samuel Iglesias Gonsalvez <siglesias at igalia.com>
Date:   Fri Oct 16 08:44:38 2015 +0200

glsl: fix check SSBOs support for builtin functions

has_shader_storage_buffer_objects() returns true also if the OpenGL
context is 4.30 or ES 3.1.

Previously, we were saying that all atomic*() GLSL builtin functions
for SSBOs were not available when OpenGL ES 3.1 context was in use.

Fixes 48 dEQP-GLES31 tests:

dEQP-GLES31.functional.ssbo.atomic.*

Signed-off-by: Samuel Iglesias Gonsalvez <siglesias at igalia.com>
Reviewed-by: Tapani Pälli <tapani.palli at intel.com>
Reviewed-by: Iago Toral Quiroga <itoral at igalia.com>

---

 src/glsl/builtin_functions.cpp |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/glsl/builtin_functions.cpp b/src/glsl/builtin_functions.cpp
index f0f6be2..aae25f8 100644
--- a/src/glsl/builtin_functions.cpp
+++ b/src/glsl/builtin_functions.cpp
@@ -403,7 +403,7 @@ shader_atomic_counters(const _mesa_glsl_parse_state *state)
 static bool
 shader_storage_buffer_object(const _mesa_glsl_parse_state *state)
 {
-   return state->ARB_shader_storage_buffer_object_enable;
+   return state->has_shader_storage_buffer_objects();
 }
 
 static bool




More information about the mesa-commit mailing list