summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJason Ekstrand <jason.ekstrand@intel.com>2018-12-13 18:34:35 -0600
committerJason Ekstrand <jason@jlekstrand.net>2019-01-08 00:38:30 +0000
commit52dd43c7ef39ab2432449a557660260e054f262a (patch)
tree9dc093b5dabee20b7932101a736166e1452124a6
parent013ee5732b73c33379007c3ff31b238aa088a800 (diff)
nir/validate: Allow array derefs on vectors in more modes
Reviewed-by: Alejandro PiƱeiro <apinheiro@igalia.com> Reviewed-by: Caio Marcelo de Oliveira Filho <caio.oliveira@intel.com>
-rw-r--r--src/compiler/nir/nir_validate.c10
1 files changed, 6 insertions, 4 deletions
diff --git a/src/compiler/nir/nir_validate.c b/src/compiler/nir/nir_validate.c
index 9cb6cf27a4e..dc7b5b5f112 100644
--- a/src/compiler/nir/nir_validate.c
+++ b/src/compiler/nir/nir_validate.c
@@ -448,10 +448,12 @@ validate_deref_instr(nir_deref_instr *instr, validate_state *state)
case nir_deref_type_array:
case nir_deref_type_array_wildcard:
- if (instr->mode == nir_var_shared) {
- /* Shared variables have a bit more relaxed rules because we need
- * to be able to handle array derefs on vectors. Fortunately,
- * nir_lower_io handles these just fine.
+ if (instr->mode == nir_var_ubo ||
+ instr->mode == nir_var_ssbo ||
+ instr->mode == nir_var_shared) {
+ /* Shared variables and UBO/SSBOs have a bit more relaxed rules
+ * because we need to be able to handle array derefs on vectors.
+ * Fortunately, nir_lower_io handles these just fine.
*/
validate_assert(state, glsl_type_is_array(parent->type) ||
glsl_type_is_matrix(parent->type) ||