diff options
| author | marha <marha@users.sourceforge.net> | 2011-05-10 13:36:25 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2011-05-10 13:36:25 +0000 |
| commit | 2e5094b5a8e6241621cbf8c3e41b618347de7e2f (patch) | |
| tree | 5e6023f9a98e76859ed4d6184f4e4ae50877db7a /mesalib/src/glsl/glsl_parser_extras.cpp | |
| parent | 495e1bd0f33256db726731f949d2a95e75d106b8 (diff) | |
| parent | 0f6aea154580c2f220be98d12108dd7d316c21f6 (diff) | |
| download | vcxsrv-2e5094b5a8e6241621cbf8c3e41b618347de7e2f.tar.gz vcxsrv-2e5094b5a8e6241621cbf8c3e41b618347de7e2f.tar.bz2 vcxsrv-2e5094b5a8e6241621cbf8c3e41b618347de7e2f.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 | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/mesalib/src/glsl/glsl_parser_extras.cpp b/mesalib/src/glsl/glsl_parser_extras.cpp index 07e0a6d69..8de806d4d 100644 --- a/mesalib/src/glsl/glsl_parser_extras.cpp +++ b/mesalib/src/glsl/glsl_parser_extras.cpp @@ -240,6 +240,14 @@ _mesa_glsl_process_extension(const char *name, YYLTYPE *name_locp, state->EXT_texture_array_warn = (ext_mode == extension_warn);
unsupported = !state->extensions->EXT_texture_array;
+ } else if (strcmp(name, "GL_ARB_shader_texture_lod") == 0) {
+ /* Force ARB_texture_rectangle to be on so sampler2DRects are defined */
+ state->ARB_texture_rectangle_enable = true;
+
+ state->ARB_shader_texture_lod_enable = (ext_mode != extension_disable);
+ state->ARB_shader_texture_lod_warn = (ext_mode == extension_warn);
+
+ unsupported = !state->extensions->ARB_shader_texture_lod;
} else if (strcmp(name, "GL_ARB_shader_stencil_export") == 0) {
state->ARB_shader_stencil_export_enable = (ext_mode != extension_disable);
state->ARB_shader_stencil_export_warn = (ext_mode == extension_warn);
|