svn merge ^/branches/released .

3 files changed, 14 insertions, 0 deletions

diff --git a/mesalib/src/glsl/glcpp/glcpp-parse.y b/mesalib/src/glsl/glcpp/glcpp-parse.y
index f55c51040..0b1ada90d 100644
--- a/mesalib/src/glsl/glcpp/glcpp-parse.y
+++ b/mesalib/src/glsl/glcpp/glcpp-parse.y
@@ -1128,6 +1128,10 @@ glcpp_parser_create (const struct gl_extensions *extensions, int api)
 

 	   if (extensions->ARB_explicit_attrib_location)

 	      add_builtin_define(parser, "GL_ARB_explicit_attrib_location", 1);

+

+	   if (extensions->ARB_shader_texture_lod)

+	      add_builtin_define(parser, "GL_ARB_shader_texture_lod", 1);

+

 	   if (extensions->AMD_conservative_depth)

 	      add_builtin_define(parser, "GL_AMD_conservative_depth", 1);

 	}

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);

diff --git a/mesalib/src/glsl/glsl_parser_extras.h b/mesalib/src/glsl/glsl_parser_extras.h
index 3a6bef245..acff7eac3 100644
--- a/mesalib/src/glsl/glsl_parser_extras.h
+++ b/mesalib/src/glsl/glsl_parser_extras.h
@@ -172,6 +172,8 @@ struct _mesa_glsl_parse_state {
    unsigned ARB_texture_rectangle_warn:1;

    unsigned EXT_texture_array_enable:1;

    unsigned EXT_texture_array_warn:1;

+   unsigned ARB_shader_texture_lod_enable:1;

+   unsigned ARB_shader_texture_lod_warn:1;

    unsigned ARB_shader_stencil_export_enable:1;

    unsigned ARB_shader_stencil_export_warn:1;

    unsigned AMD_conservative_depth_enable:1;