summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJordan Justen <jordan.l.justen@intel.com>2015-07-28 14:56:49 -0700
committerJordan Justen <jordan.l.justen@intel.com>2015-11-09 17:21:24 -0800
commit32746fc9b49db5eccdc228e12cbce4734f1020f9 (patch)
tree8205c0427d48cc2d99e4738705179da2070cf671
parentc0ac4740a75f0701637df1ea82c450bb8c31a63a (diff)
glsl: Add shared variable type
Shared variables are stored in a common pool accessible by all threads in a compute shader local work group. These variables are similar to OpenCL's local/__local variables. Signed-off-by: Jordan Justen <jordan.l.justen@intel.com> Reviewed-by: Timothy Arceri <timothy.arceri@collabora.com>
-rw-r--r--src/glsl/ir.h1
-rw-r--r--src/glsl/ir_print_visitor.cpp2
2 files changed, 2 insertions, 1 deletions
diff --git a/src/glsl/ir.h b/src/glsl/ir.h
index e576db5da71..32a766ef0f0 100644
--- a/src/glsl/ir.h
+++ b/src/glsl/ir.h
@@ -325,6 +325,7 @@ enum ir_variable_mode {
ir_var_auto = 0, /**< Function local variables and globals. */
ir_var_uniform, /**< Variable declared as a uniform. */
ir_var_shader_storage, /**< Variable declared as an ssbo. */
+ ir_var_shader_shared, /**< Variable declared as shared. */
ir_var_shader_in,
ir_var_shader_out,
ir_var_function_in,
diff --git a/src/glsl/ir_print_visitor.cpp b/src/glsl/ir_print_visitor.cpp
index 211ac76d3d0..42b03fdea52 100644
--- a/src/glsl/ir_print_visitor.cpp
+++ b/src/glsl/ir_print_visitor.cpp
@@ -174,7 +174,7 @@ void ir_print_visitor::visit(ir_variable *ir)
const char *const patc = (ir->data.patch) ? "patch " : "";
const char *const inv = (ir->data.invariant) ? "invariant " : "";
const char *const mode[] = { "", "uniform ", "shader_storage ",
- "shader_in ", "shader_out ",
+ "shader_shared ", "shader_in ", "shader_out ",
"in ", "out ", "inout ",
"const_in ", "sys ", "temporary " };
STATIC_ASSERT(ARRAY_SIZE(mode) == ir_var_mode_count);