[Mesa-dev] [PATCH] glsl: Relax GLSL 1.10 float suffix error to a warning.
Matt Turner
mattst88 at gmail.com
Wed Apr 20 19:29:23 UTC 2016
Float suffixes are allowed in all subsequent GLSL specifications, and
it's obvious what the user meant if they specify one. Accept it with a
warning to avoid breaking applications, like Planeshift.
---
src/compiler/glsl/glsl_lexer.ll | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/compiler/glsl/glsl_lexer.ll b/src/compiler/glsl/glsl_lexer.ll
index 6b1ef17..8a562cb 100644
--- a/src/compiler/glsl/glsl_lexer.ll
+++ b/src/compiler/glsl/glsl_lexer.ll
@@ -476,8 +476,8 @@ layout {
char suffix = yytext[strlen(yytext) - 1];
if (!state->is_version(120, 300) &&
(suffix == 'f' || suffix == 'F')) {
- _mesa_glsl_error(yylloc, state,
- "Float suffixes are invalid in GLSL 1.10");
+ _mesa_glsl_warning(yylloc, state,
+ "Float suffixes are invalid in GLSL 1.10");
}
yylval->real = _mesa_strtof(yytext, NULL);
return FLOATCONSTANT;
--
2.7.3
More information about the mesa-dev
mailing list