From a6822e31355b46be1cdf956f58bd2c7a4cd387f2 Mon Sep 17 00:00:00 2001 From: Brian Paul Date: Fri, 2 Jan 2015 16:19:48 -0700 Subject: [PATCH] glsl: use the is_gl_identifier() helper in a couple more places Reviewed-by: Eric Anholt --- src/glsl/ir_validate.cpp | 2 +- src/glsl/opt_dead_builtin_variables.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/glsl/ir_validate.cpp b/src/glsl/ir_validate.cpp index 5a6f8bbf5ee..6d5633916ba 100644 --- a/src/glsl/ir_validate.cpp +++ b/src/glsl/ir_validate.cpp @@ -706,7 +706,7 @@ ir_validate::visit(ir_variable *ir) } if (ir->data.mode == ir_var_uniform - && strncmp(ir->name, "gl_", 3) == 0 + && is_gl_identifier(ir->name) && ir->get_state_slots() == NULL) { printf("built-in uniform has no state\n"); ir->print(); diff --git a/src/glsl/opt_dead_builtin_variables.cpp b/src/glsl/opt_dead_builtin_variables.cpp index 85c75d6f21f..0d4e3a8f00a 100644 --- a/src/glsl/opt_dead_builtin_variables.cpp +++ b/src/glsl/opt_dead_builtin_variables.cpp @@ -52,7 +52,7 @@ optimize_dead_builtin_variables(exec_list *instructions, && var->data.how_declared != ir_var_declared_implicitly) continue; - if (strncmp(var->name, "gl_", 3) != 0) + if (!is_gl_identifier(var->name)) continue; /* gl_ModelViewProjectionMatrix and gl_Vertex are special because they -- 2.30.2