diff options
| author | Ian Romanick <ian.d.romanick@intel.com> | 2011-04-08 12:43:53 -0700 |
|---|---|---|
| committer | Ian Romanick <ian.d.romanick@intel.com> | 2011-04-11 14:43:42 -0700 |
| commit | 03eade164d45cc35422dfc03aeaf579c9c3183f9 (patch) | |
| tree | 042d84df385f626a3722dee99f295a6269448d36 | |
| parent | f2bda1b5664cd8a8744798926f2562212229d938 (diff) | |
glsl: Make GL_ARB_shader_stencil_export enable block be similar to other blocks
Tested-by: Brian Paul <brianp@vmware.com>
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
| -rw-r--r-- | src/glsl/glsl_parser_extras.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/glsl/glsl_parser_extras.cpp b/src/glsl/glsl_parser_extras.cpp index 073ec383210..e8881e4d60e 100644 --- a/src/glsl/glsl_parser_extras.cpp +++ b/src/glsl/glsl_parser_extras.cpp @@ -241,13 +241,13 @@ _mesa_glsl_process_extension(const char *name, YYLTYPE *name_locp, unsupported = !state->extensions->EXT_texture_array; } else if (strcmp(name, "GL_ARB_shader_stencil_export") == 0) { - if (state->target != fragment_shader) { - unsupported = true; - } else { - state->ARB_shader_stencil_export_enable = (ext_mode != extension_disable); - state->ARB_shader_stencil_export_warn = (ext_mode == extension_warn); - unsupported = !state->extensions->ARB_shader_stencil_export; - } + state->ARB_shader_stencil_export_enable = (ext_mode != extension_disable); + state->ARB_shader_stencil_export_warn = (ext_mode == extension_warn); + + /* This extension is only supported in fragment shaders. + */ + unsupported = (state->target != fragment_shader) + || !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. |