Sfoglia il codice sorgente

glsl: Avoid calling get_array_element for scalar constants

Accessing scalar constant as an array in function call or
initializer list triggered assert in get_array_element.
Examples:
   func(0[0]);
   vec2 t = { 0[0], 0 };

Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=107550

Signed-off-by: Danylo Piliaiev <danylo.piliaiev@globallogic.com>
Reviewed-by: Tapani Pälli <tapani.palli@intel.com>
tags/18.3-branchpoint
Danylo Piliaiev 7 anni fa
parent
commit
479a849ad6
1 ha cambiato i file con 1 aggiunte e 1 eliminazioni
  1. 1
    1
      src/compiler/glsl/ir_constant_expression.cpp

+ 1
- 1
src/compiler/glsl/ir_constant_expression.cpp Vedi File

@@ -826,7 +826,7 @@ ir_dereference_array::constant_expression_value(void *mem_ctx,
const unsigned component = idx->value.u[0];

return new(mem_ctx) ir_constant(array, component);
} else {
} else if (array->type->is_array()) {
const unsigned index = idx->value.u[0];
return array->get_array_element(index)->clone(mem_ctx, NULL);
}

Loading…
Annulla
Salva