diff options
| author | Brian Paul <[email protected]> | 2015-01-02 16:19:48 -0700 |
|---|---|---|
| committer | Brian Paul <[email protected]> | 2015-01-05 13:50:54 -0700 |
| commit | a6822e31355b46be1cdf956f58bd2c7a4cd387f2 (patch) | |
| tree | 0df30f4febe1ad2ccc9f8f35b2418885ab1ca653 | |
| parent | 83b344021bb872d549709dcbbc7e68e175f70bff (diff) | |
glsl: use the is_gl_identifier() helper in a couple more places
Reviewed-by: Eric Anholt <[email protected]>
| -rw-r--r-- | src/glsl/ir_validate.cpp | 2 | ||||
| -rw-r--r-- | 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 |