Mesa (18.2): glsl: Avoid calling get_array_element for scalar constants

[GitLab Mirror]

Module: Mesa
Branch: 18.2
Commit: c2268223c8abb97a2a09846d2aec19186914878f
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=c2268223c8abb97a2a09846d2aec19186914878f

Author: Danylo Piliaiev <danylo.piliaiev at gmail.com>
Date:   Mon Aug 13 18:57:38 2018 +0300

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 at globallogic.com>
Reviewed-by: Tapani Pälli <tapani.palli at intel.com>
(cherry picked from commit 479a849ad606482c3cf67157b77af94ecd450ace)

---

 src/compiler/glsl/ir_constant_expression.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/compiler/glsl/ir_constant_expression.cpp b/src/compiler/glsl/ir_constant_expression.cpp
index 4a0aff72c6..c9788c7053 100644
--- a/src/compiler/glsl/ir_constant_expression.cpp
+++ b/src/compiler/glsl/ir_constant_expression.cpp
@@ -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);
       }