Mesa (master): glsl: make ssbo predicate return true when in a GLSL 430 or ESSL 310 shader

Ilia Mirkin imirkin at kemper.freedesktop.org
Sun Apr 3 22:30:22 UTC 2016


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

Author: Ilia Mirkin <imirkin at alum.mit.edu>
Date:   Sat Apr  2 21:50:22 2016 -0400

glsl: make ssbo predicate return true when in a GLSL 430 or ESSL 310 shader

I can't tell whether this actually matters, but we're creating function
signatures with this predicate, so it should probably match when SSBO's
are available.

Signed-off-by: Ilia Mirkin <imirkin at alum.mit.edu>
Reviewed-by: Dave Airlie <airlied at redhat.com>

---

 src/compiler/glsl/lower_ubo_reference.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/compiler/glsl/lower_ubo_reference.cpp b/src/compiler/glsl/lower_ubo_reference.cpp
index d6269f7..3155ab6 100644
--- a/src/compiler/glsl/lower_ubo_reference.cpp
+++ b/src/compiler/glsl/lower_ubo_reference.cpp
@@ -372,7 +372,8 @@ lower_ubo_reference_visitor::ubo_load(void *mem_ctx,
 static bool
 shader_storage_buffer_object(const _mesa_glsl_parse_state *state)
 {
-   return state->ARB_shader_storage_buffer_object_enable;
+   return state->ARB_shader_storage_buffer_object_enable ||
+      state->is_version(430, 310);
 }
 
 uint32_t




More information about the mesa-commit mailing list