From 1bc983cd649af10d87500ceda37d7a36aa3741a6 Mon Sep 17 00:00:00 2001 From: Matt Turner Date: Wed, 20 Apr 2016 12:29:23 -0700 Subject: [PATCH] glsl: Relax GLSL 1.10 float suffix error to a warning. 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 (although it looks like between 0.6.1 and 0.6.3 they might have removed the suffixes from their shaders). Reviewed-by: Lars Hamre Reviewed-by: Roland Scheidegger Reviewed-by: Kenneth Graunke --- 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.4