svn merge ^/branches/released .

6 files changed, 708 insertions, 631 deletions

diff --git a/mesalib/src/glsl/ast_to_hir.cpp b/mesalib/src/glsl/ast_to_hir.cpp
index 344d76b57..5e1851c11 100644
--- a/mesalib/src/glsl/ast_to_hir.cpp
+++ b/mesalib/src/glsl/ast_to_hir.cpp
@@ -1577,7 +1577,7 @@ ast_expression::hir(exec_list *instructions,
 	     */

 	    ir_variable *v = array->whole_variable_referenced();

 	    if (v != NULL)

-	       v->max_array_access = array->type->array_size();

+	       v->max_array_access = array->type->array_size() - 1;

 	 }

       }

 

@@ -2676,17 +2676,24 @@ ast_declarator_list::hir(exec_list *instructions,
        *    preceded by one of these precision qualifiers [...] Literal

        *    constants do not have precision qualifiers. Neither do Boolean

        *    variables.

+       *

+       * In GLSL ES, sampler types are also allowed.

+       *

+       * From page 87 of the GLSL ES spec:

+       *    "RESOLUTION: Allow sampler types to take a precision qualifier."

        */

       if (this->type->specifier->precision != ast_precision_none

           && !var->type->is_float()

           && !var->type->is_integer()

+          && !(var->type->is_sampler() && state->es_shader)

           && !(var->type->is_array()

                && (var->type->fields.array->is_float()

                    || var->type->fields.array->is_integer()))) {

 

          _mesa_glsl_error(&loc, state,

-                          "precision qualifiers apply only to floating point "

-                          "and integer types");

+                          "precision qualifiers apply only to floating point"

+                          "%s types", state->es_shader ? ", integer, and sampler"

+						       : "and integer");

       }

 

       /* Process the initializer and add its instructions to a temporary

diff --git a/mesalib/src/glsl/glsl_parser_extras.h b/mesalib/src/glsl/glsl_parser_extras.h
index 6351413f1..59515b5c3 100644
--- a/mesalib/src/glsl/glsl_parser_extras.h
+++ b/mesalib/src/glsl/glsl_parser_extras.h
@@ -272,8 +272,8 @@ extern "C" {
 extern int preprocess(void *ctx, const char **shader, char **info_log,

                       const struct gl_extensions *extensions, int api);

 

-extern void _mesa_destroy_shader_compiler();

-extern void _mesa_destroy_shader_compiler_caches();

+extern void _mesa_destroy_shader_compiler(void);

+extern void _mesa_destroy_shader_compiler_caches(void);

 

 #ifdef __cplusplus

 }

diff --git a/mesalib/src/glsl/ir_print_visitor.cpp b/mesalib/src/glsl/ir_print_visitor.cpp
index 3c5c4fd20..ba95103ea 100644
--- a/mesalib/src/glsl/ir_print_visitor.cpp
+++ b/mesalib/src/glsl/ir_print_visitor.cpp
@@ -25,6 +25,10 @@
 #include "glsl_types.h"

 #include "glsl_parser_extras.h"

 

+extern "C" {

+#include "program/hash_table.h"

+}

+

 static void print_type(const glsl_type *t);

 

 void

@@ -67,6 +71,21 @@ _mesa_print_ir(exec_list *instructions,
    printf("\n)");

 }

 

+ir_print_visitor::ir_print_visitor()

+{

+   indentation = 0;

+   printable_names =

+      hash_table_ctor(32, hash_table_pointer_hash, hash_table_pointer_compare);

+   symbols = _mesa_symbol_table_ctor();

+   mem_ctx = ralloc_context(NULL);

+}

+

+ir_print_visitor::~ir_print_visitor()

+{

+   hash_table_dtor(printable_names);

+   _mesa_symbol_table_dtor(symbols);

+   ralloc_free(mem_ctx);

+}

 

 void ir_print_visitor::indent(void)

 {

@@ -74,6 +93,26 @@ void ir_print_visitor::indent(void)
       printf("  ");

 }

 

+const char *

+ir_print_visitor::unique_name(ir_variable *var)

+{

+   /* Do we already have a name for this variable? */

+   const char *name = (const char *) hash_table_find(this->printable_names, var);

+   if (name != NULL)

+      return name;

+

+   /* If there's no conflict, just use the original name */

+   if (_mesa_symbol_table_find_symbol(this->symbols, -1, var->name) == NULL) {

+      name = var->name;

+   } else {

+      static unsigned i = 1;

+      name = ralloc_asprintf(this->mem_ctx, "%s@%u", var->name, ++i);

+   }

+   hash_table_insert(this->printable_names, (void *) name, var);

+   _mesa_symbol_table_add_symbol(this->symbols, -1, name, var);

+   return name;

+}

+

 static void

 print_type(const glsl_type *t)

 {

@@ -104,12 +143,13 @@ void ir_print_visitor::visit(ir_variable *ir)
 	  cent, inv, mode[ir->mode], interp[ir->interpolation]);

 

    print_type(ir->type);

-   printf(" %s@%p)", ir->name, (void *) ir);

+   printf(" %s)", unique_name(ir));

 }

 

 

 void ir_print_visitor::visit(ir_function_signature *ir)

 {

+   _mesa_symbol_table_push_scope(symbols);

    printf("(signature ");

    indentation++;

 

@@ -148,6 +188,7 @@ void ir_print_visitor::visit(ir_function_signature *ir)
    indent();

    printf("))\n");

    indentation--;

+   _mesa_symbol_table_pop_scope(symbols);

 }

 

 

@@ -265,7 +306,7 @@ void ir_print_visitor::visit(ir_swizzle *ir)
 void ir_print_visitor::visit(ir_dereference_variable *ir)

 {

    ir_variable *var = ir->variable_referenced();

-   printf("(var_ref %s@%p) ", var->name, (void *) var);

+   printf("(var_ref %s) ", unique_name(var));

 }

 

 

diff --git a/mesalib/src/glsl/ir_print_visitor.h b/mesalib/src/glsl/ir_print_visitor.h
index 4feeb8c18..ec4d00843 100644
--- a/mesalib/src/glsl/ir_print_visitor.h
+++ b/mesalib/src/glsl/ir_print_visitor.h
@@ -1,83 +1,94 @@
-/* -*- c++ -*- */
-/*
- * Copyright © 2010 Intel Corporation
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice (including the next
- * paragraph) shall be included in all copies or substantial portions of the
- * Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
- * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
- * DEALINGS IN THE SOFTWARE.
- */
-
-#pragma once
-#ifndef IR_PRINT_VISITOR_H
-#define IR_PRINT_VISITOR_H
-
-#include "ir.h"
-#include "ir_visitor.h"
-
-extern void _mesa_print_ir(exec_list *instructions,
-			   struct _mesa_glsl_parse_state *state);
-
-/**
- * Abstract base class of visitors of IR instruction trees
- */
-class ir_print_visitor : public ir_visitor {
-public:
-   ir_print_visitor()
-   {
-      indentation = 0;
-   }
-
-   virtual ~ir_print_visitor()
-   {
-      /* empty */
-   }
-
-   void indent(void);
-
-   /**
-    * \name Visit methods
-    *
-    * As typical for the visitor pattern, there must be one \c visit method for
-    * each concrete subclass of \c ir_instruction.  Virtual base classes within
-    * the hierarchy should not have \c visit methods.
-    */
-   /*@{*/
-   virtual void visit(ir_variable *);
-   virtual void visit(ir_function_signature *);
-   virtual void visit(ir_function *);
-   virtual void visit(ir_expression *);
-   virtual void visit(ir_texture *);
-   virtual void visit(ir_swizzle *);
-   virtual void visit(ir_dereference_variable *);
-   virtual void visit(ir_dereference_array *);
-   virtual void visit(ir_dereference_record *);
-   virtual void visit(ir_assignment *);
-   virtual void visit(ir_constant *);
-   virtual void visit(ir_call *);
-   virtual void visit(ir_return *);
-   virtual void visit(ir_discard *);
-   virtual void visit(ir_if *);
-   virtual void visit(ir_loop *);
-   virtual void visit(ir_loop_jump *);
-   /*@}*/
-
-private:
-   int indentation;
-};
-
-#endif /* IR_PRINT_VISITOR_H */
+/* -*- c++ -*- */

+/*

+ * Copyright © 2010 Intel Corporation

+ *

+ * Permission is hereby granted, free of charge, to any person obtaining a

+ * copy of this software and associated documentation files (the "Software"),

+ * to deal in the Software without restriction, including without limitation

+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,

+ * and/or sell copies of the Software, and to permit persons to whom the

+ * Software is furnished to do so, subject to the following conditions:

+ *

+ * The above copyright notice and this permission notice (including the next

+ * paragraph) shall be included in all copies or substantial portions of the

+ * Software.

+ *

+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR

+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,

+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL

+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER

+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING

+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER

+ * DEALINGS IN THE SOFTWARE.

+ */

+

+#pragma once

+#ifndef IR_PRINT_VISITOR_H

+#define IR_PRINT_VISITOR_H

+

+#include "ir.h"

+#include "ir_visitor.h"

+

+extern "C" {

+#include "program/symbol_table.h"

+}

+

+extern void _mesa_print_ir(exec_list *instructions,

+			   struct _mesa_glsl_parse_state *state);

+

+/**

+ * Abstract base class of visitors of IR instruction trees

+ */

+class ir_print_visitor : public ir_visitor {

+public:

+   ir_print_visitor();

+   virtual ~ir_print_visitor();

+

+   void indent(void);

+

+   /**

+    * \name Visit methods

+    *

+    * As typical for the visitor pattern, there must be one \c visit method for

+    * each concrete subclass of \c ir_instruction.  Virtual base classes within

+    * the hierarchy should not have \c visit methods.

+    */

+   /*@{*/

+   virtual void visit(ir_variable *);

+   virtual void visit(ir_function_signature *);

+   virtual void visit(ir_function *);

+   virtual void visit(ir_expression *);

+   virtual void visit(ir_texture *);

+   virtual void visit(ir_swizzle *);

+   virtual void visit(ir_dereference_variable *);

+   virtual void visit(ir_dereference_array *);

+   virtual void visit(ir_dereference_record *);

+   virtual void visit(ir_assignment *);

+   virtual void visit(ir_constant *);

+   virtual void visit(ir_call *);

+   virtual void visit(ir_return *);

+   virtual void visit(ir_discard *);

+   virtual void visit(ir_if *);

+   virtual void visit(ir_loop *);

+   virtual void visit(ir_loop_jump *);

+   /*@}*/

+

+private:

+   /**

+    * Fetch/generate a unique name for ir_variable.

+    *

+    * GLSL IR permits multiple ir_variables to share the same name.  This works

+    * fine until we try to print it, when we really need a unique one.

+    */

+   const char *unique_name(ir_variable *var);

+

+   /** A mapping from ir_variable * -> unique printable names. */

+   hash_table *printable_names;

+   _mesa_symbol_table *symbols;

+

+   void *mem_ctx;

+

+   int indentation;

+};

+

+#endif /* IR_PRINT_VISITOR_H */

diff --git a/mesalib/src/glsl/ir_validate.cpp b/mesalib/src/glsl/ir_validate.cpp
index fe6ef8145..7757f5ecd 100644
--- a/mesalib/src/glsl/ir_validate.cpp
+++ b/mesalib/src/glsl/ir_validate.cpp
@@ -473,6 +473,21 @@ ir_validate::visit(ir_variable *ir)
       assert(ralloc_parent(ir->name) == ir);

 

    hash_table_insert(ht, ir, ir);

+

+

+   /* If a variable is an array, verify that the maximum array index is in

+    * bounds.  There was once an error in AST-to-HIR conversion that set this

+    * to be out of bounds.

+    */

+   if (ir->type->array_size() > 0) {

+      if (ir->max_array_access >= ir->type->length) {

+	 printf("ir_variable has maximum access out of bounds (%d vs %d)\n",

+		ir->max_array_access, ir->type->length - 1);

+	 ir->print();

+	 abort();

+      }

+   }

+

    return visit_continue;

 }

 

diff --git a/mesalib/src/glsl/ir_variable.cpp b/mesalib/src/glsl/ir_variable.cpp
index 18a3e0fb0..a9a2e4c70 100644
--- a/mesalib/src/glsl/ir_variable.cpp
+++ b/mesalib/src/glsl/ir_variable.cpp
@@ -1,541 +1,544 @@
-/*
- * Copyright © 2010 Intel Corporation
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice (including the next
- * paragraph) shall be included in all copies or substantial portions of the
- * Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
- * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
- * DEALINGS IN THE SOFTWARE.
- */
-
-#include "ir.h"
-#include "glsl_parser_extras.h"
-#include "glsl_symbol_table.h"
-#include "builtin_variables.h"
-
-static void generate_ARB_draw_buffers_variables(exec_list *,
-						struct _mesa_glsl_parse_state *,
-						bool, _mesa_glsl_parser_targets);
-
-static void
-generate_ARB_draw_instanced_variables(exec_list *,
-                                      struct _mesa_glsl_parse_state *,
-                                      bool, _mesa_glsl_parser_targets);
-
-static ir_variable *
-add_variable(const char *name, enum ir_variable_mode mode, int slot,
-	     const glsl_type *type, exec_list *instructions,
-		     glsl_symbol_table *symtab)
-{
-   ir_variable *var = new(symtab) ir_variable(type, name, mode);
-
-   switch (var->mode) {
-   case ir_var_auto:
-   case ir_var_in:
-   case ir_var_const_in:
-   case ir_var_uniform:
-   case ir_var_system_value:
-      var->read_only = true;
-      break;
-   case ir_var_inout:
-   case ir_var_out:
-      break;
-   default:
-      assert(0);
-      break;
-   }
-
-   var->location = slot;
-   var->explicit_location = (slot >= 0);
-
-   /* Once the variable is created an initialized, add it to the symbol table
-    * and add the declaration to the IR stream.
-    */
-   instructions->push_tail(var);
-
-   symtab->add_variable(var);
-   return var;
-}
-
-static ir_variable *
-add_uniform(exec_list *instructions,
-	    struct _mesa_glsl_parse_state *state,
-	    const char *name, const glsl_type *type)
-{
-   return add_variable(name, ir_var_uniform, -1, type, instructions,
-		       state->symbols);
-}
-
-static void
-add_builtin_variable(const builtin_variable *proto, exec_list *instructions,
-		     glsl_symbol_table *symtab)
-{
-   /* Create a new variable declaration from the description supplied by
-    * the caller.
-    */
-   const glsl_type *const type = symtab->get_type(proto->type);
-
-   assert(type != NULL);
-
-   add_variable(proto->name, proto->mode, proto->slot, type, instructions,
-		symtab);
-}
-
-static void
-add_builtin_constant(exec_list *instructions,
-		     struct _mesa_glsl_parse_state *state,
-		     const char *name, int value)
-{
-   ir_variable *const var = add_variable(name, ir_var_auto,
-					 -1, glsl_type::int_type,
-					 instructions, state->symbols);
-   var->constant_value = new(var) ir_constant(value);
-}
-
-/* Several constants in GLSL ES have different names than normal desktop GLSL.
- * Therefore, this function should only be called on the ES path.
- */
-static void
-generate_100ES_uniforms(exec_list *instructions,
-		     struct _mesa_glsl_parse_state *state)
-{
-   add_builtin_constant(instructions, state, "gl_MaxVertexAttribs",
-			state->Const.MaxVertexAttribs);
-   add_builtin_constant(instructions, state, "gl_MaxVertexUniformVectors",
-			state->Const.MaxVertexUniformComponents);
-   add_builtin_constant(instructions, state, "gl_MaxVaryingVectors",
-			state->Const.MaxVaryingFloats / 4);
-   add_builtin_constant(instructions, state, "gl_MaxVertexTextureImageUnits",
-			state->Const.MaxVertexTextureImageUnits);
-   add_builtin_constant(instructions, state, "gl_MaxCombinedTextureImageUnits",
-			state->Const.MaxCombinedTextureImageUnits);
-   add_builtin_constant(instructions, state, "gl_MaxTextureImageUnits",
-			state->Const.MaxTextureImageUnits);
-   add_builtin_constant(instructions, state, "gl_MaxFragmentUniformVectors",
-			state->Const.MaxFragmentUniformComponents);
-
-   add_uniform(instructions, state, "gl_DepthRange",
-	       state->symbols->get_type("gl_DepthRangeParameters"));
-}
-
-static void
-generate_110_uniforms(exec_list *instructions,
-		      struct _mesa_glsl_parse_state *state)
-{
-   for (unsigned i = 0
-	   ; i < Elements(builtin_110_deprecated_uniforms)
-	   ; i++) {
-      add_builtin_variable(& builtin_110_deprecated_uniforms[i],
-			   instructions, state->symbols);
-   }
-
-   add_builtin_constant(instructions, state, "gl_MaxLights",
-			state->Const.MaxLights);
-   add_builtin_constant(instructions, state, "gl_MaxClipPlanes",
-			state->Const.MaxClipPlanes);
-   add_builtin_constant(instructions, state, "gl_MaxTextureUnits",
-			state->Const.MaxTextureUnits);
-   add_builtin_constant(instructions, state, "gl_MaxTextureCoords",
-			state->Const.MaxTextureCoords);
-   add_builtin_constant(instructions, state, "gl_MaxVertexAttribs",
-			state->Const.MaxVertexAttribs);
-   add_builtin_constant(instructions, state, "gl_MaxVertexUniformComponents",
-			state->Const.MaxVertexUniformComponents);
-   add_builtin_constant(instructions, state, "gl_MaxVaryingFloats",
-			state->Const.MaxVaryingFloats);
-   add_builtin_constant(instructions, state, "gl_MaxVertexTextureImageUnits",
-			state->Const.MaxVertexTextureImageUnits);
-   add_builtin_constant(instructions, state, "gl_MaxCombinedTextureImageUnits",
-			state->Const.MaxCombinedTextureImageUnits);
-   add_builtin_constant(instructions, state, "gl_MaxTextureImageUnits",
-			state->Const.MaxTextureImageUnits);
-   add_builtin_constant(instructions, state, "gl_MaxFragmentUniformComponents",
-			state->Const.MaxFragmentUniformComponents);
-
-   const glsl_type *const mat4_array_type =
-      glsl_type::get_array_instance(glsl_type::mat4_type,
-				    state->Const.MaxTextureCoords);
-
-   add_uniform(instructions, state, "gl_TextureMatrix", mat4_array_type);
-   add_uniform(instructions, state, "gl_TextureMatrixInverse", mat4_array_type);
-   add_uniform(instructions, state, "gl_TextureMatrixTranspose", mat4_array_type);
-   add_uniform(instructions, state, "gl_TextureMatrixInverseTranspose", mat4_array_type);
-
-   add_uniform(instructions, state, "gl_DepthRange",
-		state->symbols->get_type("gl_DepthRangeParameters"));
-
-   add_uniform(instructions, state, "gl_ClipPlane",
-	       glsl_type::get_array_instance(glsl_type::vec4_type,
-					     state->Const.MaxClipPlanes));
-   add_uniform(instructions, state, "gl_Point",
-	       state->symbols->get_type("gl_PointParameters"));
-
-   const glsl_type *const material_parameters_type =
-      state->symbols->get_type("gl_MaterialParameters");
-   add_uniform(instructions, state, "gl_FrontMaterial", material_parameters_type);
-   add_uniform(instructions, state, "gl_BackMaterial", material_parameters_type);
-
-   const glsl_type *const light_source_array_type =
-      glsl_type::get_array_instance(state->symbols->get_type("gl_LightSourceParameters"), state->Const.MaxLights);
-
-   add_uniform(instructions, state, "gl_LightSource", light_source_array_type);
-
-   const glsl_type *const light_model_products_type =
-      state->symbols->get_type("gl_LightModelProducts");
-   add_uniform(instructions, state, "gl_FrontLightModelProduct",
-	       light_model_products_type);
-   add_uniform(instructions, state, "gl_BackLightModelProduct",
-	       light_model_products_type);
-
-   const glsl_type *const light_products_type =
-      glsl_type::get_array_instance(state->symbols->get_type("gl_LightProducts"),
-				    state->Const.MaxLights);
-   add_uniform(instructions, state, "gl_FrontLightProduct", light_products_type);
-   add_uniform(instructions, state, "gl_BackLightProduct", light_products_type);
-
-   add_uniform(instructions, state, "gl_TextureEnvColor",
-	       glsl_type::get_array_instance(glsl_type::vec4_type,
-					     state->Const.MaxTextureUnits));
-
-   const glsl_type *const texcoords_vec4 =
-      glsl_type::get_array_instance(glsl_type::vec4_type,
-				    state->Const.MaxTextureCoords);
-   add_uniform(instructions, state, "gl_EyePlaneS", texcoords_vec4);
-   add_uniform(instructions, state, "gl_EyePlaneT", texcoords_vec4);
-   add_uniform(instructions, state, "gl_EyePlaneR", texcoords_vec4);
-   add_uniform(instructions, state, "gl_EyePlaneQ", texcoords_vec4);
-   add_uniform(instructions, state, "gl_ObjectPlaneS", texcoords_vec4);
-   add_uniform(instructions, state, "gl_ObjectPlaneT", texcoords_vec4);
-   add_uniform(instructions, state, "gl_ObjectPlaneR", texcoords_vec4);
-   add_uniform(instructions, state, "gl_ObjectPlaneQ", texcoords_vec4);
-
-   add_uniform(instructions, state, "gl_Fog",
-	       state->symbols->get_type("gl_FogParameters"));
-}
-
-/* This function should only be called for ES, not desktop GL. */
-static void
-generate_100ES_vs_variables(exec_list *instructions,
-			  struct _mesa_glsl_parse_state *state)
-{
-   for (unsigned i = 0; i < Elements(builtin_core_vs_variables); i++) {
-      add_builtin_variable(& builtin_core_vs_variables[i],
-			   instructions, state->symbols);
-   }
-
-   generate_100ES_uniforms(instructions, state);
-
-   generate_ARB_draw_buffers_variables(instructions, state, false,
-				       vertex_shader);
-}
-
-
-static void
-generate_110_vs_variables(exec_list *instructions,
-			  struct _mesa_glsl_parse_state *state)
-{
-   for (unsigned i = 0; i < Elements(builtin_core_vs_variables); i++) {
-      add_builtin_variable(& builtin_core_vs_variables[i],
-			   instructions, state->symbols);
-   }
-
-   for (unsigned i = 0
-	   ; i < Elements(builtin_110_deprecated_vs_variables)
-	   ; i++) {
-      add_builtin_variable(& builtin_110_deprecated_vs_variables[i],
-			   instructions, state->symbols);
-   }
-   generate_110_uniforms(instructions, state);
-
-   /* From page 54 (page 60 of the PDF) of the GLSL 1.20 spec:
-    *
-    *     "As with all arrays, indices used to subscript gl_TexCoord must
-    *     either be an integral constant expressions, or this array must be
-    *     re-declared by the shader with a size. The size can be at most
-    *     gl_MaxTextureCoords. Using indexes close to 0 may aid the
-    *     implementation in preserving varying resources."
-    */
-   const glsl_type *const vec4_array_type =
-      glsl_type::get_array_instance(glsl_type::vec4_type, 0);
-
-   add_variable("gl_TexCoord", ir_var_out, VERT_RESULT_TEX0, vec4_array_type,
-		instructions, state->symbols);
-
-   generate_ARB_draw_buffers_variables(instructions, state, false,
-				       vertex_shader);
-}
-
-
-static void
-generate_120_vs_variables(exec_list *instructions,
-			  struct _mesa_glsl_parse_state *state)
-{
-   /* GLSL version 1.20 did not add any built-in variables in the vertex
-    * shader.
-    */
-   generate_110_vs_variables(instructions, state);
-}
-
-
-static void
-generate_130_vs_variables(exec_list *instructions,
-			  struct _mesa_glsl_parse_state *state)
-{
-   generate_120_vs_variables(instructions, state);
-
-   for (unsigned i = 0; i < Elements(builtin_130_vs_variables); i++) {
-      add_builtin_variable(& builtin_130_vs_variables[i],
-			   instructions, state->symbols);
-   }
-
-   const glsl_type *const clip_distance_array_type =
-      glsl_type::get_array_instance(glsl_type::float_type,
-				    state->Const.MaxClipPlanes);
-
-   /* FINISHME: gl_ClipDistance needs a real location assigned. */
-   add_variable("gl_ClipDistance", ir_var_out, -1, clip_distance_array_type,
-		instructions, state->symbols);
-
-}
-
-
-static void
-initialize_vs_variables(exec_list *instructions,
-			struct _mesa_glsl_parse_state *state)
-{
-
-   switch (state->language_version) {
-   case 100:
-      generate_100ES_vs_variables(instructions, state);
-      break;
-   case 110:
-      generate_110_vs_variables(instructions, state);
-      break;
-   case 120:
-      generate_120_vs_variables(instructions, state);
-      break;
-   case 130:
-      generate_130_vs_variables(instructions, state);
-      break;
-   }
-
-   if (state->ARB_draw_instanced_enable)
-      generate_ARB_draw_instanced_variables(instructions, state, false,
-                                            vertex_shader);
-}
-
-
-/* This function should only be called for ES, not desktop GL. */
-static void
-generate_100ES_fs_variables(exec_list *instructions,
-			  struct _mesa_glsl_parse_state *state)
-{
-   for (unsigned i = 0; i < Elements(builtin_core_fs_variables); i++) {
-      add_builtin_variable(& builtin_core_fs_variables[i],
-			   instructions, state->symbols);
-   }
-
-   for (unsigned i = 0; i < Elements(builtin_100ES_fs_variables); i++) {
-      add_builtin_variable(& builtin_100ES_fs_variables[i],
-			   instructions, state->symbols);
-   }
-
-   generate_100ES_uniforms(instructions, state);
-
-   generate_ARB_draw_buffers_variables(instructions, state, false,
-				       fragment_shader);
-}
-
-static void
-generate_110_fs_variables(exec_list *instructions,
-			  struct _mesa_glsl_parse_state *state)
-{
-   for (unsigned i = 0; i < Elements(builtin_core_fs_variables); i++) {
-      add_builtin_variable(& builtin_core_fs_variables[i],
-			   instructions, state->symbols);
-   }
-
-   for (unsigned i = 0; i < Elements(builtin_110_fs_variables); i++) {
-      add_builtin_variable(& builtin_110_fs_variables[i],
-			   instructions, state->symbols);
-   }
-
-   for (unsigned i = 0
-	   ; i < Elements(builtin_110_deprecated_fs_variables)
-	   ; i++) {
-      add_builtin_variable(& builtin_110_deprecated_fs_variables[i],
-			   instructions, state->symbols);
-   }
-   generate_110_uniforms(instructions, state);
-
-   /* From page 54 (page 60 of the PDF) of the GLSL 1.20 spec:
-    *
-    *     "As with all arrays, indices used to subscript gl_TexCoord must
-    *     either be an integral constant expressions, or this array must be
-    *     re-declared by the shader with a size. The size can be at most
-    *     gl_MaxTextureCoords. Using indexes close to 0 may aid the
-    *     implementation in preserving varying resources."
-    */
-   const glsl_type *const vec4_array_type =
-      glsl_type::get_array_instance(glsl_type::vec4_type, 0);
-
-   add_variable("gl_TexCoord", ir_var_in, FRAG_ATTRIB_TEX0, vec4_array_type,
-		instructions, state->symbols);
-
-   generate_ARB_draw_buffers_variables(instructions, state, false,
-				       fragment_shader);
-}
-
-
-static void
-generate_ARB_draw_buffers_variables(exec_list *instructions,
-				    struct _mesa_glsl_parse_state *state,
-				    bool warn, _mesa_glsl_parser_targets target)
-{
-   /* gl_MaxDrawBuffers is available in all shader stages.
-    */
-   ir_variable *const mdb =
-      add_variable("gl_MaxDrawBuffers", ir_var_auto, -1,
-		   glsl_type::int_type, instructions, state->symbols);
-
-   if (warn)
-      mdb->warn_extension = "GL_ARB_draw_buffers";
-
-   mdb->constant_value = new(mdb)
-      ir_constant(int(state->Const.MaxDrawBuffers));
-
-
-   /* gl_FragData is only available in the fragment shader.
-    */
-   if (target == fragment_shader) {
-      const glsl_type *const vec4_array_type =
-	 glsl_type::get_array_instance(glsl_type::vec4_type,
-				       state->Const.MaxDrawBuffers);
-
-      ir_variable *const fd =
-	 add_variable("gl_FragData", ir_var_out, FRAG_RESULT_DATA0,
-		      vec4_array_type, instructions, state->symbols);
-
-      if (warn)
-	 fd->warn_extension = "GL_ARB_draw_buffers";
-   }
-}
-
-
-static void
-generate_ARB_draw_instanced_variables(exec_list *instructions,
-                                      struct _mesa_glsl_parse_state *state,
-                                      bool warn,
-                                      _mesa_glsl_parser_targets target)
-{
-   /* gl_InstanceIDARB is only available in the vertex shader.
-    */
-   if (target == vertex_shader) {
-      ir_variable *const inst =
-         add_variable("gl_InstanceIDARB", ir_var_system_value,
-                      SYSTEM_VALUE_INSTANCE_ID,
-                      glsl_type::int_type, instructions, state->symbols);
-
-      if (warn)
-         inst->warn_extension = "GL_ARB_draw_instanced";
-   }
-}
-
-
-static void
-generate_ARB_shader_stencil_export_variables(exec_list *instructions,
-					     struct _mesa_glsl_parse_state *state,
-					     bool warn)
-{
-   /* gl_FragStencilRefARB is only available in the fragment shader.
-    */
-   ir_variable *const fd =
-      add_variable("gl_FragStencilRefARB", ir_var_out, FRAG_RESULT_STENCIL,
-		   glsl_type::int_type, instructions, state->symbols);
-
-   if (warn)
-      fd->warn_extension = "GL_ARB_shader_stencil_export";
-}
-
-static void
-generate_120_fs_variables(exec_list *instructions,
-			  struct _mesa_glsl_parse_state *state)
-{
-   generate_110_fs_variables(instructions, state);
-
-   for (unsigned i = 0
-	   ; i < Elements(builtin_120_fs_variables)
-	   ; i++) {
-      add_builtin_variable(& builtin_120_fs_variables[i],
-			   instructions, state->symbols);
-   }
-}
-
-static void
-generate_130_fs_variables(exec_list *instructions,
-			  struct _mesa_glsl_parse_state *state)
-{
-   generate_120_fs_variables(instructions, state);
-
-   const glsl_type *const clip_distance_array_type =
-      glsl_type::get_array_instance(glsl_type::float_type,
-				    state->Const.MaxClipPlanes);
-
-   /* FINISHME: gl_ClipDistance needs a real location assigned. */
-   add_variable("gl_ClipDistance", ir_var_in, -1, clip_distance_array_type,
-		instructions, state->symbols);
-}
-
-static void
-initialize_fs_variables(exec_list *instructions,
-			struct _mesa_glsl_parse_state *state)
-{
-
-   switch (state->language_version) {
-   case 100:
-      generate_100ES_fs_variables(instructions, state);
-      break;
-   case 110:
-      generate_110_fs_variables(instructions, state);
-      break;
-   case 120:
-      generate_120_fs_variables(instructions, state);
-      break;
-   case 130:
-      generate_130_fs_variables(instructions, state);
-      break;
-   }
-
-   if (state->ARB_shader_stencil_export_enable)
-      generate_ARB_shader_stencil_export_variables(instructions, state,
-						   state->ARB_shader_stencil_export_warn);
-}
-
-void
-_mesa_glsl_initialize_variables(exec_list *instructions,
-				struct _mesa_glsl_parse_state *state)
-{
-   switch (state->target) {
-   case vertex_shader:
-      initialize_vs_variables(instructions, state);
-      break;
-   case geometry_shader:
-      break;
-   case fragment_shader:
-      initialize_fs_variables(instructions, state);
-      break;
-   }
-}
+/*

+ * Copyright © 2010 Intel Corporation

+ *

+ * Permission is hereby granted, free of charge, to any person obtaining a

+ * copy of this software and associated documentation files (the "Software"),

+ * to deal in the Software without restriction, including without limitation

+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,

+ * and/or sell copies of the Software, and to permit persons to whom the

+ * Software is furnished to do so, subject to the following conditions:

+ *

+ * The above copyright notice and this permission notice (including the next

+ * paragraph) shall be included in all copies or substantial portions of the

+ * Software.

+ *

+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR

+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,

+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL

+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER

+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING

+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER

+ * DEALINGS IN THE SOFTWARE.

+ */

+

+#include "ir.h"

+#include "glsl_parser_extras.h"

+#include "glsl_symbol_table.h"

+#include "builtin_variables.h"

+

+static void generate_ARB_draw_buffers_variables(exec_list *,

+						struct _mesa_glsl_parse_state *,

+						bool, _mesa_glsl_parser_targets);

+

+static void

+generate_ARB_draw_instanced_variables(exec_list *,

+                                      struct _mesa_glsl_parse_state *,

+                                      bool, _mesa_glsl_parser_targets);

+

+static ir_variable *

+add_variable(exec_list *instructions, glsl_symbol_table *symtab,

+	     const char *name, const glsl_type *type,

+	     enum ir_variable_mode mode, int slot)

+{

+   ir_variable *var = new(symtab) ir_variable(type, name, mode);

+

+   switch (var->mode) {

+   case ir_var_auto:

+   case ir_var_in:

+   case ir_var_const_in:

+   case ir_var_uniform:

+   case ir_var_system_value:

+      var->read_only = true;

+      break;

+   case ir_var_inout:

+   case ir_var_out:

+      break;

+   default:

+      assert(0);

+      break;

+   }

+

+   var->location = slot;

+   var->explicit_location = (slot >= 0);

+

+   /* Once the variable is created an initialized, add it to the symbol table

+    * and add the declaration to the IR stream.

+    */

+   instructions->push_tail(var);

+

+   symtab->add_variable(var);

+   return var;

+}

+

+static ir_variable *

+add_uniform(exec_list *instructions, glsl_symbol_table *symtab,

+	    const char *name, const glsl_type *type)

+{

+   return add_variable(instructions, symtab, name, type, ir_var_uniform, -1);

+}

+

+static void

+add_builtin_variable(exec_list *instructions, glsl_symbol_table *symtab,

+		     const builtin_variable *proto)

+{

+   /* Create a new variable declaration from the description supplied by

+    * the caller.

+    */

+   const glsl_type *const type = symtab->get_type(proto->type);

+

+   assert(type != NULL);

+

+   add_variable(instructions, symtab, proto->name, type, proto->mode,

+		proto->slot);

+}

+

+static void

+add_builtin_constant(exec_list *instructions, glsl_symbol_table *symtab,

+		     const char *name, int value)

+{

+   ir_variable *const var = add_variable(instructions, symtab,

+					 name, glsl_type::int_type,

+					 ir_var_auto, -1);

+   var->constant_value = new(var) ir_constant(value);

+}

+

+/* Several constants in GLSL ES have different names than normal desktop GLSL.

+ * Therefore, this function should only be called on the ES path.

+ */

+static void

+generate_100ES_uniforms(exec_list *instructions,

+		     struct _mesa_glsl_parse_state *state)

+{

+   glsl_symbol_table *const symtab = state->symbols;

+

+   add_builtin_constant(instructions, symtab, "gl_MaxVertexAttribs",

+			state->Const.MaxVertexAttribs);

+   add_builtin_constant(instructions, symtab, "gl_MaxVertexUniformVectors",

+			state->Const.MaxVertexUniformComponents);

+   add_builtin_constant(instructions, symtab, "gl_MaxVaryingVectors",

+			state->Const.MaxVaryingFloats / 4);

+   add_builtin_constant(instructions, symtab, "gl_MaxVertexTextureImageUnits",

+			state->Const.MaxVertexTextureImageUnits);

+   add_builtin_constant(instructions, symtab, "gl_MaxCombinedTextureImageUnits",

+			state->Const.MaxCombinedTextureImageUnits);

+   add_builtin_constant(instructions, symtab, "gl_MaxTextureImageUnits",

+			state->Const.MaxTextureImageUnits);

+   add_builtin_constant(instructions, symtab, "gl_MaxFragmentUniformVectors",

+			state->Const.MaxFragmentUniformComponents);

+

+   add_uniform(instructions, symtab, "gl_DepthRange",

+	       state->symbols->get_type("gl_DepthRangeParameters"));

+}

+

+static void

+generate_110_uniforms(exec_list *instructions,

+		      struct _mesa_glsl_parse_state *state)

+{

+   glsl_symbol_table *const symtab = state->symbols;

+

+   for (unsigned i = 0

+	   ; i < Elements(builtin_110_deprecated_uniforms)

+	   ; i++) {

+      add_builtin_variable(instructions, symtab,

+			   & builtin_110_deprecated_uniforms[i]);

+   }

+

+   add_builtin_constant(instructions, symtab, "gl_MaxLights",

+			state->Const.MaxLights);

+   add_builtin_constant(instructions, symtab, "gl_MaxClipPlanes",

+			state->Const.MaxClipPlanes);

+   add_builtin_constant(instructions, symtab, "gl_MaxTextureUnits",

+			state->Const.MaxTextureUnits);

+   add_builtin_constant(instructions, symtab, "gl_MaxTextureCoords",

+			state->Const.MaxTextureCoords);

+   add_builtin_constant(instructions, symtab, "gl_MaxVertexAttribs",

+			state->Const.MaxVertexAttribs);

+   add_builtin_constant(instructions, symtab, "gl_MaxVertexUniformComponents",

+			state->Const.MaxVertexUniformComponents);

+   add_builtin_constant(instructions, symtab, "gl_MaxVaryingFloats",

+			state->Const.MaxVaryingFloats);

+   add_builtin_constant(instructions, symtab, "gl_MaxVertexTextureImageUnits",

+			state->Const.MaxVertexTextureImageUnits);

+   add_builtin_constant(instructions, symtab, "gl_MaxCombinedTextureImageUnits",

+			state->Const.MaxCombinedTextureImageUnits);

+   add_builtin_constant(instructions, symtab, "gl_MaxTextureImageUnits",

+			state->Const.MaxTextureImageUnits);

+   add_builtin_constant(instructions, symtab, "gl_MaxFragmentUniformComponents",

+			state->Const.MaxFragmentUniformComponents);

+

+   const glsl_type *const mat4_array_type =

+      glsl_type::get_array_instance(glsl_type::mat4_type,

+				    state->Const.MaxTextureCoords);

+

+   add_uniform(instructions, symtab, "gl_TextureMatrix", mat4_array_type);

+   add_uniform(instructions, symtab, "gl_TextureMatrixInverse", mat4_array_type);

+   add_uniform(instructions, symtab, "gl_TextureMatrixTranspose", mat4_array_type);

+   add_uniform(instructions, symtab, "gl_TextureMatrixInverseTranspose", mat4_array_type);

+

+   add_uniform(instructions, symtab, "gl_DepthRange",

+		symtab->get_type("gl_DepthRangeParameters"));

+

+   add_uniform(instructions, symtab, "gl_ClipPlane",

+	       glsl_type::get_array_instance(glsl_type::vec4_type,

+					     state->Const.MaxClipPlanes));

+   add_uniform(instructions, symtab, "gl_Point",

+	       symtab->get_type("gl_PointParameters"));

+

+   const glsl_type *const material_parameters_type =

+      symtab->get_type("gl_MaterialParameters");

+   add_uniform(instructions, symtab, "gl_FrontMaterial", material_parameters_type);

+   add_uniform(instructions, symtab, "gl_BackMaterial", material_parameters_type);

+

+   const glsl_type *const light_source_array_type =

+      glsl_type::get_array_instance(symtab->get_type("gl_LightSourceParameters"), state->Const.MaxLights);

+

+   add_uniform(instructions, symtab, "gl_LightSource", light_source_array_type);

+

+   const glsl_type *const light_model_products_type =

+      symtab->get_type("gl_LightModelProducts");

+   add_uniform(instructions, symtab, "gl_FrontLightModelProduct",

+	       light_model_products_type);

+   add_uniform(instructions, symtab, "gl_BackLightModelProduct",

+	       light_model_products_type);

+

+   const glsl_type *const light_products_type =

+      glsl_type::get_array_instance(symtab->get_type("gl_LightProducts"),

+				    state->Const.MaxLights);

+   add_uniform(instructions, symtab, "gl_FrontLightProduct", light_products_type);

+   add_uniform(instructions, symtab, "gl_BackLightProduct", light_products_type);

+

+   add_uniform(instructions, symtab, "gl_TextureEnvColor",

+	       glsl_type::get_array_instance(glsl_type::vec4_type,

+					     state->Const.MaxTextureUnits));

+

+   const glsl_type *const texcoords_vec4 =

+      glsl_type::get_array_instance(glsl_type::vec4_type,

+				    state->Const.MaxTextureCoords);

+   add_uniform(instructions, symtab, "gl_EyePlaneS", texcoords_vec4);

+   add_uniform(instructions, symtab, "gl_EyePlaneT", texcoords_vec4);

+   add_uniform(instructions, symtab, "gl_EyePlaneR", texcoords_vec4);

+   add_uniform(instructions, symtab, "gl_EyePlaneQ", texcoords_vec4);

+   add_uniform(instructions, symtab, "gl_ObjectPlaneS", texcoords_vec4);

+   add_uniform(instructions, symtab, "gl_ObjectPlaneT", texcoords_vec4);

+   add_uniform(instructions, symtab, "gl_ObjectPlaneR", texcoords_vec4);

+   add_uniform(instructions, symtab, "gl_ObjectPlaneQ", texcoords_vec4);

+

+   add_uniform(instructions, symtab, "gl_Fog",

+	       symtab->get_type("gl_FogParameters"));

+}

+

+/* This function should only be called for ES, not desktop GL. */

+static void

+generate_100ES_vs_variables(exec_list *instructions,

+			  struct _mesa_glsl_parse_state *state)

+{

+   for (unsigned i = 0; i < Elements(builtin_core_vs_variables); i++) {

+      add_builtin_variable(instructions, state->symbols,

+			   & builtin_core_vs_variables[i]);

+   }

+

+   generate_100ES_uniforms(instructions, state);

+

+   generate_ARB_draw_buffers_variables(instructions, state, false,

+				       vertex_shader);

+}

+

+

+static void

+generate_110_vs_variables(exec_list *instructions,

+			  struct _mesa_glsl_parse_state *state)

+{

+   for (unsigned i = 0; i < Elements(builtin_core_vs_variables); i++) {

+      add_builtin_variable(instructions, state->symbols,

+			   & builtin_core_vs_variables[i]);

+   }

+

+   for (unsigned i = 0

+	   ; i < Elements(builtin_110_deprecated_vs_variables)

+	   ; i++) {

+      add_builtin_variable(instructions, state->symbols,

+			   & builtin_110_deprecated_vs_variables[i]);

+   }

+   generate_110_uniforms(instructions, state);

+

+   /* From page 54 (page 60 of the PDF) of the GLSL 1.20 spec:

+    *

+    *     "As with all arrays, indices used to subscript gl_TexCoord must

+    *     either be an integral constant expressions, or this array must be

+    *     re-declared by the shader with a size. The size can be at most

+    *     gl_MaxTextureCoords. Using indexes close to 0 may aid the

+    *     implementation in preserving varying resources."

+    */

+   const glsl_type *const vec4_array_type =

+      glsl_type::get_array_instance(glsl_type::vec4_type, 0);

+

+   add_variable(instructions, state->symbols,

+		"gl_TexCoord", vec4_array_type, ir_var_out, VERT_RESULT_TEX0);

+

+   generate_ARB_draw_buffers_variables(instructions, state, false,

+				       vertex_shader);

+}

+

+

+static void

+generate_120_vs_variables(exec_list *instructions,

+			  struct _mesa_glsl_parse_state *state)

+{

+   /* GLSL version 1.20 did not add any built-in variables in the vertex

+    * shader.

+    */

+   generate_110_vs_variables(instructions, state);

+}

+

+

+static void

+generate_130_vs_variables(exec_list *instructions,

+			  struct _mesa_glsl_parse_state *state)

+{

+   generate_120_vs_variables(instructions, state);

+

+   for (unsigned i = 0; i < Elements(builtin_130_vs_variables); i++) {

+      add_builtin_variable(instructions, state->symbols,

+			   & builtin_130_vs_variables[i]);

+   }

+

+   const glsl_type *const clip_distance_array_type =

+      glsl_type::get_array_instance(glsl_type::float_type,

+				    state->Const.MaxClipPlanes);

+

+   /* FINISHME: gl_ClipDistance needs a real location assigned. */

+   add_variable(instructions, state->symbols,

+		"gl_ClipDistance", clip_distance_array_type, ir_var_out, -1);

+

+}

+

+

+static void

+initialize_vs_variables(exec_list *instructions,

+			struct _mesa_glsl_parse_state *state)

+{

+

+   switch (state->language_version) {

+   case 100:

+      generate_100ES_vs_variables(instructions, state);

+      break;

+   case 110:

+      generate_110_vs_variables(instructions, state);

+      break;

+   case 120:

+      generate_120_vs_variables(instructions, state);

+      break;

+   case 130:

+      generate_130_vs_variables(instructions, state);

+      break;

+   }

+

+   if (state->ARB_draw_instanced_enable)

+      generate_ARB_draw_instanced_variables(instructions, state, false,

+                                            vertex_shader);

+}

+

+

+/* This function should only be called for ES, not desktop GL. */

+static void

+generate_100ES_fs_variables(exec_list *instructions,

+			  struct _mesa_glsl_parse_state *state)

+{

+   for (unsigned i = 0; i < Elements(builtin_core_fs_variables); i++) {

+      add_builtin_variable(instructions, state->symbols,

+			   & builtin_core_fs_variables[i]);

+   }

+

+   for (unsigned i = 0; i < Elements(builtin_100ES_fs_variables); i++) {

+      add_builtin_variable(instructions, state->symbols,

+			   & builtin_100ES_fs_variables[i]);

+   }

+

+   generate_100ES_uniforms(instructions, state);

+

+   generate_ARB_draw_buffers_variables(instructions, state, false,

+				       fragment_shader);

+}

+

+static void

+generate_110_fs_variables(exec_list *instructions,

+			  struct _mesa_glsl_parse_state *state)

+{

+   for (unsigned i = 0; i < Elements(builtin_core_fs_variables); i++) {

+      add_builtin_variable(instructions, state->symbols,

+			   & builtin_core_fs_variables[i]);

+   }

+

+   for (unsigned i = 0; i < Elements(builtin_110_fs_variables); i++) {

+      add_builtin_variable(instructions, state->symbols,

+			   & builtin_110_fs_variables[i]);

+   }

+

+   for (unsigned i = 0

+	   ; i < Elements(builtin_110_deprecated_fs_variables)

+	   ; i++) {

+      add_builtin_variable(instructions, state->symbols,

+			   & builtin_110_deprecated_fs_variables[i]);

+   }

+   generate_110_uniforms(instructions, state);

+

+   /* From page 54 (page 60 of the PDF) of the GLSL 1.20 spec:

+    *

+    *     "As with all arrays, indices used to subscript gl_TexCoord must

+    *     either be an integral constant expressions, or this array must be

+    *     re-declared by the shader with a size. The size can be at most

+    *     gl_MaxTextureCoords. Using indexes close to 0 may aid the

+    *     implementation in preserving varying resources."

+    */

+   const glsl_type *const vec4_array_type =

+      glsl_type::get_array_instance(glsl_type::vec4_type, 0);

+

+   add_variable(instructions, state->symbols,

+		"gl_TexCoord", vec4_array_type, ir_var_in, FRAG_ATTRIB_TEX0);

+

+   generate_ARB_draw_buffers_variables(instructions, state, false,

+				       fragment_shader);

+}

+

+

+static void

+generate_ARB_draw_buffers_variables(exec_list *instructions,

+				    struct _mesa_glsl_parse_state *state,

+				    bool warn, _mesa_glsl_parser_targets target)

+{

+   /* gl_MaxDrawBuffers is available in all shader stages.

+    */

+   ir_variable *const mdb =

+      add_variable(instructions, state->symbols,

+		   "gl_MaxDrawBuffers", glsl_type::int_type, ir_var_auto, -1);

+

+   if (warn)

+      mdb->warn_extension = "GL_ARB_draw_buffers";

+

+   mdb->constant_value = new(mdb)

+      ir_constant(int(state->Const.MaxDrawBuffers));

+

+

+   /* gl_FragData is only available in the fragment shader.

+    */

+   if (target == fragment_shader) {

+      const glsl_type *const vec4_array_type =

+	 glsl_type::get_array_instance(glsl_type::vec4_type,

+				       state->Const.MaxDrawBuffers);

+

+      ir_variable *const fd =

+	 add_variable(instructions, state->symbols,

+		      "gl_FragData", vec4_array_type,

+		      ir_var_out, FRAG_RESULT_DATA0);

+

+      if (warn)

+	 fd->warn_extension = "GL_ARB_draw_buffers";

+   }

+}

+

+

+static void

+generate_ARB_draw_instanced_variables(exec_list *instructions,

+                                      struct _mesa_glsl_parse_state *state,

+                                      bool warn,

+                                      _mesa_glsl_parser_targets target)

+{

+   /* gl_InstanceIDARB is only available in the vertex shader.

+    */

+   if (target == vertex_shader) {

+      ir_variable *const inst =

+         add_variable(instructions, state->symbols,

+		      "gl_InstanceIDARB", glsl_type::int_type,

+		      ir_var_system_value, SYSTEM_VALUE_INSTANCE_ID);

+

+      if (warn)

+         inst->warn_extension = "GL_ARB_draw_instanced";

+   }

+}

+

+

+static void

+generate_ARB_shader_stencil_export_variables(exec_list *instructions,

+					     struct _mesa_glsl_parse_state *state,

+					     bool warn)

+{

+   /* gl_FragStencilRefARB is only available in the fragment shader.

+    */

+   ir_variable *const fd =

+      add_variable(instructions, state->symbols,

+		   "gl_FragStencilRefARB", glsl_type::int_type,

+		   ir_var_out, FRAG_RESULT_STENCIL);

+

+   if (warn)

+      fd->warn_extension = "GL_ARB_shader_stencil_export";

+}

+

+static void

+generate_120_fs_variables(exec_list *instructions,

+			  struct _mesa_glsl_parse_state *state)

+{

+   generate_110_fs_variables(instructions, state);

+

+   for (unsigned i = 0

+	   ; i < Elements(builtin_120_fs_variables)

+	   ; i++) {

+      add_builtin_variable(instructions, state->symbols,

+			   & builtin_120_fs_variables[i]);

+   }

+}

+

+static void

+generate_130_fs_variables(exec_list *instructions,

+			  struct _mesa_glsl_parse_state *state)

+{

+   generate_120_fs_variables(instructions, state);

+

+   const glsl_type *const clip_distance_array_type =

+      glsl_type::get_array_instance(glsl_type::float_type,

+				    state->Const.MaxClipPlanes);

+

+   /* FINISHME: gl_ClipDistance needs a real location assigned. */

+   add_variable(instructions, state->symbols,

+		"gl_ClipDistance", clip_distance_array_type, ir_var_in, -1);

+}

+

+static void

+initialize_fs_variables(exec_list *instructions,

+			struct _mesa_glsl_parse_state *state)

+{

+

+   switch (state->language_version) {

+   case 100:

+      generate_100ES_fs_variables(instructions, state);

+      break;

+   case 110:

+      generate_110_fs_variables(instructions, state);

+      break;

+   case 120:

+      generate_120_fs_variables(instructions, state);

+      break;

+   case 130:

+      generate_130_fs_variables(instructions, state);

+      break;

+   }

+

+   if (state->ARB_shader_stencil_export_enable)

+      generate_ARB_shader_stencil_export_variables(instructions, state,

+						   state->ARB_shader_stencil_export_warn);

+}

+

+void

+_mesa_glsl_initialize_variables(exec_list *instructions,

+				struct _mesa_glsl_parse_state *state)

+{

+   switch (state->target) {

+   case vertex_shader:

+      initialize_vs_variables(instructions, state);

+      break;

+   case geometry_shader:

+      break;

+   case fragment_shader:

+      initialize_fs_variables(instructions, state);

+      break;

+   }

+}