diff options
author | Ian Romanick <ian.d.romanick@intel.com> | 2010-04-23 13:32:23 -0700 |
---|---|---|
committer | Ian Romanick <ian.d.romanick@intel.com> | 2010-04-23 13:32:23 -0700 |
commit | eb56cea3b3011f46453d4bb7d06de2e9f6b12232 (patch) | |
tree | 863c46d4ac7d6a05c60e2250050347777540b30c /glsl_parser_extras.cpp | |
parent | 25851a8d873a3cb4f6ab3252364eb46a87e1a959 (diff) |
Add missing 'else's to fix extension processing
The missing else-statements caused all of the extensions execpt
GL_ARB_texture_rectangle to be unsupported.
This causes the following tests to pass:
glslparsertest/glsl2/draw_buffers-04.frag
Diffstat (limited to 'glsl_parser_extras.cpp')
-rw-r--r-- | glsl_parser_extras.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/glsl_parser_extras.cpp b/glsl_parser_extras.cpp index f7ee891eeb..1f74cbb39d 100644 --- a/glsl_parser_extras.cpp +++ b/glsl_parser_extras.cpp @@ -129,7 +129,7 @@ _mesa_glsl_process_extension(const char *name, YYLTYPE *name_locp, ? "enable" : "require"); return false; } - } if (strcmp(name, "GL_ARB_draw_buffers") == 0) { + } else if (strcmp(name, "GL_ARB_draw_buffers") == 0) { /* This extension is only supported in fragment shaders. */ if (state->target != fragment_shader) { @@ -138,7 +138,7 @@ _mesa_glsl_process_extension(const char *name, YYLTYPE *name_locp, state->ARB_draw_buffers_enable = (ext_mode != extension_disable); state->ARB_draw_buffers_warn = (ext_mode == extension_warn); } - } if (strcmp(name, "GL_ARB_texture_rectangle") == 0) { + } else if (strcmp(name, "GL_ARB_texture_rectangle") == 0) { state->ARB_texture_rectangle_enable = (ext_mode != extension_disable); state->ARB_texture_rectangle_warn = (ext_mode == extension_warn); } else { |