From 6b43d6fdda13d73ca7b059f986ce2a2046bf03a0 Mon Sep 17 00:00:00 2001 From: Marek Olšák Date: Sat, 19 Nov 2011 16:41:08 +0100 Subject: glsl: finish up ARB_conservative_depth (v2) v2: updated an error message Reviewed-by: Kenneth Graunke Reviewed-by: Ian Romanick --- src/glsl/glsl_parser.yy | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) (limited to 'src/glsl/glsl_parser.yy') diff --git a/src/glsl/glsl_parser.yy b/src/glsl/glsl_parser.yy index 836390453b1..71ab039d620 100644 --- a/src/glsl/glsl_parser.yy +++ b/src/glsl/glsl_parser.yy @@ -1124,7 +1124,9 @@ layout_qualifier_id: } /* Layout qualifiers for AMD/ARB_conservative_depth. */ - if (!got_one && state->AMD_conservative_depth_enable) { + if (!got_one && + (state->AMD_conservative_depth_enable || + state->ARB_conservative_depth_enable)) { if (strcmp($1, "depth_any") == 0) { got_one = true; $$.flags.q.depth_any = 1; @@ -1140,6 +1142,11 @@ layout_qualifier_id: } if (got_one && state->AMD_conservative_depth_warn) { + _mesa_glsl_warning(& @1, state, + "GL_AMD_conservative_depth " + "layout qualifier `%s' is used\n", $1); + } + if (got_one && state->ARB_conservative_depth_warn) { _mesa_glsl_warning(& @1, state, "GL_ARB_conservative_depth " "layout qualifier `%s' is used\n", $1); -- cgit v1.2.3