From 4336196b7fc61166a36babdabdf5dd004ec9ee55 Mon Sep 17 00:00:00 2001 From: Dave Airlie Date: Tue, 3 May 2016 17:16:27 +1000 Subject: [PATCH] glsl: handle ast_aggregate in has_sequence_subexpression. (v2) GL43-CTS.compute_shader.work-group-size does uniform uint g_uniform[gl_WorkGroupSize.z + 20] = { 1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24 }; The initializer triggers the GLSL 4.30/GLES3 tests for constant sequence subexpressions, so it doesn't happen unless you are using those, so just return false as this path is now reachable. v2: update commit msg with diagnosis Acked-by: Timothy Arceri Cc: "11.2 12.0" Signed-off-by: Dave Airlie --- src/compiler/glsl/ast_to_hir.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/compiler/glsl/ast_to_hir.cpp b/src/compiler/glsl/ast_to_hir.cpp index 400d3c4e908..b7192b29f2d 100644 --- a/src/compiler/glsl/ast_to_hir.cpp +++ b/src/compiler/glsl/ast_to_hir.cpp @@ -2100,7 +2100,7 @@ ast_expression::has_sequence_subexpression() const return false; case ast_aggregate: - unreachable("ast_aggregate: Should never get here."); + return false; case ast_function_call: unreachable("should be handled by ast_function_expression::hir"); -- 2.30.2