summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChris Forbes <[email protected]>2014-08-03 19:55:55 +1200
committerChris Forbes <[email protected]>2014-08-12 19:18:55 +1200
commit3b48f6a4c06db57a7203d247994b05e55c9418c1 (patch)
tree9c5d16428a523b05f27d02407352aba48965cc99
parent1b4761bc27a50208dba2bc028c9835fed572e696 (diff)
mesa: Add a new function for getting the nonconst sampler array index
If the array index is not a constant expression, the existing support will assume a zero offset (giving us the sampler index of the base of the array). For dynamically uniform indexing of sampler arrays, we need both that and the indexing expression. Signed-off-by: Chris Forbes <[email protected]> Reviewed-by: Matt Turner <[email protected]> Reviewed-by: Ilia Mirkin <[email protected]>
-rw-r--r--src/mesa/program/sampler.cpp11
-rw-r--r--src/mesa/program/sampler.h3
2 files changed, 14 insertions, 0 deletions
diff --git a/src/mesa/program/sampler.cpp b/src/mesa/program/sampler.cpp
index e6532be84d3..29a5408717a 100644
--- a/src/mesa/program/sampler.cpp
+++ b/src/mesa/program/sampler.cpp
@@ -134,3 +134,14 @@ _mesa_get_sampler_uniform_value(class ir_dereference *sampler,
return shader_program->UniformStorage[location].sampler[shader].index +
getname.offset;
}
+
+
+extern "C" class ir_rvalue *
+_mesa_get_sampler_array_nonconst_index(class ir_dereference *sampler)
+{
+ ir_dereference_array *deref_arr = sampler->as_dereference_array();
+ if (!deref_arr || deref_arr->array_index->as_constant())
+ return NULL;
+
+ return deref_arr->array_index;
+}
diff --git a/src/mesa/program/sampler.h b/src/mesa/program/sampler.h
index 22467e99020..8b7c3b63ed5 100644
--- a/src/mesa/program/sampler.h
+++ b/src/mesa/program/sampler.h
@@ -27,3 +27,6 @@ int
_mesa_get_sampler_uniform_value(class ir_dereference *sampler,
struct gl_shader_program *shader_program,
const struct gl_program *prog);
+
+class ir_rvalue *
+_mesa_get_sampler_array_nonconst_index(class ir_dereference *sampler);