From 146be3ddbe1e3cf8154bcc59cc5bcbd90e2072cb Mon Sep 17 00:00:00 2001 From: Ian Romanick Date: Fri, 18 Jul 2014 16:10:16 -0700 Subject: [PATCH] glsl: Use constant_expression_value instead of as_constant Just a few lines earlier we may have wrapped the index expression with ir_unop_i2u expression. Whenever that happens, as_constant will return NULL, and that almost always happens. Signed-off-by: Ian Romanick Reviewed-by: Connor Abbott --- src/glsl/lower_ubo_reference.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/glsl/lower_ubo_reference.cpp b/src/glsl/lower_ubo_reference.cpp index 67b752d3d22..60094f13a18 100644 --- a/src/glsl/lower_ubo_reference.cpp +++ b/src/glsl/lower_ubo_reference.cpp @@ -219,7 +219,8 @@ lower_ubo_reference_visitor::handle_rvalue(ir_rvalue **rvalue) if (array_index->type->base_type == GLSL_TYPE_INT) array_index = i2u(array_index); - ir_constant *const_index = array_index->as_constant(); + ir_constant *const_index = + array_index->constant_expression_value(NULL); if (const_index) { const_offset += array_stride * const_index->value.u[0]; } else { -- 2.30.2