diff options
| author | Marek Olšák <maraeo@gmail.com> | 2011-11-19 16:41:08 +0100 |
|---|---|---|
| committer | Marek Olšák <maraeo@gmail.com> | 2011-11-22 20:56:50 +0100 |
| commit | 6b43d6fdda13d73ca7b059f986ce2a2046bf03a0 (patch) | |
| tree | b240d4e326c9cc3ce9767dcaf06c41bcef28cff8 /src/glsl/glsl_parser.yy | |
| parent | bbcb648bc2f45dd85e33c7301527c8f6d97cbce6 (diff) | |
| download | external_mesa3d-6b43d6fdda13d73ca7b059f986ce2a2046bf03a0.zip external_mesa3d-6b43d6fdda13d73ca7b059f986ce2a2046bf03a0.tar.gz external_mesa3d-6b43d6fdda13d73ca7b059f986ce2a2046bf03a0.tar.bz2 | |
glsl: finish up ARB_conservative_depth (v2)
v2: updated an error message
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
Diffstat (limited to 'src/glsl/glsl_parser.yy')
| -rw-r--r-- | src/glsl/glsl_parser.yy | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/src/glsl/glsl_parser.yy b/src/glsl/glsl_parser.yy index 8363904..71ab039 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; @@ -1141,6 +1143,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); } |