[Mesa-dev] [PATCH 2/2] glsl/cs: Add several GLSL compute shader variables

Jordan Justen jordan.l.justen at intel.com
Thu Jul 24 15:44:14 PDT 2014


This fixes piglit (with GL_ARB_compute_shader force enabled):
built-in-constants tests/spec/arb_compute_shader/minimum-maximums.txt

(Also requires piglit patch "arb_compute_shader glsl min/max: Update
 gl_MaxComputeUniformComponents")

Signed-off-by: Jordan Justen <jordan.l.justen at intel.com>
---
 src/glsl/builtin_variables.cpp | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/glsl/builtin_variables.cpp b/src/glsl/builtin_variables.cpp
index 3497302..4c5b9c0 100644
--- a/src/glsl/builtin_variables.cpp
+++ b/src/glsl/builtin_variables.cpp
@@ -672,6 +672,12 @@ builtin_variable_generator::generate_constants()
    }
 
    if (state->is_version(430, 0) || state->ARB_compute_shader_enable) {
+      add_const("gl_MaxComputeAtomicCounterBuffers", MAX_COMPUTE_ATOMIC_COUNTER_BUFFERS);
+      add_const("gl_MaxComputeAtomicCounters", MAX_COMPUTE_ATOMIC_COUNTERS);
+      add_const("gl_MaxComputeImageUniforms", MAX_COMPUTE_IMAGE_UNIFORMS);
+      add_const("gl_MaxComputeTextureImageUnits", MAX_COMPUTE_TEXTURE_IMAGE_UNITS);
+      add_const("gl_MaxComputeUniformComponents", MAX_COMPUTE_UNIFORM_COMPONENTS);
+
       add_const_ivec3("gl_MaxComputeWorkGroupCount",
                       state->Const.MaxComputeWorkGroupCount[0],
                       state->Const.MaxComputeWorkGroupCount[1],
-- 
2.0.1



More information about the mesa-dev mailing list