glsl: Don't early-out for error-type inputs

Check the type of the array operand and the index operand before doing
other checks.  This simplifies the code a bit now (eliminating the
error_emitted parameter), and enables some later functional changes.

The shader

uniform float x[6];
uniform sampler2D s;
void main() { gl_Position.x = xx[s + 1]; }

still generates (only) the two expected errors:

0:3(33): error: `xx' undeclared
0:3(39): error: Operands to arithmetic operators must be numeric

Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>

1 files changed, 1 insertions, 2 deletions

diff --git a/src/glsl/ast.h b/src/glsl/ast.h
index 41254cc53bf..730027177e8 100644
--- a/src/glsl/ast.h
+++ b/src/glsl/ast.h
@@ -858,8 +858,7 @@ extern ir_rvalue *
 _mesa_ast_array_index_to_hir(void *mem_ctx,
 			     struct _mesa_glsl_parse_state *state,
 			     ir_rvalue *array, ir_rvalue *idx,
-			     YYLTYPE &loc, YYLTYPE &idx_loc,
-			     bool error_emitted);
+			     YYLTYPE &loc, YYLTYPE &idx_loc);
 
 void
 emit_function(_mesa_glsl_parse_state *state, ir_function *f);