From: Timothy Arceri Date: Mon, 30 May 2016 02:16:39 +0000 (+1000) Subject: glsl: dont crash when attempting to assign a value to a builtin define X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=87fb5aa3e741e9b93bf09509ff14d4cbc683e482;p=mesa.git glsl: dont crash when attempting to assign a value to a builtin define For example GL_ARB_enhanced_layouts = 3; Fixes: GL44-CTS.enhanced_layouts.glsl_contant_immutablity Reviewed-by: Dave Airlie --- diff --git a/src/compiler/glsl/ast_to_hir.cpp b/src/compiler/glsl/ast_to_hir.cpp index ccacd266bb4..400d3c4e908 100644 --- a/src/compiler/glsl/ast_to_hir.cpp +++ b/src/compiler/glsl/ast_to_hir.cpp @@ -822,7 +822,7 @@ validate_assignment(struct _mesa_glsl_parse_state *state, */ if (state->stage == MESA_SHADER_TESS_CTRL && !lhs->type->is_error()) { ir_variable *var = lhs->variable_referenced(); - if (var->data.mode == ir_var_shader_out && !var->data.patch) { + if (var && var->data.mode == ir_var_shader_out && !var->data.patch) { ir_rvalue *index = find_innermost_array_index(lhs); ir_variable *index_var = index ? index->variable_referenced() : NULL; if (!index_var || strcmp(index_var->name, "gl_InvocationID") != 0) {