diff options
author | marha <marha@users.sourceforge.net> | 2011-01-27 11:19:53 +0000 |
---|---|---|
committer | marha <marha@users.sourceforge.net> | 2011-01-27 11:19:53 +0000 |
commit | 7bbe9d92dfcc704e5017809c7e922025ff33bd53 (patch) | |
tree | a10f27e2f1f92671623d5e2d5b5391665e33c2fc /mesalib/src/glsl/glsl_parser_extras.cpp | |
parent | 458542c76bf19b6bb24c397c3a567b64c88842c2 (diff) | |
parent | dc9d750132f95783d2db6fb8e08271fc0878576d (diff) | |
download | vcxsrv-7bbe9d92dfcc704e5017809c7e922025ff33bd53.tar.gz vcxsrv-7bbe9d92dfcc704e5017809c7e922025ff33bd53.tar.bz2 vcxsrv-7bbe9d92dfcc704e5017809c7e922025ff33bd53.zip |
svn merge ^/branches/released .
Diffstat (limited to 'mesalib/src/glsl/glsl_parser_extras.cpp')
-rw-r--r-- | mesalib/src/glsl/glsl_parser_extras.cpp | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/mesalib/src/glsl/glsl_parser_extras.cpp b/mesalib/src/glsl/glsl_parser_extras.cpp index 77885d4e1..c9a8a2cb2 100644 --- a/mesalib/src/glsl/glsl_parser_extras.cpp +++ b/mesalib/src/glsl/glsl_parser_extras.cpp @@ -219,6 +219,13 @@ _mesa_glsl_process_extension(const char *name, YYLTYPE *name_locp, state->ARB_shader_stencil_export_warn = (ext_mode == extension_warn); unsupported = !state->extensions->ARB_shader_stencil_export; } + } else if (strcmp(name, "GL_AMD_conservative_depth") == 0) { + /* The AMD_conservative spec does not forbid requiring the extension in + * the vertex shader. + */ + state->AMD_conservative_depth_enable = (ext_mode != extension_disable); + state->AMD_conservative_depth_warn = (ext_mode == extension_warn); + unsupported = !state->extensions->AMD_conservative_depth; } else { unsupported = true; } |