From c5e74871d9e4b555f3927fd11944c769d466bd12 Mon Sep 17 00:00:00 2001 From: Kenneth Graunke Date: Sun, 5 Sep 2010 01:32:32 -0700 Subject: glsl: Recognize GLSL ES 1.00 keywords. --- src/glsl/glsl_parser.cpp | 54 ++++++++++++++++++++++++------------------------ 1 file changed, 27 insertions(+), 27 deletions(-) (limited to 'src/glsl/glsl_parser.cpp') diff --git a/src/glsl/glsl_parser.cpp b/src/glsl/glsl_parser.cpp index 8eae6b4210..301c221892 100644 --- a/src/glsl/glsl_parser.cpp +++ b/src/glsl/glsl_parser.cpp @@ -4529,16 +4529,16 @@ yyreduce: /* Line 1464 of yacc.c */ #line 1152 "glsl_parser.ypp" { - if (state->language_version < 130) - _mesa_glsl_error(& (yylsp[(1) - (1)]), state, - "precision qualifier forbidden " - "in GLSL %d.%d (1.30 or later " - "required)\n", - state->language_version / 100, - state->language_version % 100); + if (!state->es_shader && state->language_version < 130) + _mesa_glsl_error(& (yylsp[(1) - (1)]), state, + "precision qualifier forbidden " + "in GLSL %d.%d (1.30 or later " + "required)\n", + state->language_version / 100, + state->language_version % 100); - (yyval.n) = ast_precision_high; - ;} + (yyval.n) = ast_precision_high; + ;} break; case 217: @@ -4546,16 +4546,16 @@ yyreduce: /* Line 1464 of yacc.c */ #line 1163 "glsl_parser.ypp" { - if (state->language_version < 130) - _mesa_glsl_error(& (yylsp[(1) - (1)]), state, - "precision qualifier forbidden " - "in GLSL %d.%d (1.30 or later " - "required)\n", - state->language_version / 100, - state->language_version % 100); + if (!state->es_shader && state->language_version < 130) + _mesa_glsl_error(& (yylsp[(1) - (1)]), state, + "precision qualifier forbidden " + "in GLSL %d.%d (1.30 or later " + "required)\n", + state->language_version / 100, + state->language_version % 100); - (yyval.n) = ast_precision_medium; - ;} + (yyval.n) = ast_precision_medium; + ;} break; case 218: @@ -4563,16 +4563,16 @@ yyreduce: /* Line 1464 of yacc.c */ #line 1174 "glsl_parser.ypp" { - if (state->language_version < 130) - _mesa_glsl_error(& (yylsp[(1) - (1)]), state, - "precision qualifier forbidden " - "in GLSL %d.%d (1.30 or later " - "required)\n", - state->language_version / 100, - state->language_version % 100); + if (!state->es_shader && state->language_version < 130) + _mesa_glsl_error(& (yylsp[(1) - (1)]), state, + "precision qualifier forbidden " + "in GLSL %d.%d (1.30 or later " + "required)\n", + state->language_version / 100, + state->language_version % 100); - (yyval.n) = ast_precision_low; - ;} + (yyval.n) = ast_precision_low; + ;} break; case 219: -- cgit v1.2.3