svn merge ^/branches/released .

24 files changed, 7907 insertions, 7956 deletions

diff --git a/mesalib/src/glsl/ast_expr.cpp b/mesalib/src/glsl/ast_expr.cpp
index 974beb9f6..e8812e7a1 100644
--- a/mesalib/src/glsl/ast_expr.cpp
+++ b/mesalib/src/glsl/ast_expr.cpp
@@ -1,98 +1,95 @@
-/*
- * 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 <cstdio>
-#include <cassert>
-#include "ast.h"
-
-using std::printf;
-
-const char *
-ast_expression::operator_string(enum ast_operators op)
-{
-   static const char *const operators[] = {
-      "=",
-      "+",
-      "-",
-      "+",
-      "-",
-      "*",
-      "/",
-      "%",
-      "<<",
-      ">>",
-      "<",
-      ">",
-      "<=",
-      ">=",
-      "==",
-      "!=",
-      "&",
-      "^",
-      "|",
-      "~",
-      "&&",
-      "^^",
-      "||",
-      "!",
-
-      "*=",
-      "/=",
-      "%=",
-      "+=",
-      "-=",
-      "<<=",
-      ">>=",
-      "&=",
-      "^=",
-      "|=",
-
-      "?:",
-
-      "++",
-      "--",
-      "++",
-      "--",
-      ".",
-   };
-
-   assert((unsigned int)op < sizeof(operators) / sizeof(operators[0]));
-
-   return operators[op];
-}
-
-
-ast_expression_bin::ast_expression_bin(int oper, ast_expression *ex0,
-				       ast_expression *ex1) :
-   ast_expression(oper, ex0, ex1, NULL)
-{
-   assert((oper >= ast_plus) && (oper <= ast_logic_not));
-}
-
-
-void
-ast_expression_bin::print(void) const
-{
-   subexpressions[0]->print();
-   printf("%s ", operator_string(oper));
-   subexpressions[1]->print();
-}
+/*

+ * 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 <assert.h>

+#include "ast.h"

+

+const char *

+ast_expression::operator_string(enum ast_operators op)

+{

+   static const char *const operators[] = {

+      "=",

+      "+",

+      "-",

+      "+",

+      "-",

+      "*",

+      "/",

+      "%",

+      "<<",

+      ">>",

+      "<",

+      ">",

+      "<=",

+      ">=",

+      "==",

+      "!=",

+      "&",

+      "^",

+      "|",

+      "~",

+      "&&",

+      "^^",

+      "||",

+      "!",

+

+      "*=",

+      "/=",

+      "%=",

+      "+=",

+      "-=",

+      "<<=",

+      ">>=",

+      "&=",

+      "^=",

+      "|=",

+

+      "?:",

+

+      "++",

+      "--",

+      "++",

+      "--",

+      ".",

+   };

+

+   assert((unsigned int)op < sizeof(operators) / sizeof(operators[0]));

+

+   return operators[op];

+}

+

+

+ast_expression_bin::ast_expression_bin(int oper, ast_expression *ex0,

+				       ast_expression *ex1) :

+   ast_expression(oper, ex0, ex1, NULL)

+{

+   assert((oper >= ast_plus) && (oper <= ast_logic_not));

+}

+

+

+void

+ast_expression_bin::print(void) const

+{

+   subexpressions[0]->print();

+   printf("%s ", operator_string(oper));

+   subexpressions[1]->print();

+}

diff --git a/mesalib/src/glsl/ast_type.cpp b/mesalib/src/glsl/ast_type.cpp
index 5ddfeec87..8e49bef8a 100644
--- a/mesalib/src/glsl/ast_type.cpp
+++ b/mesalib/src/glsl/ast_type.cpp
@@ -1,141 +1,138 @@
-/*
- * 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 <cstdio>
-#include "ast.h"
-extern "C" {
-#include "program/symbol_table.h"
-}
-
-using std::printf;
-
-void
-ast_type_specifier::print(void) const
-{
-   if (type_specifier == ast_struct) {
-      structure->print();
-   } else {
-      printf("%s ", type_name);
-   }
-
-   if (is_array) {
-      printf("[ ");
-
-      if (array_size) {
-	 array_size->print();
-      }
-
-      printf("] ");
-   }
-}
-
-ast_type_specifier::ast_type_specifier(int specifier)
-      : type_specifier(ast_types(specifier)), type_name(NULL), structure(NULL),
-	is_array(false), array_size(NULL), precision(ast_precision_none),
-	is_precision_statement(false)
-{
-   static const char *const names[] = {
-      "void",
-      "float",
-      "int",
-      "uint",
-      "bool",
-      "vec2",
-      "vec3",
-      "vec4",
-      "bvec2",
-      "bvec3",
-      "bvec4",
-      "ivec2",
-      "ivec3",
-      "ivec4",
-      "uvec2",
-      "uvec3",
-      "uvec4",
-      "mat2",
-      "mat2x3",
-      "mat2x4",
-      "mat3x2",
-      "mat3",
-      "mat3x4",
-      "mat4x2",
-      "mat4x3",
-      "mat4",
-      "sampler1D",
-      "sampler2D",
-      "sampler2DRect",
-      "sampler3D",
-      "samplerCube",
-      "sampler1DShadow",
-      "sampler2DShadow",
-      "sampler2DRectShadow",
-      "samplerCubeShadow",
-      "sampler1DArray",
-      "sampler2DArray",
-      "sampler1DArrayShadow",
-      "sampler2DArrayShadow",
-      "isampler1D",
-      "isampler2D",
-      "isampler3D",
-      "isamplerCube",
-      "isampler1DArray",
-      "isampler2DArray",
-      "usampler1D",
-      "usampler2D",
-      "usampler3D",
-      "usamplerCube",
-      "usampler1DArray",
-      "usampler2DArray",
-
-      NULL, /* ast_struct */
-      NULL  /* ast_type_name */
-   };
-
-   type_name = names[specifier];
-}
-
-bool
-ast_fully_specified_type::has_qualifiers() const
-{
-   return this->qualifier.flags.i != 0;
-}
-
-bool ast_type_qualifier::has_interpolation() const
-{
-   return this->flags.q.smooth
-          || this->flags.q.flat
-          || this->flags.q.noperspective;
-}
-
-const char*
-ast_type_qualifier::interpolation_string() const
-{
-   if (this->flags.q.smooth)
-      return "smooth";
-   else if (this->flags.q.flat)
-      return "flat";
-   else if (this->flags.q.noperspective)
-      return "noperspective";
-   else
-      return NULL;
-}
+/*

+ * 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 "ast.h"

+extern "C" {

+#include "program/symbol_table.h"

+}

+

+void

+ast_type_specifier::print(void) const

+{

+   if (type_specifier == ast_struct) {

+      structure->print();

+   } else {

+      printf("%s ", type_name);

+   }

+

+   if (is_array) {

+      printf("[ ");

+

+      if (array_size) {

+	 array_size->print();

+      }

+

+      printf("] ");

+   }

+}

+

+ast_type_specifier::ast_type_specifier(int specifier)

+      : type_specifier(ast_types(specifier)), type_name(NULL), structure(NULL),

+	is_array(false), array_size(NULL), precision(ast_precision_none),

+	is_precision_statement(false)

+{

+   static const char *const names[] = {

+      "void",

+      "float",

+      "int",

+      "uint",

+      "bool",

+      "vec2",

+      "vec3",

+      "vec4",

+      "bvec2",

+      "bvec3",

+      "bvec4",

+      "ivec2",

+      "ivec3",

+      "ivec4",

+      "uvec2",

+      "uvec3",

+      "uvec4",

+      "mat2",

+      "mat2x3",

+      "mat2x4",

+      "mat3x2",

+      "mat3",

+      "mat3x4",

+      "mat4x2",

+      "mat4x3",

+      "mat4",

+      "sampler1D",

+      "sampler2D",

+      "sampler2DRect",

+      "sampler3D",

+      "samplerCube",

+      "sampler1DShadow",

+      "sampler2DShadow",

+      "sampler2DRectShadow",

+      "samplerCubeShadow",

+      "sampler1DArray",

+      "sampler2DArray",

+      "sampler1DArrayShadow",

+      "sampler2DArrayShadow",

+      "isampler1D",

+      "isampler2D",

+      "isampler3D",

+      "isamplerCube",

+      "isampler1DArray",

+      "isampler2DArray",

+      "usampler1D",

+      "usampler2D",

+      "usampler3D",

+      "usamplerCube",

+      "usampler1DArray",

+      "usampler2DArray",

+

+      NULL, /* ast_struct */

+      NULL  /* ast_type_name */

+   };

+

+   type_name = names[specifier];

+}

+

+bool

+ast_fully_specified_type::has_qualifiers() const

+{

+   return this->qualifier.flags.i != 0;

+}

+

+bool ast_type_qualifier::has_interpolation() const

+{

+   return this->flags.q.smooth

+          || this->flags.q.flat

+          || this->flags.q.noperspective;

+}

+

+const char*

+ast_type_qualifier::interpolation_string() const

+{

+   if (this->flags.q.smooth)

+      return "smooth";

+   else if (this->flags.q.flat)

+      return "flat";

+   else if (this->flags.q.noperspective)

+      return "noperspective";

+   else

+      return NULL;

+}

diff --git a/mesalib/src/glsl/glsl_parser_extras.h b/mesalib/src/glsl/glsl_parser_extras.h
index c628db94e..0d9c78719 100644
--- a/mesalib/src/glsl/glsl_parser_extras.h
+++ b/mesalib/src/glsl/glsl_parser_extras.h
@@ -1,281 +1,281 @@
-/*
- * 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 GLSL_PARSER_EXTRAS_H
-#define GLSL_PARSER_EXTRAS_H
-
-/*
- * Most of the definitions here only apply to C++
- */
-#ifdef __cplusplus
-
-
-#include <cstdlib>
-#include "glsl_symbol_table.h"
-
-enum _mesa_glsl_parser_targets {
-   vertex_shader,
-   geometry_shader,
-   fragment_shader
-};
-
-struct gl_context;
-
-struct _mesa_glsl_parse_state {
-   _mesa_glsl_parse_state(struct gl_context *ctx, GLenum target,
-			  void *mem_ctx);
-
-   /* Callers of this ralloc-based new need not call delete. It's
-    * easier to just ralloc_free 'ctx' (or any of its ancestors). */
-   static void* operator new(size_t size, void *ctx)
-   {
-      void *mem = rzalloc_size(ctx, size);
-      assert(mem != NULL);
-
-      return mem;
-   }
-
-   /* If the user *does* call delete, that's OK, we will just
-    * ralloc_free in that case. */
-   static void operator delete(void *mem, void *ctx)
-   {
-      ralloc_free(mem);
-   }
-   static void operator delete(void *mem)
-   {
-      ralloc_free(mem);
-   }
-
-   void *scanner;
-   exec_list translation_unit;
-   glsl_symbol_table *symbols;
-
-   bool es_shader;
-   unsigned language_version;
-   const char *version_string;
-   enum _mesa_glsl_parser_targets target;
-
-   /**
-    * Printable list of GLSL versions supported by the current context
-    *
-    * \note
-    * This string should probably be generated per-context instead of per
-    * invokation of the compiler.  This should be changed when the method of
-    * tracking supported GLSL versions changes.
-    */
-   const char *supported_version_string;
-
-   /**
-    * Implementation defined limits that affect built-in variables, etc.
-    *
-    * \sa struct gl_constants (in mtypes.h)
-    */
-   struct {
-      /* 1.10 */
-      unsigned MaxLights;
-      unsigned MaxClipPlanes;
-      unsigned MaxTextureUnits;
-      unsigned MaxTextureCoords;
-      unsigned MaxVertexAttribs;
-      unsigned MaxVertexUniformComponents;
-      unsigned MaxVaryingFloats;
-      unsigned MaxVertexTextureImageUnits;
-      unsigned MaxCombinedTextureImageUnits;
-      unsigned MaxTextureImageUnits;
-      unsigned MaxFragmentUniformComponents;
-
-      /* ARB_draw_buffers */
-      unsigned MaxDrawBuffers;
-
-      /**
-       * Set of GLSL versions supported by the current context
-       *
-       * Knowing that version X is supported doesn't mean that versions before
-       * X are also supported.  Version 1.00 is only supported in an ES2
-       * context or when GL_ARB_ES2_compatibility is supported.  In an OpenGL
-       * 3.0 "forward compatible" context, GLSL 1.10 and 1.20 are \b not
-       * supported.
-       */
-      /*@{*/
-      unsigned GLSL_100ES:1;
-      unsigned GLSL_110:1;
-      unsigned GLSL_120:1;
-      unsigned GLSL_130:1;
-      /*@}*/
-   } Const;
-
-   /**
-    * During AST to IR conversion, pointer to current IR function
-    *
-    * Will be \c NULL whenever the AST to IR conversion is not inside a
-    * function definition.
-    */
-   class ir_function_signature *current_function;
-
-   /** Have we found a return statement in this function? */
-   bool found_return;
-
-   /** Was there an error during compilation? */
-   bool error;
-
-   /**
-    * Are all shader inputs / outputs invariant?
-    *
-    * This is set when the 'STDGL invariant(all)' pragma is used.
-    */
-   bool all_invariant;
-
-   /** Loop or switch statement containing the current instructions. */
-   class ir_instruction *loop_or_switch_nesting;
-   class ast_iteration_statement *loop_or_switch_nesting_ast;
-
-   /** List of structures defined in user code. */
-   const glsl_type **user_structures;
-   unsigned num_user_structures;
-
-   char *info_log;
-
-   /**
-    * \name Enable bits for GLSL extensions
-    */
-   /*@{*/
-   unsigned ARB_draw_buffers_enable:1;
-   unsigned ARB_draw_buffers_warn:1;
-   unsigned ARB_draw_instanced_enable:1;
-   unsigned ARB_draw_instanced_warn:1;
-   unsigned ARB_explicit_attrib_location_enable:1;
-   unsigned ARB_explicit_attrib_location_warn:1;
-   unsigned ARB_fragment_coord_conventions_enable:1;
-   unsigned ARB_fragment_coord_conventions_warn:1;
-   unsigned ARB_texture_rectangle_enable:1;
-   unsigned ARB_texture_rectangle_warn:1;
-   unsigned EXT_texture_array_enable:1;
-   unsigned EXT_texture_array_warn:1;
-   unsigned ARB_shader_stencil_export_enable:1;
-   unsigned ARB_shader_stencil_export_warn:1;
-   unsigned AMD_conservative_depth_enable:1;
-   unsigned AMD_conservative_depth_warn:1;
-   /*@}*/
-
-   /** Extensions supported by the OpenGL implementation. */
-   const struct gl_extensions *extensions;
-
-   /** Shaders containing built-in functions that are used for linking. */
-   struct gl_shader *builtins_to_link[16];
-   unsigned num_builtins_to_link;
-};
-
-typedef struct YYLTYPE {
-   int first_line;
-   int first_column;
-   int last_line;
-   int last_column;
-   unsigned source;
-} YYLTYPE;
-# define YYLTYPE_IS_DECLARED 1
-# define YYLTYPE_IS_TRIVIAL 1
-
-# define YYLLOC_DEFAULT(Current, Rhs, N)			\
-do {								\
-   if (N)							\
-   {								\
-      (Current).first_line   = YYRHSLOC(Rhs, 1).first_line;	\
-      (Current).first_column = YYRHSLOC(Rhs, 1).first_column;	\
-      (Current).last_line    = YYRHSLOC(Rhs, N).last_line;	\
-      (Current).last_column  = YYRHSLOC(Rhs, N).last_column;	\
-   }								\
-   else								\
-   {								\
-      (Current).first_line   = (Current).last_line =		\
-	 YYRHSLOC(Rhs, 0).last_line;				\
-      (Current).first_column = (Current).last_column =		\
-	 YYRHSLOC(Rhs, 0).last_column;				\
-   }								\
-   (Current).source = 0;					\
-} while (0)
-
-extern void _mesa_glsl_error(YYLTYPE *locp, _mesa_glsl_parse_state *state,
-			     const char *fmt, ...);
-
-/**
- * Emit a warning to the shader log
- *
- * \sa _mesa_glsl_error
- */
-extern void _mesa_glsl_warning(const YYLTYPE *locp,
-			       _mesa_glsl_parse_state *state,
-			       const char *fmt, ...);
-
-extern void _mesa_glsl_lexer_ctor(struct _mesa_glsl_parse_state *state,
-				  const char *string);
-
-extern void _mesa_glsl_lexer_dtor(struct _mesa_glsl_parse_state *state);
-
-union YYSTYPE;
-extern int _mesa_glsl_lex(union YYSTYPE *yylval, YYLTYPE *yylloc, 
-			  void *scanner);
-
-extern int _mesa_glsl_parse(struct _mesa_glsl_parse_state *);
-
-/**
- * Process elements of the #extension directive
- *
- * \return
- * If \c name and \c behavior are valid, \c true is returned.  Otherwise
- * \c false is returned.
- */
-extern bool _mesa_glsl_process_extension(const char *name, YYLTYPE *name_locp,
-					 const char *behavior,
-					 YYLTYPE *behavior_locp,
-					 _mesa_glsl_parse_state *state);
-
-/**
- * Get the textual name of the specified shader target
- */
-extern const char *
-_mesa_glsl_shader_target_name(enum _mesa_glsl_parser_targets target);
-
-
-#endif /* __cplusplus */
-
-
-/*
- * These definitions apply to C and C++
- */
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-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();
-
-#ifdef __cplusplus
-}
-#endif
-
-
-#endif /* GLSL_PARSER_EXTRAS_H */
+/*

+ * 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 GLSL_PARSER_EXTRAS_H

+#define GLSL_PARSER_EXTRAS_H

+

+/*

+ * Most of the definitions here only apply to C++

+ */

+#ifdef __cplusplus

+

+

+#include <stdlib.h>

+#include "glsl_symbol_table.h"

+

+enum _mesa_glsl_parser_targets {

+   vertex_shader,

+   geometry_shader,

+   fragment_shader

+};

+

+struct gl_context;

+

+struct _mesa_glsl_parse_state {

+   _mesa_glsl_parse_state(struct gl_context *ctx, GLenum target,

+			  void *mem_ctx);

+

+   /* Callers of this ralloc-based new need not call delete. It's

+    * easier to just ralloc_free 'ctx' (or any of its ancestors). */

+   static void* operator new(size_t size, void *ctx)

+   {

+      void *mem = rzalloc_size(ctx, size);

+      assert(mem != NULL);

+

+      return mem;

+   }

+

+   /* If the user *does* call delete, that's OK, we will just

+    * ralloc_free in that case. */

+   static void operator delete(void *mem, void *ctx)

+   {

+      ralloc_free(mem);

+   }

+   static void operator delete(void *mem)

+   {

+      ralloc_free(mem);

+   }

+

+   void *scanner;

+   exec_list translation_unit;

+   glsl_symbol_table *symbols;

+

+   bool es_shader;

+   unsigned language_version;

+   const char *version_string;

+   enum _mesa_glsl_parser_targets target;

+

+   /**

+    * Printable list of GLSL versions supported by the current context

+    *

+    * \note

+    * This string should probably be generated per-context instead of per

+    * invokation of the compiler.  This should be changed when the method of

+    * tracking supported GLSL versions changes.

+    */

+   const char *supported_version_string;

+

+   /**

+    * Implementation defined limits that affect built-in variables, etc.

+    *

+    * \sa struct gl_constants (in mtypes.h)

+    */

+   struct {

+      /* 1.10 */

+      unsigned MaxLights;

+      unsigned MaxClipPlanes;

+      unsigned MaxTextureUnits;

+      unsigned MaxTextureCoords;

+      unsigned MaxVertexAttribs;

+      unsigned MaxVertexUniformComponents;

+      unsigned MaxVaryingFloats;

+      unsigned MaxVertexTextureImageUnits;

+      unsigned MaxCombinedTextureImageUnits;

+      unsigned MaxTextureImageUnits;

+      unsigned MaxFragmentUniformComponents;

+

+      /* ARB_draw_buffers */

+      unsigned MaxDrawBuffers;

+

+      /**

+       * Set of GLSL versions supported by the current context

+       *

+       * Knowing that version X is supported doesn't mean that versions before

+       * X are also supported.  Version 1.00 is only supported in an ES2

+       * context or when GL_ARB_ES2_compatibility is supported.  In an OpenGL

+       * 3.0 "forward compatible" context, GLSL 1.10 and 1.20 are \b not

+       * supported.

+       */

+      /*@{*/

+      unsigned GLSL_100ES:1;

+      unsigned GLSL_110:1;

+      unsigned GLSL_120:1;

+      unsigned GLSL_130:1;

+      /*@}*/

+   } Const;

+

+   /**

+    * During AST to IR conversion, pointer to current IR function

+    *

+    * Will be \c NULL whenever the AST to IR conversion is not inside a

+    * function definition.

+    */

+   class ir_function_signature *current_function;

+

+   /** Have we found a return statement in this function? */

+   bool found_return;

+

+   /** Was there an error during compilation? */

+   bool error;

+

+   /**

+    * Are all shader inputs / outputs invariant?

+    *

+    * This is set when the 'STDGL invariant(all)' pragma is used.

+    */

+   bool all_invariant;

+

+   /** Loop or switch statement containing the current instructions. */

+   class ir_instruction *loop_or_switch_nesting;

+   class ast_iteration_statement *loop_or_switch_nesting_ast;

+

+   /** List of structures defined in user code. */

+   const glsl_type **user_structures;

+   unsigned num_user_structures;

+

+   char *info_log;

+

+   /**

+    * \name Enable bits for GLSL extensions

+    */

+   /*@{*/

+   unsigned ARB_draw_buffers_enable:1;

+   unsigned ARB_draw_buffers_warn:1;

+   unsigned ARB_draw_instanced_enable:1;

+   unsigned ARB_draw_instanced_warn:1;

+   unsigned ARB_explicit_attrib_location_enable:1;

+   unsigned ARB_explicit_attrib_location_warn:1;

+   unsigned ARB_fragment_coord_conventions_enable:1;

+   unsigned ARB_fragment_coord_conventions_warn:1;

+   unsigned ARB_texture_rectangle_enable:1;

+   unsigned ARB_texture_rectangle_warn:1;

+   unsigned EXT_texture_array_enable:1;

+   unsigned EXT_texture_array_warn:1;

+   unsigned ARB_shader_stencil_export_enable:1;

+   unsigned ARB_shader_stencil_export_warn:1;

+   unsigned AMD_conservative_depth_enable:1;

+   unsigned AMD_conservative_depth_warn:1;

+   /*@}*/

+

+   /** Extensions supported by the OpenGL implementation. */

+   const struct gl_extensions *extensions;

+

+   /** Shaders containing built-in functions that are used for linking. */

+   struct gl_shader *builtins_to_link[16];

+   unsigned num_builtins_to_link;

+};

+

+typedef struct YYLTYPE {

+   int first_line;

+   int first_column;

+   int last_line;

+   int last_column;

+   unsigned source;

+} YYLTYPE;

+# define YYLTYPE_IS_DECLARED 1

+# define YYLTYPE_IS_TRIVIAL 1

+

+# define YYLLOC_DEFAULT(Current, Rhs, N)			\

+do {								\

+   if (N)							\

+   {								\

+      (Current).first_line   = YYRHSLOC(Rhs, 1).first_line;	\

+      (Current).first_column = YYRHSLOC(Rhs, 1).first_column;	\

+      (Current).last_line    = YYRHSLOC(Rhs, N).last_line;	\

+      (Current).last_column  = YYRHSLOC(Rhs, N).last_column;	\

+   }								\

+   else								\

+   {								\

+      (Current).first_line   = (Current).last_line =		\

+	 YYRHSLOC(Rhs, 0).last_line;				\

+      (Current).first_column = (Current).last_column =		\

+	 YYRHSLOC(Rhs, 0).last_column;				\

+   }								\

+   (Current).source = 0;					\

+} while (0)

+

+extern void _mesa_glsl_error(YYLTYPE *locp, _mesa_glsl_parse_state *state,

+			     const char *fmt, ...);

+

+/**

+ * Emit a warning to the shader log

+ *

+ * \sa _mesa_glsl_error

+ */

+extern void _mesa_glsl_warning(const YYLTYPE *locp,

+			       _mesa_glsl_parse_state *state,

+			       const char *fmt, ...);

+

+extern void _mesa_glsl_lexer_ctor(struct _mesa_glsl_parse_state *state,

+				  const char *string);

+

+extern void _mesa_glsl_lexer_dtor(struct _mesa_glsl_parse_state *state);

+

+union YYSTYPE;

+extern int _mesa_glsl_lex(union YYSTYPE *yylval, YYLTYPE *yylloc, 

+			  void *scanner);

+

+extern int _mesa_glsl_parse(struct _mesa_glsl_parse_state *);

+

+/**

+ * Process elements of the #extension directive

+ *

+ * \return

+ * If \c name and \c behavior are valid, \c true is returned.  Otherwise

+ * \c false is returned.

+ */

+extern bool _mesa_glsl_process_extension(const char *name, YYLTYPE *name_locp,

+					 const char *behavior,

+					 YYLTYPE *behavior_locp,

+					 _mesa_glsl_parse_state *state);

+

+/**

+ * Get the textual name of the specified shader target

+ */

+extern const char *

+_mesa_glsl_shader_target_name(enum _mesa_glsl_parser_targets target);

+

+

+#endif /* __cplusplus */

+

+

+/*

+ * These definitions apply to C and C++

+ */

+#ifdef __cplusplus

+extern "C" {

+#endif

+

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

+

+#ifdef __cplusplus

+}

+#endif

+

+

+#endif /* GLSL_PARSER_EXTRAS_H */

diff --git a/mesalib/src/glsl/glsl_types.cpp b/mesalib/src/glsl/glsl_types.cpp
index f4d9242b2..1802bf0ac 100644
--- a/mesalib/src/glsl/glsl_types.cpp
+++ b/mesalib/src/glsl/glsl_types.cpp
@@ -1,497 +1,497 @@
-/*
- * Copyright © 2009 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 <cstdio>
-#include <stdlib.h>
-#include "main/core.h" /* for Elements */
-#include "glsl_symbol_table.h"
-#include "glsl_parser_extras.h"
-#include "glsl_types.h"
-#include "builtin_types.h"
-extern "C" {
-#include "program/hash_table.h"
-}
-
-hash_table *glsl_type::array_types = NULL;
-hash_table *glsl_type::record_types = NULL;
-void *glsl_type::mem_ctx = NULL;
-
-void
-glsl_type::init_ralloc_type_ctx(void)
-{
-   if (glsl_type::mem_ctx == NULL) {
-      glsl_type::mem_ctx = ralloc_autofree_context();
-      assert(glsl_type::mem_ctx != NULL);
-   }
-}
-
-glsl_type::glsl_type(GLenum gl_type,
-		     glsl_base_type base_type, unsigned vector_elements,
-		     unsigned matrix_columns, const char *name) :
-   gl_type(gl_type),
-   base_type(base_type),
-   sampler_dimensionality(0), sampler_shadow(0), sampler_array(0),
-   sampler_type(0),
-   vector_elements(vector_elements), matrix_columns(matrix_columns),
-   length(0)
-{
-   init_ralloc_type_ctx();
-   this->name = ralloc_strdup(this->mem_ctx, name);
-   /* Neither dimension is zero or both dimensions are zero.
-    */
-   assert((vector_elements == 0) == (matrix_columns == 0));
-   memset(& fields, 0, sizeof(fields));
-}
-
-glsl_type::glsl_type(GLenum gl_type,
-		     enum glsl_sampler_dim dim, bool shadow, bool array,
-		     unsigned type, const char *name) :
-   gl_type(gl_type),
-   base_type(GLSL_TYPE_SAMPLER),
-   sampler_dimensionality(dim), sampler_shadow(shadow),
-   sampler_array(array), sampler_type(type),
-   vector_elements(0), matrix_columns(0),
-   length(0)
-{
-   init_ralloc_type_ctx();
-   this->name = ralloc_strdup(this->mem_ctx, name);
-   memset(& fields, 0, sizeof(fields));
-}
-
-glsl_type::glsl_type(const glsl_struct_field *fields, unsigned num_fields,
-		     const char *name) :
-   base_type(GLSL_TYPE_STRUCT),
-   sampler_dimensionality(0), sampler_shadow(0), sampler_array(0),
-   sampler_type(0),
-   vector_elements(0), matrix_columns(0),
-   length(num_fields)
-{
-   unsigned int i;
-
-   init_ralloc_type_ctx();
-   this->name = ralloc_strdup(this->mem_ctx, name);
-   this->fields.structure = ralloc_array(this->mem_ctx,
-					 glsl_struct_field, length);
-   for (i = 0; i < length; i++) {
-      this->fields.structure[i].type = fields[i].type;
-      this->fields.structure[i].name = ralloc_strdup(this->fields.structure,
-						     fields[i].name);
-   }
-}
-
-static void
-add_types_to_symbol_table(glsl_symbol_table *symtab,
-			  const struct glsl_type *types,
-			  unsigned num_types, bool warn)
-{
-   (void) warn;
-
-   for (unsigned i = 0; i < num_types; i++) {
-      symtab->add_type(types[i].name, & types[i]);
-   }
-}
-
-void
-glsl_type::generate_100ES_types(glsl_symbol_table *symtab)
-{
-   add_types_to_symbol_table(symtab, builtin_core_types,
-			     Elements(builtin_core_types),
-			     false);
-   add_types_to_symbol_table(symtab, builtin_structure_types,
-			     Elements(builtin_structure_types),
-			     false);
-   add_types_to_symbol_table(symtab, void_type, 1, false);
-}
-
-void
-glsl_type::generate_110_types(glsl_symbol_table *symtab)
-{
-   generate_100ES_types(symtab);
-
-   add_types_to_symbol_table(symtab, builtin_110_types,
-			     Elements(builtin_110_types),
-			     false);
-   add_types_to_symbol_table(symtab, builtin_110_deprecated_structure_types,
-			     Elements(builtin_110_deprecated_structure_types),
-			     false);
-}
-
-
-void
-glsl_type::generate_120_types(glsl_symbol_table *symtab)
-{
-   generate_110_types(symtab);
-
-   add_types_to_symbol_table(symtab, builtin_120_types,
-			     Elements(builtin_120_types), false);
-}
-
-
-void
-glsl_type::generate_130_types(glsl_symbol_table *symtab)
-{
-   generate_120_types(symtab);
-
-   add_types_to_symbol_table(symtab, builtin_130_types,
-			     Elements(builtin_130_types), false);
-   generate_EXT_texture_array_types(symtab, false);
-}
-
-
-void
-glsl_type::generate_ARB_texture_rectangle_types(glsl_symbol_table *symtab,
-						bool warn)
-{
-   add_types_to_symbol_table(symtab, builtin_ARB_texture_rectangle_types,
-			     Elements(builtin_ARB_texture_rectangle_types),
-			     warn);
-}
-
-
-void
-glsl_type::generate_EXT_texture_array_types(glsl_symbol_table *symtab,
-					    bool warn)
-{
-   add_types_to_symbol_table(symtab, builtin_EXT_texture_array_types,
-			     Elements(builtin_EXT_texture_array_types),
-			     warn);
-}
-
-
-void
-_mesa_glsl_initialize_types(struct _mesa_glsl_parse_state *state)
-{
-   switch (state->language_version) {
-   case 100:
-      assert(state->es_shader);
-      glsl_type::generate_100ES_types(state->symbols);
-      break;
-   case 110:
-      glsl_type::generate_110_types(state->symbols);
-      break;
-   case 120:
-      glsl_type::generate_120_types(state->symbols);
-      break;
-   case 130:
-      glsl_type::generate_130_types(state->symbols);
-      break;
-   default:
-      /* error */
-      break;
-   }
-
-   if (state->ARB_texture_rectangle_enable) {
-      glsl_type::generate_ARB_texture_rectangle_types(state->symbols,
-					   state->ARB_texture_rectangle_warn);
-   }
-
-   if (state->EXT_texture_array_enable && state->language_version < 130) {
-      // These are already included in 130; don't create twice.
-      glsl_type::generate_EXT_texture_array_types(state->symbols,
-				       state->EXT_texture_array_warn);
-   }
-}
-
-
-const glsl_type *glsl_type::get_base_type() const
-{
-   switch (base_type) {
-   case GLSL_TYPE_UINT:
-      return uint_type;
-   case GLSL_TYPE_INT:
-      return int_type;
-   case GLSL_TYPE_FLOAT:
-      return float_type;
-   case GLSL_TYPE_BOOL:
-      return bool_type;
-   default:
-      return error_type;
-   }
-}
-
-
-void
-_mesa_glsl_release_types(void)
-{
-   if (glsl_type::array_types != NULL) {
-      hash_table_dtor(glsl_type::array_types);
-      glsl_type::array_types = NULL;
-   }
-
-   if (glsl_type::record_types != NULL) {
-      hash_table_dtor(glsl_type::record_types);
-      glsl_type::record_types = NULL;
-   }
-}
-
-
-glsl_type::glsl_type(const glsl_type *array, unsigned length) :
-   base_type(GLSL_TYPE_ARRAY),
-   sampler_dimensionality(0), sampler_shadow(0), sampler_array(0),
-   sampler_type(0),
-   vector_elements(0), matrix_columns(0),
-   name(NULL), length(length)
-{
-   this->fields.array = array;
-   /* Inherit the gl type of the base. The GL type is used for
-    * uniform/statevar handling in Mesa and the arrayness of the type
-    * is represented by the size rather than the type.
-    */
-   this->gl_type = array->gl_type;
-
-   /* Allow a maximum of 10 characters for the array size.  This is enough
-    * for 32-bits of ~0.  The extra 3 are for the '[', ']', and terminating
-    * NUL.
-    */
-   const unsigned name_length = strlen(array->name) + 10 + 3;
-   char *const n = (char *) ralloc_size(this->mem_ctx, name_length);
-
-   if (length == 0)
-      snprintf(n, name_length, "%s[]", array->name);
-   else
-      snprintf(n, name_length, "%s[%u]", array->name, length);
-
-   this->name = n;
-}
-
-
-const glsl_type *
-glsl_type::get_instance(unsigned base_type, unsigned rows, unsigned columns)
-{
-   if (base_type == GLSL_TYPE_VOID)
-      return void_type;
-
-   if ((rows < 1) || (rows > 4) || (columns < 1) || (columns > 4))
-      return error_type;
-
-   /* Treat GLSL vectors as Nx1 matrices.
-    */
-   if (columns == 1) {
-      switch (base_type) {
-      case GLSL_TYPE_UINT:
-	 return uint_type + (rows - 1);
-      case GLSL_TYPE_INT:
-	 return int_type + (rows - 1);
-      case GLSL_TYPE_FLOAT:
-	 return float_type + (rows - 1);
-      case GLSL_TYPE_BOOL:
-	 return bool_type + (rows - 1);
-      default:
-	 return error_type;
-      }
-   } else {
-      if ((base_type != GLSL_TYPE_FLOAT) || (rows == 1))
-	 return error_type;
-
-      /* GLSL matrix types are named mat{COLUMNS}x{ROWS}.  Only the following
-       * combinations are valid:
-       *
-       *   1 2 3 4
-       * 1
-       * 2   x x x
-       * 3   x x x
-       * 4   x x x
-       */
-#define IDX(c,r) (((c-1)*3) + (r-1))
-
-      switch (IDX(columns, rows)) {
-      case IDX(2,2): return mat2_type;
-      case IDX(2,3): return mat2x3_type;
-      case IDX(2,4): return mat2x4_type;
-      case IDX(3,2): return mat3x2_type;
-      case IDX(3,3): return mat3_type;
-      case IDX(3,4): return mat3x4_type;
-      case IDX(4,2): return mat4x2_type;
-      case IDX(4,3): return mat4x3_type;
-      case IDX(4,4): return mat4_type;
-      default: return error_type;
-      }
-   }
-
-   assert(!"Should not get here.");
-   return error_type;
-}
-
-
-const glsl_type *
-glsl_type::get_array_instance(const glsl_type *base, unsigned array_size)
-{
-
-   if (array_types == NULL) {
-      array_types = hash_table_ctor(64, hash_table_string_hash,
-				    hash_table_string_compare);
-   }
-
-   /* Generate a name using the base type pointer in the key.  This is
-    * done because the name of the base type may not be unique across
-    * shaders.  For example, two shaders may have different record types
-    * named 'foo'.
-    */
-   char key[128];
-   snprintf(key, sizeof(key), "%p[%u]", (void *) base, array_size);
-
-   const glsl_type *t = (glsl_type *) hash_table_find(array_types, key);
-   if (t == NULL) {
-      t = new glsl_type(base, array_size);
-
-      hash_table_insert(array_types, (void *) t, ralloc_strdup(mem_ctx, key));
-   }
-
-   assert(t->base_type == GLSL_TYPE_ARRAY);
-   assert(t->length == array_size);
-   assert(t->fields.array == base);
-
-   return t;
-}
-
-
-int
-glsl_type::record_key_compare(const void *a, const void *b)
-{
-   const glsl_type *const key1 = (glsl_type *) a;
-   const glsl_type *const key2 = (glsl_type *) b;
-
-   /* Return zero is the types match (there is zero difference) or non-zero
-    * otherwise.
-    */
-   if (strcmp(key1->name, key2->name) != 0)
-      return 1;
-
-   if (key1->length != key2->length)
-      return 1;
-
-   for (unsigned i = 0; i < key1->length; i++) {
-      if (key1->fields.structure[i].type != key2->fields.structure[i].type)
-	 return 1;
-      if (strcmp(key1->fields.structure[i].name,
-		 key2->fields.structure[i].name) != 0)
-	 return 1;
-   }
-
-   return 0;
-}
-
-
-unsigned
-glsl_type::record_key_hash(const void *a)
-{
-   const glsl_type *const key = (glsl_type *) a;
-   char hash_key[128];
-   unsigned size = 0;
-
-   size = snprintf(hash_key, sizeof(hash_key), "%08x", key->length);
-
-   for (unsigned i = 0; i < key->length; i++) {
-      if (size >= sizeof(hash_key))
-	 break;
-
-      size += snprintf(& hash_key[size], sizeof(hash_key) - size,
-		       "%p", (void *) key->fields.structure[i].type);
-   }
-
-   return hash_table_string_hash(& hash_key);
-}
-
-
-const glsl_type *
-glsl_type::get_record_instance(const glsl_struct_field *fields,
-			       unsigned num_fields,
-			       const char *name)
-{
-   const glsl_type key(fields, num_fields, name);
-
-   if (record_types == NULL) {
-      record_types = hash_table_ctor(64, record_key_hash, record_key_compare);
-   }
-
-   const glsl_type *t = (glsl_type *) hash_table_find(record_types, & key);
-   if (t == NULL) {
-      t = new glsl_type(fields, num_fields, name);
-
-      hash_table_insert(record_types, (void *) t, t);
-   }
-
-   assert(t->base_type == GLSL_TYPE_STRUCT);
-   assert(t->length == num_fields);
-   assert(strcmp(t->name, name) == 0);
-
-   return t;
-}
-
-
-const glsl_type *
-glsl_type::field_type(const char *name) const
-{
-   if (this->base_type != GLSL_TYPE_STRUCT)
-      return error_type;
-
-   for (unsigned i = 0; i < this->length; i++) {
-      if (strcmp(name, this->fields.structure[i].name) == 0)
-	 return this->fields.structure[i].type;
-   }
-
-   return error_type;
-}
-
-
-int
-glsl_type::field_index(const char *name) const
-{
-   if (this->base_type != GLSL_TYPE_STRUCT)
-      return -1;
-
-   for (unsigned i = 0; i < this->length; i++) {
-      if (strcmp(name, this->fields.structure[i].name) == 0)
-	 return i;
-   }
-
-   return -1;
-}
-
-
-unsigned
-glsl_type::component_slots() const
-{
-   switch (this->base_type) {
-   case GLSL_TYPE_UINT:
-   case GLSL_TYPE_INT:
-   case GLSL_TYPE_FLOAT:
-   case GLSL_TYPE_BOOL:
-      return this->components();
-
-   case GLSL_TYPE_STRUCT: {
-      unsigned size = 0;
-
-      for (unsigned i = 0; i < this->length; i++)
-	 size += this->fields.structure[i].type->component_slots();
-
-      return size;
-   }
-
-   case GLSL_TYPE_ARRAY:
-      return this->length * this->fields.array->component_slots();
-
-   default:
-      return 0;
-   }
-}
+/*

+ * Copyright © 2009 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 <stdio.h>

+#include <stdlib.h>

+#include "main/core.h" /* for Elements */

+#include "glsl_symbol_table.h"

+#include "glsl_parser_extras.h"

+#include "glsl_types.h"

+#include "builtin_types.h"

+extern "C" {

+#include "program/hash_table.h"

+}

+

+hash_table *glsl_type::array_types = NULL;

+hash_table *glsl_type::record_types = NULL;

+void *glsl_type::mem_ctx = NULL;

+

+void

+glsl_type::init_ralloc_type_ctx(void)

+{

+   if (glsl_type::mem_ctx == NULL) {

+      glsl_type::mem_ctx = ralloc_autofree_context();

+      assert(glsl_type::mem_ctx != NULL);

+   }

+}

+

+glsl_type::glsl_type(GLenum gl_type,

+		     glsl_base_type base_type, unsigned vector_elements,

+		     unsigned matrix_columns, const char *name) :

+   gl_type(gl_type),

+   base_type(base_type),

+   sampler_dimensionality(0), sampler_shadow(0), sampler_array(0),

+   sampler_type(0),

+   vector_elements(vector_elements), matrix_columns(matrix_columns),

+   length(0)

+{

+   init_ralloc_type_ctx();

+   this->name = ralloc_strdup(this->mem_ctx, name);

+   /* Neither dimension is zero or both dimensions are zero.

+    */

+   assert((vector_elements == 0) == (matrix_columns == 0));

+   memset(& fields, 0, sizeof(fields));

+}

+

+glsl_type::glsl_type(GLenum gl_type,

+		     enum glsl_sampler_dim dim, bool shadow, bool array,

+		     unsigned type, const char *name) :

+   gl_type(gl_type),

+   base_type(GLSL_TYPE_SAMPLER),

+   sampler_dimensionality(dim), sampler_shadow(shadow),

+   sampler_array(array), sampler_type(type),

+   vector_elements(0), matrix_columns(0),

+   length(0)

+{

+   init_ralloc_type_ctx();

+   this->name = ralloc_strdup(this->mem_ctx, name);

+   memset(& fields, 0, sizeof(fields));

+}

+

+glsl_type::glsl_type(const glsl_struct_field *fields, unsigned num_fields,

+		     const char *name) :

+   base_type(GLSL_TYPE_STRUCT),

+   sampler_dimensionality(0), sampler_shadow(0), sampler_array(0),

+   sampler_type(0),

+   vector_elements(0), matrix_columns(0),

+   length(num_fields)

+{

+   unsigned int i;

+

+   init_ralloc_type_ctx();

+   this->name = ralloc_strdup(this->mem_ctx, name);

+   this->fields.structure = ralloc_array(this->mem_ctx,

+					 glsl_struct_field, length);

+   for (i = 0; i < length; i++) {

+      this->fields.structure[i].type = fields[i].type;

+      this->fields.structure[i].name = ralloc_strdup(this->fields.structure,

+						     fields[i].name);

+   }

+}

+

+static void

+add_types_to_symbol_table(glsl_symbol_table *symtab,

+			  const struct glsl_type *types,

+			  unsigned num_types, bool warn)

+{

+   (void) warn;

+

+   for (unsigned i = 0; i < num_types; i++) {

+      symtab->add_type(types[i].name, & types[i]);

+   }

+}

+

+void

+glsl_type::generate_100ES_types(glsl_symbol_table *symtab)

+{

+   add_types_to_symbol_table(symtab, builtin_core_types,

+			     Elements(builtin_core_types),

+			     false);

+   add_types_to_symbol_table(symtab, builtin_structure_types,

+			     Elements(builtin_structure_types),

+			     false);

+   add_types_to_symbol_table(symtab, void_type, 1, false);

+}

+

+void

+glsl_type::generate_110_types(glsl_symbol_table *symtab)

+{

+   generate_100ES_types(symtab);

+

+   add_types_to_symbol_table(symtab, builtin_110_types,

+			     Elements(builtin_110_types),

+			     false);

+   add_types_to_symbol_table(symtab, builtin_110_deprecated_structure_types,

+			     Elements(builtin_110_deprecated_structure_types),

+			     false);

+}

+

+

+void

+glsl_type::generate_120_types(glsl_symbol_table *symtab)

+{

+   generate_110_types(symtab);

+

+   add_types_to_symbol_table(symtab, builtin_120_types,

+			     Elements(builtin_120_types), false);

+}

+

+

+void

+glsl_type::generate_130_types(glsl_symbol_table *symtab)

+{

+   generate_120_types(symtab);

+

+   add_types_to_symbol_table(symtab, builtin_130_types,

+			     Elements(builtin_130_types), false);

+   generate_EXT_texture_array_types(symtab, false);

+}

+

+

+void

+glsl_type::generate_ARB_texture_rectangle_types(glsl_symbol_table *symtab,

+						bool warn)

+{

+   add_types_to_symbol_table(symtab, builtin_ARB_texture_rectangle_types,

+			     Elements(builtin_ARB_texture_rectangle_types),

+			     warn);

+}

+

+

+void

+glsl_type::generate_EXT_texture_array_types(glsl_symbol_table *symtab,

+					    bool warn)

+{

+   add_types_to_symbol_table(symtab, builtin_EXT_texture_array_types,

+			     Elements(builtin_EXT_texture_array_types),

+			     warn);

+}

+

+

+void

+_mesa_glsl_initialize_types(struct _mesa_glsl_parse_state *state)

+{

+   switch (state->language_version) {

+   case 100:

+      assert(state->es_shader);

+      glsl_type::generate_100ES_types(state->symbols);

+      break;

+   case 110:

+      glsl_type::generate_110_types(state->symbols);

+      break;

+   case 120:

+      glsl_type::generate_120_types(state->symbols);

+      break;

+   case 130:

+      glsl_type::generate_130_types(state->symbols);

+      break;

+   default:

+      /* error */

+      break;

+   }

+

+   if (state->ARB_texture_rectangle_enable) {

+      glsl_type::generate_ARB_texture_rectangle_types(state->symbols,

+					   state->ARB_texture_rectangle_warn);

+   }

+

+   if (state->EXT_texture_array_enable && state->language_version < 130) {

+      // These are already included in 130; don't create twice.

+      glsl_type::generate_EXT_texture_array_types(state->symbols,

+				       state->EXT_texture_array_warn);

+   }

+}

+

+

+const glsl_type *glsl_type::get_base_type() const

+{

+   switch (base_type) {

+   case GLSL_TYPE_UINT:

+      return uint_type;

+   case GLSL_TYPE_INT:

+      return int_type;

+   case GLSL_TYPE_FLOAT:

+      return float_type;

+   case GLSL_TYPE_BOOL:

+      return bool_type;

+   default:

+      return error_type;

+   }

+}

+

+

+void

+_mesa_glsl_release_types(void)

+{

+   if (glsl_type::array_types != NULL) {

+      hash_table_dtor(glsl_type::array_types);

+      glsl_type::array_types = NULL;

+   }

+

+   if (glsl_type::record_types != NULL) {

+      hash_table_dtor(glsl_type::record_types);

+      glsl_type::record_types = NULL;

+   }

+}

+

+

+glsl_type::glsl_type(const glsl_type *array, unsigned length) :

+   base_type(GLSL_TYPE_ARRAY),

+   sampler_dimensionality(0), sampler_shadow(0), sampler_array(0),

+   sampler_type(0),

+   vector_elements(0), matrix_columns(0),

+   name(NULL), length(length)

+{

+   this->fields.array = array;

+   /* Inherit the gl type of the base. The GL type is used for

+    * uniform/statevar handling in Mesa and the arrayness of the type

+    * is represented by the size rather than the type.

+    */

+   this->gl_type = array->gl_type;

+

+   /* Allow a maximum of 10 characters for the array size.  This is enough

+    * for 32-bits of ~0.  The extra 3 are for the '[', ']', and terminating

+    * NUL.

+    */

+   const unsigned name_length = strlen(array->name) + 10 + 3;

+   char *const n = (char *) ralloc_size(this->mem_ctx, name_length);

+

+   if (length == 0)

+      snprintf(n, name_length, "%s[]", array->name);

+   else

+      snprintf(n, name_length, "%s[%u]", array->name, length);

+

+   this->name = n;

+}

+

+

+const glsl_type *

+glsl_type::get_instance(unsigned base_type, unsigned rows, unsigned columns)

+{

+   if (base_type == GLSL_TYPE_VOID)

+      return void_type;

+

+   if ((rows < 1) || (rows > 4) || (columns < 1) || (columns > 4))

+      return error_type;

+

+   /* Treat GLSL vectors as Nx1 matrices.

+    */

+   if (columns == 1) {

+      switch (base_type) {

+      case GLSL_TYPE_UINT:

+	 return uint_type + (rows - 1);

+      case GLSL_TYPE_INT:

+	 return int_type + (rows - 1);

+      case GLSL_TYPE_FLOAT:

+	 return float_type + (rows - 1);

+      case GLSL_TYPE_BOOL:

+	 return bool_type + (rows - 1);

+      default:

+	 return error_type;

+      }

+   } else {

+      if ((base_type != GLSL_TYPE_FLOAT) || (rows == 1))

+	 return error_type;

+

+      /* GLSL matrix types are named mat{COLUMNS}x{ROWS}.  Only the following

+       * combinations are valid:

+       *

+       *   1 2 3 4

+       * 1

+       * 2   x x x

+       * 3   x x x

+       * 4   x x x

+       */

+#define IDX(c,r) (((c-1)*3) + (r-1))

+

+      switch (IDX(columns, rows)) {

+      case IDX(2,2): return mat2_type;

+      case IDX(2,3): return mat2x3_type;

+      case IDX(2,4): return mat2x4_type;

+      case IDX(3,2): return mat3x2_type;

+      case IDX(3,3): return mat3_type;

+      case IDX(3,4): return mat3x4_type;

+      case IDX(4,2): return mat4x2_type;

+      case IDX(4,3): return mat4x3_type;

+      case IDX(4,4): return mat4_type;

+      default: return error_type;

+      }

+   }

+

+   assert(!"Should not get here.");

+   return error_type;

+}

+

+

+const glsl_type *

+glsl_type::get_array_instance(const glsl_type *base, unsigned array_size)

+{

+

+   if (array_types == NULL) {

+      array_types = hash_table_ctor(64, hash_table_string_hash,

+				    hash_table_string_compare);

+   }

+

+   /* Generate a name using the base type pointer in the key.  This is

+    * done because the name of the base type may not be unique across

+    * shaders.  For example, two shaders may have different record types

+    * named 'foo'.

+    */

+   char key[128];

+   snprintf(key, sizeof(key), "%p[%u]", (void *) base, array_size);

+

+   const glsl_type *t = (glsl_type *) hash_table_find(array_types, key);

+   if (t == NULL) {

+      t = new glsl_type(base, array_size);

+

+      hash_table_insert(array_types, (void *) t, ralloc_strdup(mem_ctx, key));

+   }

+

+   assert(t->base_type == GLSL_TYPE_ARRAY);

+   assert(t->length == array_size);

+   assert(t->fields.array == base);

+

+   return t;

+}

+

+

+int

+glsl_type::record_key_compare(const void *a, const void *b)

+{

+   const glsl_type *const key1 = (glsl_type *) a;

+   const glsl_type *const key2 = (glsl_type *) b;

+

+   /* Return zero is the types match (there is zero difference) or non-zero

+    * otherwise.

+    */

+   if (strcmp(key1->name, key2->name) != 0)

+      return 1;

+

+   if (key1->length != key2->length)

+      return 1;

+

+   for (unsigned i = 0; i < key1->length; i++) {

+      if (key1->fields.structure[i].type != key2->fields.structure[i].type)

+	 return 1;

+      if (strcmp(key1->fields.structure[i].name,

+		 key2->fields.structure[i].name) != 0)

+	 return 1;

+   }

+

+   return 0;

+}

+

+

+unsigned

+glsl_type::record_key_hash(const void *a)

+{

+   const glsl_type *const key = (glsl_type *) a;

+   char hash_key[128];

+   unsigned size = 0;

+

+   size = snprintf(hash_key, sizeof(hash_key), "%08x", key->length);

+

+   for (unsigned i = 0; i < key->length; i++) {

+      if (size >= sizeof(hash_key))

+	 break;

+

+      size += snprintf(& hash_key[size], sizeof(hash_key) - size,

+		       "%p", (void *) key->fields.structure[i].type);

+   }

+

+   return hash_table_string_hash(& hash_key);

+}

+

+

+const glsl_type *

+glsl_type::get_record_instance(const glsl_struct_field *fields,

+			       unsigned num_fields,

+			       const char *name)

+{

+   const glsl_type key(fields, num_fields, name);

+

+   if (record_types == NULL) {

+      record_types = hash_table_ctor(64, record_key_hash, record_key_compare);

+   }

+

+   const glsl_type *t = (glsl_type *) hash_table_find(record_types, & key);

+   if (t == NULL) {

+      t = new glsl_type(fields, num_fields, name);

+

+      hash_table_insert(record_types, (void *) t, t);

+   }

+

+   assert(t->base_type == GLSL_TYPE_STRUCT);

+   assert(t->length == num_fields);

+   assert(strcmp(t->name, name) == 0);

+

+   return t;

+}

+

+

+const glsl_type *

+glsl_type::field_type(const char *name) const

+{

+   if (this->base_type != GLSL_TYPE_STRUCT)

+      return error_type;

+

+   for (unsigned i = 0; i < this->length; i++) {

+      if (strcmp(name, this->fields.structure[i].name) == 0)

+	 return this->fields.structure[i].type;

+   }

+

+   return error_type;

+}

+

+

+int

+glsl_type::field_index(const char *name) const

+{

+   if (this->base_type != GLSL_TYPE_STRUCT)

+      return -1;

+

+   for (unsigned i = 0; i < this->length; i++) {

+      if (strcmp(name, this->fields.structure[i].name) == 0)

+	 return i;

+   }

+

+   return -1;

+}

+

+

+unsigned

+glsl_type::component_slots() const

+{

+   switch (this->base_type) {

+   case GLSL_TYPE_UINT:

+   case GLSL_TYPE_INT:

+   case GLSL_TYPE_FLOAT:

+   case GLSL_TYPE_BOOL:

+      return this->components();

+

+   case GLSL_TYPE_STRUCT: {

+      unsigned size = 0;

+

+      for (unsigned i = 0; i < this->length; i++)

+	 size += this->fields.structure[i].type->component_slots();

+

+      return size;

+   }

+

+   case GLSL_TYPE_ARRAY:

+      return this->length * this->fields.array->component_slots();

+

+   default:

+      return 0;

+   }

+}

diff --git a/mesalib/src/glsl/glsl_types.h b/mesalib/src/glsl/glsl_types.h
index ab6858faa..c3b7255a3 100644
--- a/mesalib/src/glsl/glsl_types.h
+++ b/mesalib/src/glsl/glsl_types.h
@@ -1,476 +1,476 @@
-/* -*- c++ -*- */
-/*
- * Copyright © 2009 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 GLSL_TYPES_H
-#define GLSL_TYPES_H
-
-#include <cstring>
-#include <cassert>
-
-extern "C" {
-#include "GL/gl.h"
-}
-
-#include "ralloc.h"
-
-struct _mesa_glsl_parse_state;
-struct glsl_symbol_table;
-
-extern "C" void
-_mesa_glsl_initialize_types(struct _mesa_glsl_parse_state *state);
-
-extern "C" void
-_mesa_glsl_release_types(void);
-
-enum glsl_base_type {
-   GLSL_TYPE_UINT = 0,
-   GLSL_TYPE_INT,
-   GLSL_TYPE_FLOAT,
-   GLSL_TYPE_BOOL,
-   GLSL_TYPE_SAMPLER,
-   GLSL_TYPE_STRUCT,
-   GLSL_TYPE_ARRAY,
-   GLSL_TYPE_VOID,
-   GLSL_TYPE_ERROR
-};
-
-enum glsl_sampler_dim {
-   GLSL_SAMPLER_DIM_1D = 0,
-   GLSL_SAMPLER_DIM_2D,
-   GLSL_SAMPLER_DIM_3D,
-   GLSL_SAMPLER_DIM_CUBE,
-   GLSL_SAMPLER_DIM_RECT,
-   GLSL_SAMPLER_DIM_BUF
-};
-
-
-struct glsl_type {
-   GLenum gl_type;
-   glsl_base_type base_type;
-
-   unsigned sampler_dimensionality:3;
-   unsigned sampler_shadow:1;
-   unsigned sampler_array:1;
-   unsigned sampler_type:2;    /**< Type of data returned using this sampler.
-				* only \c GLSL_TYPE_FLOAT, \c GLSL_TYPE_INT,
-				* and \c GLSL_TYPE_UINT are valid.
-				*/
-
-   /* Callers of this ralloc-based new need not call delete. It's
-    * easier to just ralloc_free 'mem_ctx' (or any of its ancestors). */
-   static void* operator new(size_t size)
-   {
-      if (glsl_type::mem_ctx == NULL) {
-	 glsl_type::mem_ctx = ralloc_context(NULL);
-	 assert(glsl_type::mem_ctx != NULL);
-      }
-
-      void *type;
-
-      type = ralloc_size(glsl_type::mem_ctx, size);
-      assert(type != NULL);
-
-      return type;
-   }
-
-   /* If the user *does* call delete, that's OK, we will just
-    * ralloc_free in that case. */
-   static void operator delete(void *type)
-   {
-      ralloc_free(type);
-   }
-
-   /**
-    * \name Vector and matrix element counts
-    *
-    * For scalars, each of these values will be 1.  For non-numeric types
-    * these will be 0.
-    */
-   /*@{*/
-   unsigned vector_elements:3; /**< 1, 2, 3, or 4 vector elements. */
-   unsigned matrix_columns:3;  /**< 1, 2, 3, or 4 matrix columns. */
-   /*@}*/
-
-   /**
-    * Name of the data type
-    *
-    * This may be \c NULL for anonymous structures, for arrays, or for
-    * function types.
-    */
-   const char *name;
-
-   /**
-    * For \c GLSL_TYPE_ARRAY, this is the length of the array.  For
-    * \c GLSL_TYPE_STRUCT, it is the number of elements in the structure and
-    * the number of values pointed to by \c fields.structure (below).
-    */
-   unsigned length;
-
-   /**
-    * Subtype of composite data types.
-    */
-   union {
-      const struct glsl_type *array;            /**< Type of array elements. */
-      const struct glsl_type *parameters;       /**< Parameters to function. */
-      struct glsl_struct_field *structure;      /**< List of struct fields. */
-   } fields;
-
-
-   /**
-    * \name Pointers to various public type singletons
-    */
-   /*@{*/
-   static const glsl_type *const error_type;
-   static const glsl_type *const void_type;
-   static const glsl_type *const int_type;
-   static const glsl_type *const ivec4_type;
-   static const glsl_type *const uint_type;
-   static const glsl_type *const uvec2_type;
-   static const glsl_type *const uvec3_type;
-   static const glsl_type *const uvec4_type;
-   static const glsl_type *const float_type;
-   static const glsl_type *const vec2_type;
-   static const glsl_type *const vec3_type;
-   static const glsl_type *const vec4_type;
-   static const glsl_type *const bool_type;
-   static const glsl_type *const mat2_type;
-   static const glsl_type *const mat2x3_type;
-   static const glsl_type *const mat2x4_type;
-   static const glsl_type *const mat3x2_type;
-   static const glsl_type *const mat3_type;
-   static const glsl_type *const mat3x4_type;
-   static const glsl_type *const mat4x2_type;
-   static const glsl_type *const mat4x3_type;
-   static const glsl_type *const mat4_type;
-   /*@}*/
-
-
-   /**
-    * For numeric and boolean derrived types returns the basic scalar type
-    *
-    * If the type is a numeric or boolean scalar, vector, or matrix type,
-    * this function gets the scalar type of the individual components.  For
-    * all other types, including arrays of numeric or boolean types, the
-    * error type is returned.
-    */
-   const glsl_type *get_base_type() const;
-
-   /**
-    * Query the type of elements in an array
-    *
-    * \return
-    * Pointer to the type of elements in the array for array types, or \c NULL
-    * for non-array types.
-    */
-   const glsl_type *element_type() const
-   {
-      return is_array() ? fields.array : NULL;
-   }
-
-   /**
-    * Get the instance of a built-in scalar, vector, or matrix type
-    */
-   static const glsl_type *get_instance(unsigned base_type, unsigned rows,
-					unsigned columns);
-
-   /**
-    * Get the instance of an array type
-    */
-   static const glsl_type *get_array_instance(const glsl_type *base,
-					      unsigned elements);
-
-   /**
-    * Get the instance of a record type
-    */
-   static const glsl_type *get_record_instance(const glsl_struct_field *fields,
-					       unsigned num_fields,
-					       const char *name);
-
-   /**
-    * Query the total number of scalars that make up a scalar, vector or matrix
-    */
-   unsigned components() const
-   {
-      return vector_elements * matrix_columns;
-   }
-
-   /**
-    * Calculate the number of components slots required to hold this type
-    *
-    * This is used to determine how many uniform or varying locations a type
-    * might occupy.
-    */
-   unsigned component_slots() const;
-
-
-   /**
-    * Query whether or not a type is a scalar (non-vector and non-matrix).
-    */
-   bool is_scalar() const
-   {
-      return (vector_elements == 1)
-	 && (base_type >= GLSL_TYPE_UINT)
-	 && (base_type <= GLSL_TYPE_BOOL);
-   }
-
-   /**
-    * Query whether or not a type is a vector
-    */
-   bool is_vector() const
-   {
-      return (vector_elements > 1)
-	 && (matrix_columns == 1)
-	 && (base_type >= GLSL_TYPE_UINT)
-	 && (base_type <= GLSL_TYPE_BOOL);
-   }
-
-   /**
-    * Query whether or not a type is a matrix
-    */
-   bool is_matrix() const
-   {
-      /* GLSL only has float matrices. */
-      return (matrix_columns > 1) && (base_type == GLSL_TYPE_FLOAT);
-   }
-
-   /**
-    * Query whether or not a type is a non-array numeric type
-    */
-   bool is_numeric() const
-   {
-      return (base_type >= GLSL_TYPE_UINT) && (base_type <= GLSL_TYPE_FLOAT);
-   }
-
-   /**
-    * Query whether or not a type is an integral type
-    */
-   bool is_integer() const
-   {
-      return (base_type == GLSL_TYPE_UINT) || (base_type == GLSL_TYPE_INT);
-   }
-
-   /**
-    * Query whether or not a type is a float type
-    */
-   bool is_float() const
-   {
-      return base_type == GLSL_TYPE_FLOAT;
-   }
-
-   /**
-    * Query whether or not a type is a non-array boolean type
-    */
-   bool is_boolean() const
-   {
-      return base_type == GLSL_TYPE_BOOL;
-   }
-
-   /**
-    * Query whether or not a type is a sampler
-    */
-   bool is_sampler() const
-   {
-      return base_type == GLSL_TYPE_SAMPLER;
-   }
-
-   /**
-    * Query whether or not a type is an array
-    */
-   bool is_array() const
-   {
-      return base_type == GLSL_TYPE_ARRAY;
-   }
-
-   /**
-    * Query whether or not a type is a record
-    */
-   bool is_record() const
-   {
-      return base_type == GLSL_TYPE_STRUCT;
-   }
-
-   /**
-    * Query whether or not a type is the void type singleton.
-    */
-   bool is_void() const
-   {
-      return base_type == GLSL_TYPE_VOID;
-   }
-
-   /**
-    * Query whether or not a type is the error type singleton.
-    */
-   bool is_error() const
-   {
-      return base_type == GLSL_TYPE_ERROR;
-   }
-
-   /**
-    * Query the full type of a matrix row
-    *
-    * \return
-    * If the type is not a matrix, \c glsl_type::error_type is returned.
-    * Otherwise a type matching the rows of the matrix is returned.
-    */
-   const glsl_type *row_type() const
-   {
-      return is_matrix()
-	 ? get_instance(base_type, matrix_columns, 1)
-	 : error_type;
-   }
-
-   /**
-    * Query the full type of a matrix column
-    *
-    * \return
-    * If the type is not a matrix, \c glsl_type::error_type is returned.
-    * Otherwise a type matching the columns of the matrix is returned.
-    */
-   const glsl_type *column_type() const
-   {
-      return is_matrix()
-	 ? get_instance(base_type, vector_elements, 1)
-	 : error_type;
-   }
-
-
-   /**
-    * Get the type of a structure field
-    *
-    * \return
-    * Pointer to the type of the named field.  If the type is not a structure
-    * or the named field does not exist, \c glsl_type::error_type is returned.
-    */
-   const glsl_type *field_type(const char *name) const;
-
-
-   /**
-    * Get the location of a filed within a record type
-    */
-   int field_index(const char *name) const;
-
-
-   /**
-    * Query the number of elements in an array type
-    *
-    * \return
-    * The number of elements in the array for array types or -1 for non-array
-    * types.  If the number of elements in the array has not yet been declared,
-    * zero is returned.
-    */
-   int array_size() const
-   {
-      return is_array() ? length : -1;
-   }
-
-private:
-   /**
-    * ralloc context for all glsl_type allocations
-    *
-    * Set on the first call to \c glsl_type::new.
-    */
-   static void *mem_ctx;
-
-   void init_ralloc_type_ctx(void);
-
-   /** Constructor for vector and matrix types */
-   glsl_type(GLenum gl_type,
-	     glsl_base_type base_type, unsigned vector_elements,
-	     unsigned matrix_columns, const char *name);
-
-   /** Constructor for sampler types */
-   glsl_type(GLenum gl_type,
-	     enum glsl_sampler_dim dim, bool shadow, bool array,
-	     unsigned type, const char *name);
-
-   /** Constructor for record types */
-   glsl_type(const glsl_struct_field *fields, unsigned num_fields,
-	     const char *name);
-
-   /** Constructor for array types */
-   glsl_type(const glsl_type *array, unsigned length);
-
-   /** Hash table containing the known array types. */
-   static struct hash_table *array_types;
-
-   /** Hash table containing the known record types. */
-   static struct hash_table *record_types;
-
-   static int record_key_compare(const void *a, const void *b);
-   static unsigned record_key_hash(const void *key);
-
-   /**
-    * \name Pointers to various type singletons
-    */
-   /*@{*/
-   static const glsl_type _error_type;
-   static const glsl_type _void_type;
-   static const glsl_type builtin_core_types[];
-   static const glsl_type builtin_structure_types[];
-   static const glsl_type builtin_110_deprecated_structure_types[];
-   static const glsl_type builtin_110_types[];
-   static const glsl_type builtin_120_types[];
-   static const glsl_type builtin_130_types[];
-   static const glsl_type builtin_ARB_texture_rectangle_types[];
-   static const glsl_type builtin_EXT_texture_array_types[];
-   static const glsl_type builtin_EXT_texture_buffer_object_types[];
-   /*@}*/
-
-   /**
-    * \name Methods to populate a symbol table with built-in types.
-    *
-    * \internal
-    * This is one of the truely annoying things about C++.  Methods that are
-    * completely internal and private to a type still have to be advertised to
-    * the world in a public header file.
-    */
-   /*@{*/
-   static void generate_100ES_types(glsl_symbol_table *);
-   static void generate_110_types(glsl_symbol_table *);
-   static void generate_120_types(glsl_symbol_table *);
-   static void generate_130_types(glsl_symbol_table *);
-   static void generate_ARB_texture_rectangle_types(glsl_symbol_table *, bool);
-   static void generate_EXT_texture_array_types(glsl_symbol_table *, bool);
-   /*@}*/
-
-   /**
-    * \name Friend functions.
-    *
-    * These functions are friends because they must have C linkage and the
-    * need to call various private methods or access various private static
-    * data.
-    */
-   /*@{*/
-   friend void _mesa_glsl_initialize_types(struct _mesa_glsl_parse_state *);
-   friend void _mesa_glsl_release_types(void);
-   /*@}*/
-};
-
-struct glsl_struct_field {
-   const struct glsl_type *type;
-   const char *name;
-};
-
-#endif /* GLSL_TYPES_H */
+/* -*- c++ -*- */

+/*

+ * Copyright © 2009 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 GLSL_TYPES_H

+#define GLSL_TYPES_H

+

+#include <string.h>

+#include <assert.h>

+

+extern "C" {

+#include "GL/gl.h"

+}

+

+#include "ralloc.h"

+

+struct _mesa_glsl_parse_state;

+struct glsl_symbol_table;

+

+extern "C" void

+_mesa_glsl_initialize_types(struct _mesa_glsl_parse_state *state);

+

+extern "C" void

+_mesa_glsl_release_types(void);

+

+enum glsl_base_type {

+   GLSL_TYPE_UINT = 0,

+   GLSL_TYPE_INT,

+   GLSL_TYPE_FLOAT,

+   GLSL_TYPE_BOOL,

+   GLSL_TYPE_SAMPLER,

+   GLSL_TYPE_STRUCT,

+   GLSL_TYPE_ARRAY,

+   GLSL_TYPE_VOID,

+   GLSL_TYPE_ERROR

+};

+

+enum glsl_sampler_dim {

+   GLSL_SAMPLER_DIM_1D = 0,

+   GLSL_SAMPLER_DIM_2D,

+   GLSL_SAMPLER_DIM_3D,

+   GLSL_SAMPLER_DIM_CUBE,

+   GLSL_SAMPLER_DIM_RECT,

+   GLSL_SAMPLER_DIM_BUF

+};

+

+

+struct glsl_type {

+   GLenum gl_type;

+   glsl_base_type base_type;

+

+   unsigned sampler_dimensionality:3;

+   unsigned sampler_shadow:1;

+   unsigned sampler_array:1;

+   unsigned sampler_type:2;    /**< Type of data returned using this sampler.

+				* only \c GLSL_TYPE_FLOAT, \c GLSL_TYPE_INT,

+				* and \c GLSL_TYPE_UINT are valid.

+				*/

+

+   /* Callers of this ralloc-based new need not call delete. It's

+    * easier to just ralloc_free 'mem_ctx' (or any of its ancestors). */

+   static void* operator new(size_t size)

+   {

+      if (glsl_type::mem_ctx == NULL) {

+	 glsl_type::mem_ctx = ralloc_context(NULL);

+	 assert(glsl_type::mem_ctx != NULL);

+      }

+

+      void *type;

+

+      type = ralloc_size(glsl_type::mem_ctx, size);

+      assert(type != NULL);

+

+      return type;

+   }

+

+   /* If the user *does* call delete, that's OK, we will just

+    * ralloc_free in that case. */

+   static void operator delete(void *type)

+   {

+      ralloc_free(type);

+   }

+

+   /**

+    * \name Vector and matrix element counts

+    *

+    * For scalars, each of these values will be 1.  For non-numeric types

+    * these will be 0.

+    */

+   /*@{*/

+   unsigned vector_elements:3; /**< 1, 2, 3, or 4 vector elements. */

+   unsigned matrix_columns:3;  /**< 1, 2, 3, or 4 matrix columns. */

+   /*@}*/

+

+   /**

+    * Name of the data type

+    *

+    * This may be \c NULL for anonymous structures, for arrays, or for

+    * function types.

+    */

+   const char *name;

+

+   /**

+    * For \c GLSL_TYPE_ARRAY, this is the length of the array.  For

+    * \c GLSL_TYPE_STRUCT, it is the number of elements in the structure and

+    * the number of values pointed to by \c fields.structure (below).

+    */

+   unsigned length;

+

+   /**

+    * Subtype of composite data types.

+    */

+   union {

+      const struct glsl_type *array;            /**< Type of array elements. */

+      const struct glsl_type *parameters;       /**< Parameters to function. */

+      struct glsl_struct_field *structure;      /**< List of struct fields. */

+   } fields;

+

+

+   /**

+    * \name Pointers to various public type singletons

+    */

+   /*@{*/

+   static const glsl_type *const error_type;

+   static const glsl_type *const void_type;

+   static const glsl_type *const int_type;

+   static const glsl_type *const ivec4_type;

+   static const glsl_type *const uint_type;

+   static const glsl_type *const uvec2_type;

+   static const glsl_type *const uvec3_type;

+   static const glsl_type *const uvec4_type;

+   static const glsl_type *const float_type;

+   static const glsl_type *const vec2_type;

+   static const glsl_type *const vec3_type;

+   static const glsl_type *const vec4_type;

+   static const glsl_type *const bool_type;

+   static const glsl_type *const mat2_type;

+   static const glsl_type *const mat2x3_type;

+   static const glsl_type *const mat2x4_type;

+   static const glsl_type *const mat3x2_type;

+   static const glsl_type *const mat3_type;

+   static const glsl_type *const mat3x4_type;

+   static const glsl_type *const mat4x2_type;

+   static const glsl_type *const mat4x3_type;

+   static const glsl_type *const mat4_type;

+   /*@}*/

+

+

+   /**

+    * For numeric and boolean derrived types returns the basic scalar type

+    *

+    * If the type is a numeric or boolean scalar, vector, or matrix type,

+    * this function gets the scalar type of the individual components.  For

+    * all other types, including arrays of numeric or boolean types, the

+    * error type is returned.

+    */

+   const glsl_type *get_base_type() const;

+

+   /**

+    * Query the type of elements in an array

+    *

+    * \return

+    * Pointer to the type of elements in the array for array types, or \c NULL

+    * for non-array types.

+    */

+   const glsl_type *element_type() const

+   {

+      return is_array() ? fields.array : NULL;

+   }

+

+   /**

+    * Get the instance of a built-in scalar, vector, or matrix type

+    */

+   static const glsl_type *get_instance(unsigned base_type, unsigned rows,

+					unsigned columns);

+

+   /**

+    * Get the instance of an array type

+    */

+   static const glsl_type *get_array_instance(const glsl_type *base,

+					      unsigned elements);

+

+   /**

+    * Get the instance of a record type

+    */

+   static const glsl_type *get_record_instance(const glsl_struct_field *fields,

+					       unsigned num_fields,

+					       const char *name);

+

+   /**

+    * Query the total number of scalars that make up a scalar, vector or matrix

+    */

+   unsigned components() const

+   {

+      return vector_elements * matrix_columns;

+   }

+

+   /**

+    * Calculate the number of components slots required to hold this type

+    *

+    * This is used to determine how many uniform or varying locations a type

+    * might occupy.

+    */

+   unsigned component_slots() const;

+

+

+   /**

+    * Query whether or not a type is a scalar (non-vector and non-matrix).

+    */

+   bool is_scalar() const

+   {

+      return (vector_elements == 1)

+	 && (base_type >= GLSL_TYPE_UINT)

+	 && (base_type <= GLSL_TYPE_BOOL);

+   }

+

+   /**

+    * Query whether or not a type is a vector

+    */

+   bool is_vector() const

+   {

+      return (vector_elements > 1)

+	 && (matrix_columns == 1)

+	 && (base_type >= GLSL_TYPE_UINT)

+	 && (base_type <= GLSL_TYPE_BOOL);

+   }

+

+   /**

+    * Query whether or not a type is a matrix

+    */

+   bool is_matrix() const

+   {

+      /* GLSL only has float matrices. */

+      return (matrix_columns > 1) && (base_type == GLSL_TYPE_FLOAT);

+   }

+

+   /**

+    * Query whether or not a type is a non-array numeric type

+    */

+   bool is_numeric() const

+   {

+      return (base_type >= GLSL_TYPE_UINT) && (base_type <= GLSL_TYPE_FLOAT);

+   }

+

+   /**

+    * Query whether or not a type is an integral type

+    */

+   bool is_integer() const

+   {

+      return (base_type == GLSL_TYPE_UINT) || (base_type == GLSL_TYPE_INT);

+   }

+

+   /**

+    * Query whether or not a type is a float type

+    */

+   bool is_float() const

+   {

+      return base_type == GLSL_TYPE_FLOAT;

+   }

+

+   /**

+    * Query whether or not a type is a non-array boolean type

+    */

+   bool is_boolean() const

+   {

+      return base_type == GLSL_TYPE_BOOL;

+   }

+

+   /**

+    * Query whether or not a type is a sampler

+    */

+   bool is_sampler() const

+   {

+      return base_type == GLSL_TYPE_SAMPLER;

+   }

+

+   /**

+    * Query whether or not a type is an array

+    */

+   bool is_array() const

+   {

+      return base_type == GLSL_TYPE_ARRAY;

+   }

+

+   /**

+    * Query whether or not a type is a record

+    */

+   bool is_record() const

+   {

+      return base_type == GLSL_TYPE_STRUCT;

+   }

+

+   /**

+    * Query whether or not a type is the void type singleton.

+    */

+   bool is_void() const

+   {

+      return base_type == GLSL_TYPE_VOID;

+   }

+

+   /**

+    * Query whether or not a type is the error type singleton.

+    */

+   bool is_error() const

+   {

+      return base_type == GLSL_TYPE_ERROR;

+   }

+

+   /**

+    * Query the full type of a matrix row

+    *

+    * \return

+    * If the type is not a matrix, \c glsl_type::error_type is returned.

+    * Otherwise a type matching the rows of the matrix is returned.

+    */

+   const glsl_type *row_type() const

+   {

+      return is_matrix()

+	 ? get_instance(base_type, matrix_columns, 1)

+	 : error_type;

+   }

+

+   /**

+    * Query the full type of a matrix column

+    *

+    * \return

+    * If the type is not a matrix, \c glsl_type::error_type is returned.

+    * Otherwise a type matching the columns of the matrix is returned.

+    */

+   const glsl_type *column_type() const

+   {

+      return is_matrix()

+	 ? get_instance(base_type, vector_elements, 1)

+	 : error_type;

+   }

+

+

+   /**

+    * Get the type of a structure field

+    *

+    * \return

+    * Pointer to the type of the named field.  If the type is not a structure

+    * or the named field does not exist, \c glsl_type::error_type is returned.

+    */

+   const glsl_type *field_type(const char *name) const;

+

+

+   /**

+    * Get the location of a filed within a record type

+    */

+   int field_index(const char *name) const;

+

+

+   /**

+    * Query the number of elements in an array type

+    *

+    * \return

+    * The number of elements in the array for array types or -1 for non-array

+    * types.  If the number of elements in the array has not yet been declared,

+    * zero is returned.

+    */

+   int array_size() const

+   {

+      return is_array() ? length : -1;

+   }

+

+private:

+   /**

+    * ralloc context for all glsl_type allocations

+    *

+    * Set on the first call to \c glsl_type::new.

+    */

+   static void *mem_ctx;

+

+   void init_ralloc_type_ctx(void);

+

+   /** Constructor for vector and matrix types */

+   glsl_type(GLenum gl_type,

+	     glsl_base_type base_type, unsigned vector_elements,

+	     unsigned matrix_columns, const char *name);

+

+   /** Constructor for sampler types */

+   glsl_type(GLenum gl_type,

+	     enum glsl_sampler_dim dim, bool shadow, bool array,

+	     unsigned type, const char *name);

+

+   /** Constructor for record types */

+   glsl_type(const glsl_struct_field *fields, unsigned num_fields,

+	     const char *name);

+

+   /** Constructor for array types */

+   glsl_type(const glsl_type *array, unsigned length);

+

+   /** Hash table containing the known array types. */

+   static struct hash_table *array_types;

+

+   /** Hash table containing the known record types. */

+   static struct hash_table *record_types;

+

+   static int record_key_compare(const void *a, const void *b);

+   static unsigned record_key_hash(const void *key);

+

+   /**

+    * \name Pointers to various type singletons

+    */

+   /*@{*/

+   static const glsl_type _error_type;

+   static const glsl_type _void_type;

+   static const glsl_type builtin_core_types[];

+   static const glsl_type builtin_structure_types[];

+   static const glsl_type builtin_110_deprecated_structure_types[];

+   static const glsl_type builtin_110_types[];

+   static const glsl_type builtin_120_types[];

+   static const glsl_type builtin_130_types[];

+   static const glsl_type builtin_ARB_texture_rectangle_types[];

+   static const glsl_type builtin_EXT_texture_array_types[];

+   static const glsl_type builtin_EXT_texture_buffer_object_types[];

+   /*@}*/

+

+   /**

+    * \name Methods to populate a symbol table with built-in types.

+    *

+    * \internal

+    * This is one of the truely annoying things about C++.  Methods that are

+    * completely internal and private to a type still have to be advertised to

+    * the world in a public header file.

+    */

+   /*@{*/

+   static void generate_100ES_types(glsl_symbol_table *);

+   static void generate_110_types(glsl_symbol_table *);

+   static void generate_120_types(glsl_symbol_table *);

+   static void generate_130_types(glsl_symbol_table *);

+   static void generate_ARB_texture_rectangle_types(glsl_symbol_table *, bool);

+   static void generate_EXT_texture_array_types(glsl_symbol_table *, bool);

+   /*@}*/

+

+   /**

+    * \name Friend functions.

+    *

+    * These functions are friends because they must have C linkage and the

+    * need to call various private methods or access various private static

+    * data.

+    */

+   /*@{*/

+   friend void _mesa_glsl_initialize_types(struct _mesa_glsl_parse_state *);

+   friend void _mesa_glsl_release_types(void);

+   /*@}*/

+};

+

+struct glsl_struct_field {

+   const struct glsl_type *type;

+   const char *name;

+};

+

+#endif /* GLSL_TYPES_H */

diff --git a/mesalib/src/glsl/hir_field_selection.cpp b/mesalib/src/glsl/hir_field_selection.cpp
index 995f284fa..21f107405 100644
--- a/mesalib/src/glsl/hir_field_selection.cpp
+++ b/mesalib/src/glsl/hir_field_selection.cpp
@@ -1,104 +1,102 @@
-/*
- * 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 "program/symbol_table.h"
-#include "glsl_parser_extras.h"
-#include "ast.h"
-#include "glsl_types.h"
-
-using std::strcmp;
-
-ir_rvalue *
-_mesa_ast_field_selection_to_hir(const ast_expression *expr,
-				 exec_list *instructions,
-				 struct _mesa_glsl_parse_state *state)
-{
-   void *ctx = state;
-   ir_rvalue *result = NULL;
-   ir_rvalue *op;
-
-   op = expr->subexpressions[0]->hir(instructions, state);
-
-   /* There are two kinds of field selection.  There is the selection of a
-    * specific field from a structure, and there is the selection of a
-    * swizzle / mask from a vector.  Which is which is determined entirely
-    * by the base type of the thing to which the field selection operator is
-    * being applied.
-    */
-   YYLTYPE loc = expr->get_location();
-   if (op->type->is_error()) {
-      /* silently propagate the error */
-   } else if (op->type->is_vector()) {
-      ir_swizzle *swiz = ir_swizzle::create(op,
-					    expr->primary_expression.identifier,
-					    op->type->vector_elements);
-      if (swiz != NULL) {
-	 result = swiz;
-      } else {
-	 /* FINISHME: Logging of error messages should be moved into
-	  * FINISHME: ir_swizzle::create.  This allows the generation of more
-	  * FINISHME: specific error messages.
-	  */
-	 _mesa_glsl_error(& loc, state, "Invalid swizzle / mask `%s'",
-			  expr->primary_expression.identifier);
-      }
-   } else if (op->type->base_type == GLSL_TYPE_STRUCT) {
-      result = new(ctx) ir_dereference_record(op,
-					      expr->primary_expression.identifier);
-
-      if (result->type->is_error()) {
-	 _mesa_glsl_error(& loc, state, "Cannot access field `%s' of "
-			  "structure",
-			  expr->primary_expression.identifier);
-      }
-   } else if (expr->subexpressions[1] != NULL) {
-      /* Handle "method calls" in GLSL 1.20 - namely, array.length() */
-      if (state->language_version < 120)
-	 _mesa_glsl_error(&loc, state, "Methods not supported in GLSL 1.10.");
-
-      ast_expression *call = expr->subexpressions[1];
-      assert(call->oper == ast_function_call);
-
-      const char *method;
-      method = call->subexpressions[0]->primary_expression.identifier;
-
-      if (op->type->is_array() && strcmp(method, "length") == 0) {
-	 if (!call->expressions.is_empty())
-	    _mesa_glsl_error(&loc, state, "length method takes no arguments.");
-
-	 if (op->type->array_size() == 0)
-	    _mesa_glsl_error(&loc, state, "length called on unsized array.");
-
-	 result = new(ctx) ir_constant(op->type->array_size());
-      } else {
-	 _mesa_glsl_error(&loc, state, "Unknown method: `%s'.", method);
-      }
-   } else {
-      _mesa_glsl_error(& loc, state, "Cannot access field `%s' of "
-		       "non-structure / non-vector.",
-		       expr->primary_expression.identifier);
-   }
-
-   return result ? result : ir_call::get_error_instruction(ctx);
-}
+/*

+ * 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 "program/symbol_table.h"

+#include "glsl_parser_extras.h"

+#include "ast.h"

+#include "glsl_types.h"

+

+ir_rvalue *

+_mesa_ast_field_selection_to_hir(const ast_expression *expr,

+				 exec_list *instructions,

+				 struct _mesa_glsl_parse_state *state)

+{

+   void *ctx = state;

+   ir_rvalue *result = NULL;

+   ir_rvalue *op;

+

+   op = expr->subexpressions[0]->hir(instructions, state);

+

+   /* There are two kinds of field selection.  There is the selection of a

+    * specific field from a structure, and there is the selection of a

+    * swizzle / mask from a vector.  Which is which is determined entirely

+    * by the base type of the thing to which the field selection operator is

+    * being applied.

+    */

+   YYLTYPE loc = expr->get_location();

+   if (op->type->is_error()) {

+      /* silently propagate the error */

+   } else if (op->type->is_vector()) {

+      ir_swizzle *swiz = ir_swizzle::create(op,

+					    expr->primary_expression.identifier,

+					    op->type->vector_elements);

+      if (swiz != NULL) {

+	 result = swiz;

+      } else {

+	 /* FINISHME: Logging of error messages should be moved into

+	  * FINISHME: ir_swizzle::create.  This allows the generation of more

+	  * FINISHME: specific error messages.

+	  */

+	 _mesa_glsl_error(& loc, state, "Invalid swizzle / mask `%s'",

+			  expr->primary_expression.identifier);

+      }

+   } else if (op->type->base_type == GLSL_TYPE_STRUCT) {

+      result = new(ctx) ir_dereference_record(op,

+					      expr->primary_expression.identifier);

+

+      if (result->type->is_error()) {

+	 _mesa_glsl_error(& loc, state, "Cannot access field `%s' of "

+			  "structure",

+			  expr->primary_expression.identifier);

+      }

+   } else if (expr->subexpressions[1] != NULL) {

+      /* Handle "method calls" in GLSL 1.20 - namely, array.length() */

+      if (state->language_version < 120)

+	 _mesa_glsl_error(&loc, state, "Methods not supported in GLSL 1.10.");

+

+      ast_expression *call = expr->subexpressions[1];

+      assert(call->oper == ast_function_call);

+

+      const char *method;

+      method = call->subexpressions[0]->primary_expression.identifier;

+

+      if (op->type->is_array() && strcmp(method, "length") == 0) {

+	 if (!call->expressions.is_empty())

+	    _mesa_glsl_error(&loc, state, "length method takes no arguments.");

+

+	 if (op->type->array_size() == 0)

+	    _mesa_glsl_error(&loc, state, "length called on unsized array.");

+

+	 result = new(ctx) ir_constant(op->type->array_size());

+      } else {

+	 _mesa_glsl_error(&loc, state, "Unknown method: `%s'.", method);

+      }

+   } else {

+      _mesa_glsl_error(& loc, state, "Cannot access field `%s' of "

+		       "non-structure / non-vector.",

+		       expr->primary_expression.identifier);

+   }

+

+   return result ? result : ir_call::get_error_instruction(ctx);

+}

diff --git a/mesalib/src/glsl/ir.h b/mesalib/src/glsl/ir.h
index 74a8b06b1..fcf1931ff 100644
--- a/mesalib/src/glsl/ir.h
+++ b/mesalib/src/glsl/ir.h
@@ -1,1640 +1,1640 @@
-/* -*- 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_H
-#define IR_H
-
-#include <cstdio>
-#include <cstdlib>
-
-#include "ralloc.h"
-#include "glsl_types.h"
-#include "list.h"
-#include "ir_visitor.h"
-#include "ir_hierarchical_visitor.h"
-
-/**
- * \defgroup IR Intermediate representation nodes
- *
- * @{
- */
-
-/**
- * Class tags
- *
- * Each concrete class derived from \c ir_instruction has a value in this
- * enumerant.  The value for the type is stored in \c ir_instruction::ir_type
- * by the constructor.  While using type tags is not very C++, it is extremely
- * convenient.  For example, during debugging you can simply inspect
- * \c ir_instruction::ir_type to find out the actual type of the object.
- *
- * In addition, it is possible to use a switch-statement based on \c
- * \c ir_instruction::ir_type to select different behavior for different object
- * types.  For functions that have only slight differences for several object
- * types, this allows writing very straightforward, readable code.
- */
-enum ir_node_type {
-   /**
-    * Zero is unused so that the IR validator can detect cases where
-    * \c ir_instruction::ir_type has not been initialized.
-    */
-   ir_type_unset,
-   ir_type_variable,
-   ir_type_assignment,
-   ir_type_call,
-   ir_type_constant,
-   ir_type_dereference_array,
-   ir_type_dereference_record,
-   ir_type_dereference_variable,
-   ir_type_discard,
-   ir_type_expression,
-   ir_type_function,
-   ir_type_function_signature,
-   ir_type_if,
-   ir_type_loop,
-   ir_type_loop_jump,
-   ir_type_return,
-   ir_type_swizzle,
-   ir_type_texture,
-   ir_type_max /**< maximum ir_type enum number, for validation */
-};
-
-/**
- * Base class of all IR instructions
- */
-class ir_instruction : public exec_node {
-public:
-   enum ir_node_type ir_type;
-   const struct glsl_type *type;
-
-   /** ir_print_visitor helper for debugging. */
-   void print(void) const;
-
-   virtual void accept(ir_visitor *) = 0;
-   virtual ir_visitor_status accept(ir_hierarchical_visitor *) = 0;
-   virtual ir_instruction *clone(void *mem_ctx,
-				 struct hash_table *ht) const = 0;
-
-   /**
-    * \name IR instruction downcast functions
-    *
-    * These functions either cast the object to a derived class or return
-    * \c NULL if the object's type does not match the specified derived class.
-    * Additional downcast functions will be added as needed.
-    */
-   /*@{*/
-   virtual class ir_variable *          as_variable()         { return NULL; }
-   virtual class ir_function *          as_function()         { return NULL; }
-   virtual class ir_dereference *       as_dereference()      { return NULL; }
-   virtual class ir_dereference_array *	as_dereference_array() { return NULL; }
-   virtual class ir_dereference_variable *as_dereference_variable() { return NULL; }
-   virtual class ir_expression *        as_expression()       { return NULL; }
-   virtual class ir_rvalue *            as_rvalue()           { return NULL; }
-   virtual class ir_loop *              as_loop()             { return NULL; }
-   virtual class ir_assignment *        as_assignment()       { return NULL; }
-   virtual class ir_call *              as_call()             { return NULL; }
-   virtual class ir_return *            as_return()           { return NULL; }
-   virtual class ir_if *                as_if()               { return NULL; }
-   virtual class ir_swizzle *           as_swizzle()          { return NULL; }
-   virtual class ir_constant *          as_constant()         { return NULL; }
-   virtual class ir_discard *           as_discard()          { return NULL; }
-   /*@}*/
-
-protected:
-   ir_instruction()
-   {
-      ir_type = ir_type_unset;
-      type = NULL;
-   }
-};
-
-
-class ir_rvalue : public ir_instruction {
-public:
-   virtual ir_rvalue *clone(void *mem_ctx, struct hash_table *) const = 0;
-
-   virtual ir_constant *constant_expression_value() = 0;
-
-   virtual ir_rvalue * as_rvalue()
-   {
-      return this;
-   }
-
-   ir_rvalue *as_rvalue_to_saturate();
-
-   virtual bool is_lvalue()
-   {
-      return false;
-   }
-
-   /**
-    * Get the variable that is ultimately referenced by an r-value
-    */
-   virtual ir_variable *variable_referenced()
-   {
-      return NULL;
-   }
-
-
-   /**
-    * If an r-value is a reference to a whole variable, get that variable
-    *
-    * \return
-    * Pointer to a variable that is completely dereferenced by the r-value.  If
-    * the r-value is not a dereference or the dereference does not access the
-    * entire variable (i.e., it's just one array element, struct field), \c NULL
-    * is returned.
-    */
-   virtual ir_variable *whole_variable_referenced()
-   {
-      return NULL;
-   }
-
-   /**
-    * Determine if an r-value has the value zero
-    *
-    * The base implementation of this function always returns \c false.  The
-    * \c ir_constant class over-rides this function to return \c true \b only
-    * for vector and scalar types that have all elements set to the value
-    * zero (or \c false for booleans).
-    *
-    * \sa ir_constant::has_value, ir_rvalue::is_one, ir_rvalue::is_negative_one
-    */
-   virtual bool is_zero() const;
-
-   /**
-    * Determine if an r-value has the value one
-    *
-    * The base implementation of this function always returns \c false.  The
-    * \c ir_constant class over-rides this function to return \c true \b only
-    * for vector and scalar types that have all elements set to the value
-    * one (or \c true for booleans).
-    *
-    * \sa ir_constant::has_value, ir_rvalue::is_zero, ir_rvalue::is_negative_one
-    */
-   virtual bool is_one() const;
-
-   /**
-    * Determine if an r-value has the value negative one
-    *
-    * The base implementation of this function always returns \c false.  The
-    * \c ir_constant class over-rides this function to return \c true \b only
-    * for vector and scalar types that have all elements set to the value
-    * negative one.  For boolean times, the result is always \c false.
-    *
-    * \sa ir_constant::has_value, ir_rvalue::is_zero, ir_rvalue::is_one
-    */
-   virtual bool is_negative_one() const;
-
-protected:
-   ir_rvalue();
-};
-
-
-/**
- * Variable storage classes
- */
-enum ir_variable_mode {
-   ir_var_auto = 0,     /**< Function local variables and globals. */
-   ir_var_uniform,      /**< Variable declared as a uniform. */
-   ir_var_in,
-   ir_var_out,
-   ir_var_inout,
-   ir_var_const_in,	/**< "in" param that must be a constant expression */
-   ir_var_system_value, /**< Ex: front-face, instance-id, etc. */
-   ir_var_temporary	/**< Temporary variable generated during compilation. */
-};
-
-enum ir_variable_interpolation {
-   ir_var_smooth = 0,
-   ir_var_flat,
-   ir_var_noperspective
-};
-
-/**
- * \brief Layout qualifiers for gl_FragDepth.
- *
- * The AMD_conservative_depth extension allows gl_FragDepth to be redeclared
- * with a layout qualifier.
- */
-enum ir_depth_layout {
-    ir_depth_layout_none, /**< No depth layout is specified. */
-    ir_depth_layout_any,
-    ir_depth_layout_greater,
-    ir_depth_layout_less,
-    ir_depth_layout_unchanged
-};
-
-/**
- * \brief Convert depth layout qualifier to string.
- */
-const char*
-depth_layout_string(ir_depth_layout layout);
-
-class ir_variable : public ir_instruction {
-public:
-   ir_variable(const struct glsl_type *, const char *, ir_variable_mode);
-
-   virtual ir_variable *clone(void *mem_ctx, struct hash_table *ht) const;
-
-   virtual ir_variable *as_variable()
-   {
-      return this;
-   }
-
-   virtual void accept(ir_visitor *v)
-   {
-      v->visit(this);
-   }
-
-   virtual ir_visitor_status accept(ir_hierarchical_visitor *);
-
-
-   /**
-    * Get the string value for the interpolation qualifier
-    *
-    * \return The string that would be used in a shader to specify \c
-    * mode will be returned.
-    *
-    * This function should only be used on a shader input or output variable.
-    */
-   const char *interpolation_string() const;
-
-   /**
-    * Calculate the number of slots required to hold this variable
-    *
-    * This is used to determine how many uniform or varying locations a variable
-    * occupies.  The count is in units of floating point components.
-    */
-   unsigned component_slots() const;
-
-   /**
-    * Delcared name of the variable
-    */
-   const char *name;
-
-   /**
-    * Highest element accessed with a constant expression array index
-    *
-    * Not used for non-array variables.
-    */
-   unsigned max_array_access;
-
-   /**
-    * Is the variable read-only?
-    *
-    * This is set for variables declared as \c const, shader inputs,
-    * and uniforms.
-    */
-   unsigned read_only:1;
-   unsigned centroid:1;
-   unsigned invariant:1;
-
-   /**
-    * Has this variable been used for reading or writing?
-    *
-    * Several GLSL semantic checks require knowledge of whether or not a
-    * variable has been used.  For example, it is an error to redeclare a
-    * variable as invariant after it has been used.
-    */
-   unsigned used:1;
-
-   /**
-    * Storage class of the variable.
-    *
-    * \sa ir_variable_mode
-    */
-   unsigned mode:3;
-
-   /**
-    * Interpolation mode for shader inputs / outputs
-    *
-    * \sa ir_variable_interpolation
-    */
-   unsigned interpolation:2;
-
-   /**
-    * Flag that the whole array is assignable
-    *
-    * In GLSL 1.20 and later whole arrays are assignable (and comparable for
-    * equality).  This flag enables this behavior.
-    */
-   unsigned array_lvalue:1;
-
-   /**
-    * \name ARB_fragment_coord_conventions
-    * @{
-    */
-   unsigned origin_upper_left:1;
-   unsigned pixel_center_integer:1;
-   /*@}*/
-
-   /**
-    * \brief Layout qualifier for gl_FragDepth.
-    *
-    * This is not equal to \c ir_depth_layout_none if and only if this
-    * variable is \c gl_FragDepth and a layout qualifier is specified.
-    */
-   ir_depth_layout depth_layout;
-
-   /**
-    * Was the location explicitly set in the shader?
-    *
-    * If the location is explicitly set in the shader, it \b cannot be changed
-    * by the linker or by the API (e.g., calls to \c glBindAttribLocation have
-    * no effect).
-    */
-   unsigned explicit_location:1;
-
-   /**
-    * Storage location of the base of this variable
-    *
-    * The precise meaning of this field depends on the nature of the variable.
-    *
-    *   - Vertex shader input: one of the values from \c gl_vert_attrib.
-    *   - Vertex shader output: one of the values from \c gl_vert_result.
-    *   - Fragment shader input: one of the values from \c gl_frag_attrib.
-    *   - Fragment shader output: one of the values from \c gl_frag_result.
-    *   - Uniforms: Per-stage uniform slot number.
-    *   - Other: This field is not currently used.
-    *
-    * If the variable is a uniform, shader input, or shader output, and the
-    * slot has not been assigned, the value will be -1.
-    */
-   int location;
-
-   /**
-    * Emit a warning if this variable is accessed.
-    */
-   const char *warn_extension;
-
-   /**
-    * Value assigned in the initializer of a variable declared "const"
-    */
-   ir_constant *constant_value;
-};
-
-
-/*@{*/
-/**
- * The representation of a function instance; may be the full definition or
- * simply a prototype.
- */
-class ir_function_signature : public ir_instruction {
-   /* An ir_function_signature will be part of the list of signatures in
-    * an ir_function.
-    */
-public:
-   ir_function_signature(const glsl_type *return_type);
-
-   virtual ir_function_signature *clone(void *mem_ctx,
-					struct hash_table *ht) const;
-   ir_function_signature *clone_prototype(void *mem_ctx,
-					  struct hash_table *ht) const;
-
-   virtual void accept(ir_visitor *v)
-   {
-      v->visit(this);
-   }
-
-   virtual ir_visitor_status accept(ir_hierarchical_visitor *);
-
-   /**
-    * Get the name of the function for which this is a signature
-    */
-   const char *function_name() const;
-
-   /**
-    * Get a handle to the function for which this is a signature
-    *
-    * There is no setter function, this function returns a \c const pointer,
-    * and \c ir_function_signature::_function is private for a reason.  The
-    * only way to make a connection between a function and function signature
-    * is via \c ir_function::add_signature.  This helps ensure that certain
-    * invariants (i.e., a function signature is in the list of signatures for
-    * its \c _function) are met.
-    *
-    * \sa ir_function::add_signature
-    */
-   inline const class ir_function *function() const
-   {
-      return this->_function;
-   }
-
-   /**
-    * Check whether the qualifiers match between this signature's parameters
-    * and the supplied parameter list.  If not, returns the name of the first
-    * parameter with mismatched qualifiers (for use in error messages).
-    */
-   const char *qualifiers_match(exec_list *params);
-
-   /**
-    * Replace the current parameter list with the given one.  This is useful
-    * if the current information came from a prototype, and either has invalid
-    * or missing parameter names.
-    */
-   void replace_parameters(exec_list *new_params);
-
-   /**
-    * Function return type.
-    *
-    * \note This discards the optional precision qualifier.
-    */
-   const struct glsl_type *return_type;
-
-   /**
-    * List of ir_variable of function parameters.
-    *
-    * This represents the storage.  The paramaters passed in a particular
-    * call will be in ir_call::actual_paramaters.
-    */
-   struct exec_list parameters;
-
-   /** Whether or not this function has a body (which may be empty). */
-   unsigned is_defined:1;
-
-   /** Whether or not this function signature is a built-in. */
-   unsigned is_builtin:1;
-
-   /** Body of instructions in the function. */
-   struct exec_list body;
-
-private:
-   /** Function of which this signature is one overload. */
-   class ir_function *_function;
-
-   friend class ir_function;
-};
-
-
-/**
- * Header for tracking multiple overloaded functions with the same name.
- * Contains a list of ir_function_signatures representing each of the
- * actual functions.
- */
-class ir_function : public ir_instruction {
-public:
-   ir_function(const char *name);
-
-   virtual ir_function *clone(void *mem_ctx, struct hash_table *ht) const;
-
-   virtual ir_function *as_function()
-   {
-      return this;
-   }
-
-   virtual void accept(ir_visitor *v)
-   {
-      v->visit(this);
-   }
-
-   virtual ir_visitor_status accept(ir_hierarchical_visitor *);
-
-   void add_signature(ir_function_signature *sig)
-   {
-      sig->_function = this;
-      this->signatures.push_tail(sig);
-   }
-
-   /**
-    * Get an iterator for the set of function signatures
-    */
-   exec_list_iterator iterator()
-   {
-      return signatures.iterator();
-   }
-
-   /**
-    * Find a signature that matches a set of actual parameters, taking implicit
-    * conversions into account.
-    */
-   ir_function_signature *matching_signature(const exec_list *actual_param);
-
-   /**
-    * Find a signature that exactly matches a set of actual parameters without
-    * any implicit type conversions.
-    */
-   ir_function_signature *exact_matching_signature(const exec_list *actual_ps);
-
-   /**
-    * Name of the function.
-    */
-   const char *name;
-
-   /** Whether or not this function has a signature that isn't a built-in. */
-   bool has_user_signature();
-
-   /**
-    * List of ir_function_signature for each overloaded function with this name.
-    */
-   struct exec_list signatures;
-};
-
-inline const char *ir_function_signature::function_name() const
-{
-   return this->_function->name;
-}
-/*@}*/
-
-
-/**
- * IR instruction representing high-level if-statements
- */
-class ir_if : public ir_instruction {
-public:
-   ir_if(ir_rvalue *condition)
-      : condition(condition)
-   {
-      ir_type = ir_type_if;
-   }
-
-   virtual ir_if *clone(void *mem_ctx, struct hash_table *ht) const;
-
-   virtual ir_if *as_if()
-   {
-      return this;
-   }
-
-   virtual void accept(ir_visitor *v)
-   {
-      v->visit(this);
-   }
-
-   virtual ir_visitor_status accept(ir_hierarchical_visitor *);
-
-   ir_rvalue *condition;
-   /** List of ir_instruction for the body of the then branch */
-   exec_list  then_instructions;
-   /** List of ir_instruction for the body of the else branch */
-   exec_list  else_instructions;
-};
-
-
-/**
- * IR instruction representing a high-level loop structure.
- */
-class ir_loop : public ir_instruction {
-public:
-   ir_loop();
-
-   virtual ir_loop *clone(void *mem_ctx, struct hash_table *ht) const;
-
-   virtual void accept(ir_visitor *v)
-   {
-      v->visit(this);
-   }
-
-   virtual ir_visitor_status accept(ir_hierarchical_visitor *);
-
-   virtual ir_loop *as_loop()
-   {
-      return this;
-   }
-
-   /**
-    * Get an iterator for the instructions of the loop body
-    */
-   exec_list_iterator iterator()
-   {
-      return body_instructions.iterator();
-   }
-
-   /** List of ir_instruction that make up the body of the loop. */
-   exec_list body_instructions;
-
-   /**
-    * \name Loop counter and controls
-    *
-    * Represents a loop like a FORTRAN \c do-loop.
-    *
-    * \note
-    * If \c from and \c to are the same value, the loop will execute once.
-    */
-   /*@{*/
-   ir_rvalue *from;             /** Value of the loop counter on the first
-				 * iteration of the loop.
-				 */
-   ir_rvalue *to;               /** Value of the loop counter on the last
-				 * iteration of the loop.
-				 */
-   ir_rvalue *increment;
-   ir_variable *counter;
-
-   /**
-    * Comparison operation in the loop terminator.
-    *
-    * If any of the loop control fields are non-\c NULL, this field must be
-    * one of \c ir_binop_less, \c ir_binop_greater, \c ir_binop_lequal,
-    * \c ir_binop_gequal, \c ir_binop_equal, or \c ir_binop_nequal.
-    */
-   int cmp;
-   /*@}*/
-};
-
-
-class ir_assignment : public ir_instruction {
-public:
-   ir_assignment(ir_rvalue *lhs, ir_rvalue *rhs, ir_rvalue *condition);
-
-   /**
-    * Construct an assignment with an explicit write mask
-    *
-    * \note
-    * Since a write mask is supplied, the LHS must already be a bare
-    * \c ir_dereference.  The cannot be any swizzles in the LHS.
-    */
-   ir_assignment(ir_dereference *lhs, ir_rvalue *rhs, ir_rvalue *condition,
-		 unsigned write_mask);
-
-   virtual ir_assignment *clone(void *mem_ctx, struct hash_table *ht) const;
-
-   virtual ir_constant *constant_expression_value();
-
-   virtual void accept(ir_visitor *v)
-   {
-      v->visit(this);
-   }
-
-   virtual ir_visitor_status accept(ir_hierarchical_visitor *);
-
-   virtual ir_assignment * as_assignment()
-   {
-      return this;
-   }
-
-   /**
-    * Get a whole variable written by an assignment
-    *
-    * If the LHS of the assignment writes a whole variable, the variable is
-    * returned.  Otherwise \c NULL is returned.  Examples of whole-variable
-    * assignment are:
-    *
-    *  - Assigning to a scalar
-    *  - Assigning to all components of a vector
-    *  - Whole array (or matrix) assignment
-    *  - Whole structure assignment
-    */
-   ir_variable *whole_variable_written();
-
-   /**
-    * Set the LHS of an assignment
-    */
-   void set_lhs(ir_rvalue *lhs);
-
-   /**
-    * Left-hand side of the assignment.
-    *
-    * This should be treated as read only.  If you need to set the LHS of an
-    * assignment, use \c ir_assignment::set_lhs.
-    */
-   ir_dereference *lhs;
-
-   /**
-    * Value being assigned
-    */
-   ir_rvalue *rhs;
-
-   /**
-    * Optional condition for the assignment.
-    */
-   ir_rvalue *condition;
-
-
-   /**
-    * Component mask written
-    *
-    * For non-vector types in the LHS, this field will be zero.  For vector
-    * types, a bit will be set for each component that is written.  Note that
-    * for \c vec2 and \c vec3 types only the lower bits will ever be set.
-    *
-    * A partially-set write mask means that each enabled channel gets
-    * the value from a consecutive channel of the rhs.  For example,
-    * to write just .xyw of gl_FrontColor with color:
-    *
-    * (assign (constant bool (1)) (xyw)
-    *     (var_ref gl_FragColor)
-    *     (swiz xyw (var_ref color)))
-    */
-   unsigned write_mask:4;
-};
-
-/* Update ir_expression::num_operands() and operator_strs when
- * updating this list.
- */
-enum ir_expression_operation {
-   ir_unop_bit_not,
-   ir_unop_logic_not,
-   ir_unop_neg,
-   ir_unop_abs,
-   ir_unop_sign,
-   ir_unop_rcp,
-   ir_unop_rsq,
-   ir_unop_sqrt,
-   ir_unop_exp,      /**< Log base e on gentype */
-   ir_unop_log,	     /**< Natural log on gentype */
-   ir_unop_exp2,
-   ir_unop_log2,
-   ir_unop_f2i,      /**< Float-to-integer conversion. */
-   ir_unop_i2f,      /**< Integer-to-float conversion. */
-   ir_unop_f2b,      /**< Float-to-boolean conversion */
-   ir_unop_b2f,      /**< Boolean-to-float conversion */
-   ir_unop_i2b,      /**< int-to-boolean conversion */
-   ir_unop_b2i,      /**< Boolean-to-int conversion */
-   ir_unop_u2f,      /**< Unsigned-to-float conversion. */
-   ir_unop_any,
-
-   /**
-    * \name Unary floating-point rounding operations.
-    */
-   /*@{*/
-   ir_unop_trunc,
-   ir_unop_ceil,
-   ir_unop_floor,
-   ir_unop_fract,
-   ir_unop_round_even,
-   /*@}*/
-
-   /**
-    * \name Trigonometric operations.
-    */
-   /*@{*/
-   ir_unop_sin,
-   ir_unop_cos,
-   ir_unop_sin_reduced,    /**< Reduced range sin. [-pi, pi] */
-   ir_unop_cos_reduced,    /**< Reduced range cos. [-pi, pi] */
-   /*@}*/
-
-   /**
-    * \name Partial derivatives.
-    */
-   /*@{*/
-   ir_unop_dFdx,
-   ir_unop_dFdy,
-   /*@}*/
-
-   ir_unop_noise,
-
-   /**
-    * A sentinel marking the last of the unary operations.
-    */
-   ir_last_unop = ir_unop_noise,
-
-   ir_binop_add,
-   ir_binop_sub,
-   ir_binop_mul,
-   ir_binop_div,
-
-   /**
-    * Takes one of two combinations of arguments:
-    *
-    * - mod(vecN, vecN)
-    * - mod(vecN, float)
-    *
-    * Does not take integer types.
-    */
-   ir_binop_mod,
-
-   /**
-    * \name Binary comparison operators which return a boolean vector.
-    * The type of both operands must be equal.
-    */
-   /*@{*/
-   ir_binop_less,
-   ir_binop_greater,
-   ir_binop_lequal,
-   ir_binop_gequal,
-   ir_binop_equal,
-   ir_binop_nequal,
-   /**
-    * Returns single boolean for whether all components of operands[0]
-    * equal the components of operands[1].
-    */
-   ir_binop_all_equal,
-   /**
-    * Returns single boolean for whether any component of operands[0]
-    * is not equal to the corresponding component of operands[1].
-    */
-   ir_binop_any_nequal,
-   /*@}*/
-
-   /**
-    * \name Bit-wise binary operations.
-    */
-   /*@{*/
-   ir_binop_lshift,
-   ir_binop_rshift,
-   ir_binop_bit_and,
-   ir_binop_bit_xor,
-   ir_binop_bit_or,
-   /*@}*/
-
-   ir_binop_logic_and,
-   ir_binop_logic_xor,
-   ir_binop_logic_or,
-
-   ir_binop_dot,
-   ir_binop_min,
-   ir_binop_max,
-
-   ir_binop_pow,
-
-   /**
-    * A sentinel marking the last of the binary operations.
-    */
-   ir_last_binop = ir_binop_pow,
-
-   ir_quadop_vector,
-
-   /**
-    * A sentinel marking the last of all operations.
-    */
-   ir_last_opcode = ir_last_binop
-};
-
-class ir_expression : public ir_rvalue {
-public:
-   /**
-    * Constructor for unary operation expressions
-    */
-   ir_expression(int op, const struct glsl_type *type, ir_rvalue *);
-   ir_expression(int op, ir_rvalue *);
-
-   /**
-    * Constructor for binary operation expressions
-    */
-   ir_expression(int op, const struct glsl_type *type,
-		 ir_rvalue *, ir_rvalue *);
-   ir_expression(int op, ir_rvalue *op0, ir_rvalue *op1);
-
-   /**
-    * Constructor for quad operator expressions
-    */
-   ir_expression(int op, const struct glsl_type *type,
-		 ir_rvalue *, ir_rvalue *, ir_rvalue *, ir_rvalue *);
-
-   virtual ir_expression *as_expression()
-   {
-      return this;
-   }
-
-   virtual ir_expression *clone(void *mem_ctx, struct hash_table *ht) const;
-
-   /**
-    * Attempt to constant-fold the expression
-    *
-    * If the expression cannot be constant folded, this method will return
-    * \c NULL.
-    */
-   virtual ir_constant *constant_expression_value();
-
-   /**
-    * Determine the number of operands used by an expression
-    */
-   static unsigned int get_num_operands(ir_expression_operation);
-
-   /**
-    * Determine the number of operands used by an expression
-    */
-   unsigned int get_num_operands() const
-   {
-      return (this->operation == ir_quadop_vector)
-	 ? this->type->vector_elements : get_num_operands(operation);
-   }
-
-   /**
-    * Return a string representing this expression's operator.
-    */
-   const char *operator_string();
-
-   /**
-    * Return a string representing this expression's operator.
-    */
-   static const char *operator_string(ir_expression_operation);
-
-
-   /**
-    * Do a reverse-lookup to translate the given string into an operator.
-    */
-   static ir_expression_operation get_operator(const char *);
-
-   virtual void accept(ir_visitor *v)
-   {
-      v->visit(this);
-   }
-
-   virtual ir_visitor_status accept(ir_hierarchical_visitor *);
-
-   ir_expression_operation operation;
-   ir_rvalue *operands[4];
-};
-
-
-/**
- * IR instruction representing a function call
- */
-class ir_call : public ir_rvalue {
-public:
-   ir_call(ir_function_signature *callee, exec_list *actual_parameters)
-      : callee(callee)
-   {
-      ir_type = ir_type_call;
-      assert(callee->return_type != NULL);
-      type = callee->return_type;
-      actual_parameters->move_nodes_to(& this->actual_parameters);
-   }
-
-   virtual ir_call *clone(void *mem_ctx, struct hash_table *ht) const;
-
-   virtual ir_constant *constant_expression_value();
-
-   virtual ir_call *as_call()
-   {
-      return this;
-   }
-
-   virtual void accept(ir_visitor *v)
-   {
-      v->visit(this);
-   }
-
-   virtual ir_visitor_status accept(ir_hierarchical_visitor *);
-
-   /**
-    * Get a generic ir_call object when an error occurs
-    *
-    * Any allocation will be performed with 'ctx' as ralloc owner.
-    */
-   static ir_call *get_error_instruction(void *ctx);
-
-   /**
-    * Get an iterator for the set of acutal parameters
-    */
-   exec_list_iterator iterator()
-   {
-      return actual_parameters.iterator();
-   }
-
-   /**
-    * Get the name of the function being called.
-    */
-   const char *callee_name() const
-   {
-      return callee->function_name();
-   }
-
-   /**
-    * Get the function signature bound to this function call
-    */
-   ir_function_signature *get_callee()
-   {
-      return callee;
-   }
-
-   /**
-    * Set the function call target
-    */
-   void set_callee(ir_function_signature *sig);
-
-   /**
-    * Generates an inline version of the function before @ir,
-    * returning the return value of the function.
-    */
-   ir_rvalue *generate_inline(ir_instruction *ir);
-
-   /* List of ir_rvalue of paramaters passed in this call. */
-   exec_list actual_parameters;
-
-private:
-   ir_call()
-      : callee(NULL)
-   {
-      this->ir_type = ir_type_call;
-   }
-
-   ir_function_signature *callee;
-};
-
-
-/**
- * \name Jump-like IR instructions.
- *
- * These include \c break, \c continue, \c return, and \c discard.
- */
-/*@{*/
-class ir_jump : public ir_instruction {
-protected:
-   ir_jump()
-   {
-      ir_type = ir_type_unset;
-   }
-};
-
-class ir_return : public ir_jump {
-public:
-   ir_return()
-      : value(NULL)
-   {
-      this->ir_type = ir_type_return;
-   }
-
-   ir_return(ir_rvalue *value)
-      : value(value)
-   {
-      this->ir_type = ir_type_return;
-   }
-
-   virtual ir_return *clone(void *mem_ctx, struct hash_table *) const;
-
-   virtual ir_return *as_return()
-   {
-      return this;
-   }
-
-   ir_rvalue *get_value() const
-   {
-      return value;
-   }
-
-   virtual void accept(ir_visitor *v)
-   {
-      v->visit(this);
-   }
-
-   virtual ir_visitor_status accept(ir_hierarchical_visitor *);
-
-   ir_rvalue *value;
-};
-
-
-/**
- * Jump instructions used inside loops
- *
- * These include \c break and \c continue.  The \c break within a loop is
- * different from the \c break within a switch-statement.
- *
- * \sa ir_switch_jump
- */
-class ir_loop_jump : public ir_jump {
-public:
-   enum jump_mode {
-      jump_break,
-      jump_continue
-   };
-
-   ir_loop_jump(jump_mode mode)
-   {
-      this->ir_type = ir_type_loop_jump;
-      this->mode = mode;
-      this->loop = loop;
-   }
-
-   virtual ir_loop_jump *clone(void *mem_ctx, struct hash_table *) const;
-
-   virtual void accept(ir_visitor *v)
-   {
-      v->visit(this);
-   }
-
-   virtual ir_visitor_status accept(ir_hierarchical_visitor *);
-
-   bool is_break() const
-   {
-      return mode == jump_break;
-   }
-
-   bool is_continue() const
-   {
-      return mode == jump_continue;
-   }
-
-   /** Mode selector for the jump instruction. */
-   enum jump_mode mode;
-private:
-   /** Loop containing this break instruction. */
-   ir_loop *loop;
-};
-
-/**
- * IR instruction representing discard statements.
- */
-class ir_discard : public ir_jump {
-public:
-   ir_discard()
-   {
-      this->ir_type = ir_type_discard;
-      this->condition = NULL;
-   }
-
-   ir_discard(ir_rvalue *cond)
-   {
-      this->ir_type = ir_type_discard;
-      this->condition = cond;
-   }
-
-   virtual ir_discard *clone(void *mem_ctx, struct hash_table *ht) const;
-
-   virtual void accept(ir_visitor *v)
-   {
-      v->visit(this);
-   }
-
-   virtual ir_visitor_status accept(ir_hierarchical_visitor *);
-
-   virtual ir_discard *as_discard()
-   {
-      return this;
-   }
-
-   ir_rvalue *condition;
-};
-/*@}*/
-
-
-/**
- * Texture sampling opcodes used in ir_texture
- */
-enum ir_texture_opcode {
-   ir_tex,		/**< Regular texture look-up */
-   ir_txb,		/**< Texture look-up with LOD bias */
-   ir_txl,		/**< Texture look-up with explicit LOD */
-   ir_txd,		/**< Texture look-up with partial derivatvies */
-   ir_txf		/**< Texel fetch with explicit LOD */
-};
-
-
-/**
- * IR instruction to sample a texture
- *
- * The specific form of the IR instruction depends on the \c mode value
- * selected from \c ir_texture_opcodes.  In the printed IR, these will
- * appear as:
- *
- *                             Texel offset (0 or an expression)
- *                             | Projection divisor
- *                             | |  Shadow comparitor
- *                             | |  |
- *                             v v  v
- * (tex <sampler> <coordinate> 0 1 ( ))
- * (txb <sampler> <coordinate> 0 1 ( ) <bias>)
- * (txl <sampler> <coordinate> 0 1 ( ) <lod>)
- * (txd <sampler> <coordinate> 0 1 ( ) (dPdx dPdy))
- * (txf <sampler> <coordinate> 0       <lod>)
- */
-class ir_texture : public ir_rvalue {
-public:
-   ir_texture(enum ir_texture_opcode op)
-      : op(op), projector(NULL), shadow_comparitor(NULL), offset(NULL)
-   {
-      this->ir_type = ir_type_texture;
-   }
-
-   virtual ir_texture *clone(void *mem_ctx, struct hash_table *) const;
-
-   virtual ir_constant *constant_expression_value();
-
-   virtual void accept(ir_visitor *v)
-   {
-      v->visit(this);
-   }
-
-   virtual ir_visitor_status accept(ir_hierarchical_visitor *);
-
-   /**
-    * Return a string representing the ir_texture_opcode.
-    */
-   const char *opcode_string();
-
-   /** Set the sampler and infer the type. */
-   void set_sampler(ir_dereference *sampler);
-
-   /**
-    * Do a reverse-lookup to translate a string into an ir_texture_opcode.
-    */
-   static ir_texture_opcode get_opcode(const char *);
-
-   enum ir_texture_opcode op;
-
-   /** Sampler to use for the texture access. */
-   ir_dereference *sampler;
-
-   /** Texture coordinate to sample */
-   ir_rvalue *coordinate;
-
-   /**
-    * Value used for projective divide.
-    *
-    * If there is no projective divide (the common case), this will be
-    * \c NULL.  Optimization passes should check for this to point to a constant
-    * of 1.0 and replace that with \c NULL.
-    */
-   ir_rvalue *projector;
-
-   /**
-    * Coordinate used for comparison on shadow look-ups.
-    *
-    * If there is no shadow comparison, this will be \c NULL.  For the
-    * \c ir_txf opcode, this *must* be \c NULL.
-    */
-   ir_rvalue *shadow_comparitor;
-
-   /** Texel offset. */
-   ir_rvalue *offset;
-
-   union {
-      ir_rvalue *lod;		/**< Floating point LOD */
-      ir_rvalue *bias;		/**< Floating point LOD bias */
-      struct {
-	 ir_rvalue *dPdx;	/**< Partial derivative of coordinate wrt X */
-	 ir_rvalue *dPdy;	/**< Partial derivative of coordinate wrt Y */
-      } grad;
-   } lod_info;
-};
-
-
-struct ir_swizzle_mask {
-   unsigned x:2;
-   unsigned y:2;
-   unsigned z:2;
-   unsigned w:2;
-
-   /**
-    * Number of components in the swizzle.
-    */
-   unsigned num_components:3;
-
-   /**
-    * Does the swizzle contain duplicate components?
-    *
-    * L-value swizzles cannot contain duplicate components.
-    */
-   unsigned has_duplicates:1;
-};
-
-
-class ir_swizzle : public ir_rvalue {
-public:
-   ir_swizzle(ir_rvalue *, unsigned x, unsigned y, unsigned z, unsigned w,
-              unsigned count);
-
-   ir_swizzle(ir_rvalue *val, const unsigned *components, unsigned count);
-
-   ir_swizzle(ir_rvalue *val, ir_swizzle_mask mask);
-
-   virtual ir_swizzle *clone(void *mem_ctx, struct hash_table *) const;
-
-   virtual ir_constant *constant_expression_value();
-
-   virtual ir_swizzle *as_swizzle()
-   {
-      return this;
-   }
-
-   /**
-    * Construct an ir_swizzle from the textual representation.  Can fail.
-    */
-   static ir_swizzle *create(ir_rvalue *, const char *, unsigned vector_length);
-
-   virtual void accept(ir_visitor *v)
-   {
-      v->visit(this);
-   }
-
-   virtual ir_visitor_status accept(ir_hierarchical_visitor *);
-
-   bool is_lvalue()
-   {
-      return val->is_lvalue() && !mask.has_duplicates;
-   }
-
-   /**
-    * Get the variable that is ultimately referenced by an r-value
-    */
-   virtual ir_variable *variable_referenced();
-
-   ir_rvalue *val;
-   ir_swizzle_mask mask;
-
-private:
-   /**
-    * Initialize the mask component of a swizzle
-    *
-    * This is used by the \c ir_swizzle constructors.
-    */
-   void init_mask(const unsigned *components, unsigned count);
-};
-
-
-class ir_dereference : public ir_rvalue {
-public:
-   virtual ir_dereference *clone(void *mem_ctx, struct hash_table *) const = 0;
-
-   virtual ir_dereference *as_dereference()
-   {
-      return this;
-   }
-
-   bool is_lvalue();
-
-   /**
-    * Get the variable that is ultimately referenced by an r-value
-    */
-   virtual ir_variable *variable_referenced() = 0;
-};
-
-
-class ir_dereference_variable : public ir_dereference {
-public:
-   ir_dereference_variable(ir_variable *var);
-
-   virtual ir_dereference_variable *clone(void *mem_ctx,
-					  struct hash_table *) const;
-
-   virtual ir_constant *constant_expression_value();
-
-   virtual ir_dereference_variable *as_dereference_variable()
-   {
-      return this;
-   }
-
-   /**
-    * Get the variable that is ultimately referenced by an r-value
-    */
-   virtual ir_variable *variable_referenced()
-   {
-      return this->var;
-   }
-
-   virtual ir_variable *whole_variable_referenced()
-   {
-      /* ir_dereference_variable objects always dereference the entire
-       * variable.  However, if this dereference is dereferenced by anything
-       * else, the complete deferefernce chain is not a whole-variable
-       * dereference.  This method should only be called on the top most
-       * ir_rvalue in a dereference chain.
-       */
-      return this->var;
-   }
-
-   virtual void accept(ir_visitor *v)
-   {
-      v->visit(this);
-   }
-
-   virtual ir_visitor_status accept(ir_hierarchical_visitor *);
-
-   /**
-    * Object being dereferenced.
-    */
-   ir_variable *var;
-};
-
-
-class ir_dereference_array : public ir_dereference {
-public:
-   ir_dereference_array(ir_rvalue *value, ir_rvalue *array_index);
-
-   ir_dereference_array(ir_variable *var, ir_rvalue *array_index);
-
-   virtual ir_dereference_array *clone(void *mem_ctx,
-				       struct hash_table *) const;
-
-   virtual ir_constant *constant_expression_value();
-
-   virtual ir_dereference_array *as_dereference_array()
-   {
-      return this;
-   }
-
-   /**
-    * Get the variable that is ultimately referenced by an r-value
-    */
-   virtual ir_variable *variable_referenced()
-   {
-      return this->array->variable_referenced();
-   }
-
-   virtual void accept(ir_visitor *v)
-   {
-      v->visit(this);
-   }
-
-   virtual ir_visitor_status accept(ir_hierarchical_visitor *);
-
-   ir_rvalue *array;
-   ir_rvalue *array_index;
-
-private:
-   void set_array(ir_rvalue *value);
-};
-
-
-class ir_dereference_record : public ir_dereference {
-public:
-   ir_dereference_record(ir_rvalue *value, const char *field);
-
-   ir_dereference_record(ir_variable *var, const char *field);
-
-   virtual ir_dereference_record *clone(void *mem_ctx,
-					struct hash_table *) const;
-
-   virtual ir_constant *constant_expression_value();
-
-   /**
-    * Get the variable that is ultimately referenced by an r-value
-    */
-   virtual ir_variable *variable_referenced()
-   {
-      return this->record->variable_referenced();
-   }
-
-   virtual void accept(ir_visitor *v)
-   {
-      v->visit(this);
-   }
-
-   virtual ir_visitor_status accept(ir_hierarchical_visitor *);
-
-   ir_rvalue *record;
-   const char *field;
-};
-
-
-/**
- * Data stored in an ir_constant
- */
-union ir_constant_data {
-      unsigned u[16];
-      int i[16];
-      float f[16];
-      bool b[16];
-};
-
-
-class ir_constant : public ir_rvalue {
-public:
-   ir_constant(const struct glsl_type *type, const ir_constant_data *data);
-   ir_constant(bool b);
-   ir_constant(unsigned int u);
-   ir_constant(int i);
-   ir_constant(float f);
-
-   /**
-    * Construct an ir_constant from a list of ir_constant values
-    */
-   ir_constant(const struct glsl_type *type, exec_list *values);
-
-   /**
-    * Construct an ir_constant from a scalar component of another ir_constant
-    *
-    * The new \c ir_constant inherits the type of the component from the
-    * source constant.
-    *
-    * \note
-    * In the case of a matrix constant, the new constant is a scalar, \b not
-    * a vector.
-    */
-   ir_constant(const ir_constant *c, unsigned i);
-
-   /**
-    * Return a new ir_constant of the specified type containing all zeros.
-    */
-   static ir_constant *zero(void *mem_ctx, const glsl_type *type);
-
-   virtual ir_constant *clone(void *mem_ctx, struct hash_table *) const;
-
-   virtual ir_constant *constant_expression_value();
-
-   virtual ir_constant *as_constant()
-   {
-      return this;
-   }
-
-   virtual void accept(ir_visitor *v)
-   {
-      v->visit(this);
-   }
-
-   virtual ir_visitor_status accept(ir_hierarchical_visitor *);
-
-   /**
-    * Get a particular component of a constant as a specific type
-    *
-    * This is useful, for example, to get a value from an integer constant
-    * as a float or bool.  This appears frequently when constructors are
-    * called with all constant parameters.
-    */
-   /*@{*/
-   bool get_bool_component(unsigned i) const;
-   float get_float_component(unsigned i) const;
-   int get_int_component(unsigned i) const;
-   unsigned get_uint_component(unsigned i) const;
-   /*@}*/
-
-   ir_constant *get_array_element(unsigned i) const;
-
-   ir_constant *get_record_field(const char *name);
-
-   /**
-    * Determine whether a constant has the same value as another constant
-    *
-    * \sa ir_constant::is_zero, ir_constant::is_one,
-    * ir_constant::is_negative_one
-    */
-   bool has_value(const ir_constant *) const;
-
-   virtual bool is_zero() const;
-   virtual bool is_one() const;
-   virtual bool is_negative_one() const;
-
-   /**
-    * Value of the constant.
-    *
-    * The field used to back the values supplied by the constant is determined
-    * by the type associated with the \c ir_instruction.  Constants may be
-    * scalars, vectors, or matrices.
-    */
-   union ir_constant_data value;
-
-   /* Array elements */
-   ir_constant **array_elements;
-
-   /* Structure fields */
-   exec_list components;
-
-private:
-   /**
-    * Parameterless constructor only used by the clone method
-    */
-   ir_constant(void);
-};
-
-/*@}*/
-
-/**
- * Apply a visitor to each IR node in a list
- */
-void
-visit_exec_list(exec_list *list, ir_visitor *visitor);
-
-/**
- * Validate invariants on each IR node in a list
- */
-void validate_ir_tree(exec_list *instructions);
-
-/**
- * Make a clone of each IR instruction in a list
- *
- * \param in   List of IR instructions that are to be cloned
- * \param out  List to hold the cloned instructions
- */
-void
-clone_ir_list(void *mem_ctx, exec_list *out, const exec_list *in);
-
-extern void
-_mesa_glsl_initialize_variables(exec_list *instructions,
-				struct _mesa_glsl_parse_state *state);
-
-extern void
-_mesa_glsl_initialize_functions(_mesa_glsl_parse_state *state);
-
-extern void
-_mesa_glsl_release_functions(void);
-
-extern void
-reparent_ir(exec_list *list, void *mem_ctx);
-
-struct glsl_symbol_table;
-
-extern void
-import_prototypes(const exec_list *source, exec_list *dest,
-		  struct glsl_symbol_table *symbols, void *mem_ctx);
-
-extern bool
-ir_has_call(ir_instruction *ir);
-
-extern void
-do_set_program_inouts(exec_list *instructions, struct gl_program *prog);
-
-#endif /* IR_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_H

+#define IR_H

+

+#include <stdio.h>

+#include <stdlib.h>

+

+#include "ralloc.h"

+#include "glsl_types.h"

+#include "list.h"

+#include "ir_visitor.h"

+#include "ir_hierarchical_visitor.h"

+

+/**

+ * \defgroup IR Intermediate representation nodes

+ *

+ * @{

+ */

+

+/**

+ * Class tags

+ *

+ * Each concrete class derived from \c ir_instruction has a value in this

+ * enumerant.  The value for the type is stored in \c ir_instruction::ir_type

+ * by the constructor.  While using type tags is not very C++, it is extremely

+ * convenient.  For example, during debugging you can simply inspect

+ * \c ir_instruction::ir_type to find out the actual type of the object.

+ *

+ * In addition, it is possible to use a switch-statement based on \c

+ * \c ir_instruction::ir_type to select different behavior for different object

+ * types.  For functions that have only slight differences for several object

+ * types, this allows writing very straightforward, readable code.

+ */

+enum ir_node_type {

+   /**

+    * Zero is unused so that the IR validator can detect cases where

+    * \c ir_instruction::ir_type has not been initialized.

+    */

+   ir_type_unset,

+   ir_type_variable,

+   ir_type_assignment,

+   ir_type_call,

+   ir_type_constant,

+   ir_type_dereference_array,

+   ir_type_dereference_record,

+   ir_type_dereference_variable,

+   ir_type_discard,

+   ir_type_expression,

+   ir_type_function,

+   ir_type_function_signature,

+   ir_type_if,

+   ir_type_loop,

+   ir_type_loop_jump,

+   ir_type_return,

+   ir_type_swizzle,

+   ir_type_texture,

+   ir_type_max /**< maximum ir_type enum number, for validation */

+};

+

+/**

+ * Base class of all IR instructions

+ */

+class ir_instruction : public exec_node {

+public:

+   enum ir_node_type ir_type;

+   const struct glsl_type *type;

+

+   /** ir_print_visitor helper for debugging. */

+   void print(void) const;

+

+   virtual void accept(ir_visitor *) = 0;

+   virtual ir_visitor_status accept(ir_hierarchical_visitor *) = 0;

+   virtual ir_instruction *clone(void *mem_ctx,

+				 struct hash_table *ht) const = 0;

+

+   /**

+    * \name IR instruction downcast functions

+    *

+    * These functions either cast the object to a derived class or return

+    * \c NULL if the object's type does not match the specified derived class.

+    * Additional downcast functions will be added as needed.

+    */

+   /*@{*/

+   virtual class ir_variable *          as_variable()         { return NULL; }

+   virtual class ir_function *          as_function()         { return NULL; }

+   virtual class ir_dereference *       as_dereference()      { return NULL; }

+   virtual class ir_dereference_array *	as_dereference_array() { return NULL; }

+   virtual class ir_dereference_variable *as_dereference_variable() { return NULL; }

+   virtual class ir_expression *        as_expression()       { return NULL; }

+   virtual class ir_rvalue *            as_rvalue()           { return NULL; }

+   virtual class ir_loop *              as_loop()             { return NULL; }

+   virtual class ir_assignment *        as_assignment()       { return NULL; }

+   virtual class ir_call *              as_call()             { return NULL; }

+   virtual class ir_return *            as_return()           { return NULL; }

+   virtual class ir_if *                as_if()               { return NULL; }

+   virtual class ir_swizzle *           as_swizzle()          { return NULL; }

+   virtual class ir_constant *          as_constant()         { return NULL; }

+   virtual class ir_discard *           as_discard()          { return NULL; }

+   /*@}*/

+

+protected:

+   ir_instruction()

+   {

+      ir_type = ir_type_unset;

+      type = NULL;

+   }

+};

+

+

+class ir_rvalue : public ir_instruction {

+public:

+   virtual ir_rvalue *clone(void *mem_ctx, struct hash_table *) const = 0;

+

+   virtual ir_constant *constant_expression_value() = 0;

+

+   virtual ir_rvalue * as_rvalue()

+   {

+      return this;

+   }

+

+   ir_rvalue *as_rvalue_to_saturate();

+

+   virtual bool is_lvalue()

+   {

+      return false;

+   }

+

+   /**

+    * Get the variable that is ultimately referenced by an r-value

+    */

+   virtual ir_variable *variable_referenced()

+   {

+      return NULL;

+   }

+

+

+   /**

+    * If an r-value is a reference to a whole variable, get that variable

+    *

+    * \return

+    * Pointer to a variable that is completely dereferenced by the r-value.  If

+    * the r-value is not a dereference or the dereference does not access the

+    * entire variable (i.e., it's just one array element, struct field), \c NULL

+    * is returned.

+    */

+   virtual ir_variable *whole_variable_referenced()

+   {

+      return NULL;

+   }

+

+   /**

+    * Determine if an r-value has the value zero

+    *

+    * The base implementation of this function always returns \c false.  The

+    * \c ir_constant class over-rides this function to return \c true \b only

+    * for vector and scalar types that have all elements set to the value

+    * zero (or \c false for booleans).

+    *

+    * \sa ir_constant::has_value, ir_rvalue::is_one, ir_rvalue::is_negative_one

+    */

+   virtual bool is_zero() const;

+

+   /**

+    * Determine if an r-value has the value one

+    *

+    * The base implementation of this function always returns \c false.  The

+    * \c ir_constant class over-rides this function to return \c true \b only

+    * for vector and scalar types that have all elements set to the value

+    * one (or \c true for booleans).

+    *

+    * \sa ir_constant::has_value, ir_rvalue::is_zero, ir_rvalue::is_negative_one

+    */

+   virtual bool is_one() const;

+

+   /**

+    * Determine if an r-value has the value negative one

+    *

+    * The base implementation of this function always returns \c false.  The

+    * \c ir_constant class over-rides this function to return \c true \b only

+    * for vector and scalar types that have all elements set to the value

+    * negative one.  For boolean times, the result is always \c false.

+    *

+    * \sa ir_constant::has_value, ir_rvalue::is_zero, ir_rvalue::is_one

+    */

+   virtual bool is_negative_one() const;

+

+protected:

+   ir_rvalue();

+};

+

+

+/**

+ * Variable storage classes

+ */

+enum ir_variable_mode {

+   ir_var_auto = 0,     /**< Function local variables and globals. */

+   ir_var_uniform,      /**< Variable declared as a uniform. */

+   ir_var_in,

+   ir_var_out,

+   ir_var_inout,

+   ir_var_const_in,	/**< "in" param that must be a constant expression */

+   ir_var_system_value, /**< Ex: front-face, instance-id, etc. */

+   ir_var_temporary	/**< Temporary variable generated during compilation. */

+};

+

+enum ir_variable_interpolation {

+   ir_var_smooth = 0,

+   ir_var_flat,

+   ir_var_noperspective

+};

+

+/**

+ * \brief Layout qualifiers for gl_FragDepth.

+ *

+ * The AMD_conservative_depth extension allows gl_FragDepth to be redeclared

+ * with a layout qualifier.

+ */

+enum ir_depth_layout {

+    ir_depth_layout_none, /**< No depth layout is specified. */

+    ir_depth_layout_any,

+    ir_depth_layout_greater,

+    ir_depth_layout_less,

+    ir_depth_layout_unchanged

+};

+

+/**

+ * \brief Convert depth layout qualifier to string.

+ */

+const char*

+depth_layout_string(ir_depth_layout layout);

+

+class ir_variable : public ir_instruction {

+public:

+   ir_variable(const struct glsl_type *, const char *, ir_variable_mode);

+

+   virtual ir_variable *clone(void *mem_ctx, struct hash_table *ht) const;

+

+   virtual ir_variable *as_variable()

+   {

+      return this;

+   }

+

+   virtual void accept(ir_visitor *v)

+   {

+      v->visit(this);

+   }

+

+   virtual ir_visitor_status accept(ir_hierarchical_visitor *);

+

+

+   /**

+    * Get the string value for the interpolation qualifier

+    *

+    * \return The string that would be used in a shader to specify \c

+    * mode will be returned.

+    *

+    * This function should only be used on a shader input or output variable.

+    */

+   const char *interpolation_string() const;

+

+   /**

+    * Calculate the number of slots required to hold this variable

+    *

+    * This is used to determine how many uniform or varying locations a variable

+    * occupies.  The count is in units of floating point components.

+    */

+   unsigned component_slots() const;

+

+   /**

+    * Delcared name of the variable

+    */

+   const char *name;

+

+   /**

+    * Highest element accessed with a constant expression array index

+    *

+    * Not used for non-array variables.

+    */

+   unsigned max_array_access;

+

+   /**

+    * Is the variable read-only?

+    *

+    * This is set for variables declared as \c const, shader inputs,

+    * and uniforms.

+    */

+   unsigned read_only:1;

+   unsigned centroid:1;

+   unsigned invariant:1;

+

+   /**

+    * Has this variable been used for reading or writing?

+    *

+    * Several GLSL semantic checks require knowledge of whether or not a

+    * variable has been used.  For example, it is an error to redeclare a

+    * variable as invariant after it has been used.

+    */

+   unsigned used:1;

+

+   /**

+    * Storage class of the variable.

+    *

+    * \sa ir_variable_mode

+    */

+   unsigned mode:3;

+

+   /**

+    * Interpolation mode for shader inputs / outputs

+    *

+    * \sa ir_variable_interpolation

+    */

+   unsigned interpolation:2;

+

+   /**

+    * Flag that the whole array is assignable

+    *

+    * In GLSL 1.20 and later whole arrays are assignable (and comparable for

+    * equality).  This flag enables this behavior.

+    */

+   unsigned array_lvalue:1;

+

+   /**

+    * \name ARB_fragment_coord_conventions

+    * @{

+    */

+   unsigned origin_upper_left:1;

+   unsigned pixel_center_integer:1;

+   /*@}*/

+

+   /**

+    * \brief Layout qualifier for gl_FragDepth.

+    *

+    * This is not equal to \c ir_depth_layout_none if and only if this

+    * variable is \c gl_FragDepth and a layout qualifier is specified.

+    */

+   ir_depth_layout depth_layout;

+

+   /**

+    * Was the location explicitly set in the shader?

+    *

+    * If the location is explicitly set in the shader, it \b cannot be changed

+    * by the linker or by the API (e.g., calls to \c glBindAttribLocation have

+    * no effect).

+    */

+   unsigned explicit_location:1;

+

+   /**

+    * Storage location of the base of this variable

+    *

+    * The precise meaning of this field depends on the nature of the variable.

+    *

+    *   - Vertex shader input: one of the values from \c gl_vert_attrib.

+    *   - Vertex shader output: one of the values from \c gl_vert_result.

+    *   - Fragment shader input: one of the values from \c gl_frag_attrib.

+    *   - Fragment shader output: one of the values from \c gl_frag_result.

+    *   - Uniforms: Per-stage uniform slot number.

+    *   - Other: This field is not currently used.

+    *

+    * If the variable is a uniform, shader input, or shader output, and the

+    * slot has not been assigned, the value will be -1.

+    */

+   int location;

+

+   /**

+    * Emit a warning if this variable is accessed.

+    */

+   const char *warn_extension;

+

+   /**

+    * Value assigned in the initializer of a variable declared "const"

+    */

+   ir_constant *constant_value;

+};

+

+

+/*@{*/

+/**

+ * The representation of a function instance; may be the full definition or

+ * simply a prototype.

+ */

+class ir_function_signature : public ir_instruction {

+   /* An ir_function_signature will be part of the list of signatures in

+    * an ir_function.

+    */

+public:

+   ir_function_signature(const glsl_type *return_type);

+

+   virtual ir_function_signature *clone(void *mem_ctx,

+					struct hash_table *ht) const;

+   ir_function_signature *clone_prototype(void *mem_ctx,

+					  struct hash_table *ht) const;

+

+   virtual void accept(ir_visitor *v)

+   {

+      v->visit(this);

+   }

+

+   virtual ir_visitor_status accept(ir_hierarchical_visitor *);

+

+   /**

+    * Get the name of the function for which this is a signature

+    */

+   const char *function_name() const;

+

+   /**

+    * Get a handle to the function for which this is a signature

+    *

+    * There is no setter function, this function returns a \c const pointer,

+    * and \c ir_function_signature::_function is private for a reason.  The

+    * only way to make a connection between a function and function signature

+    * is via \c ir_function::add_signature.  This helps ensure that certain

+    * invariants (i.e., a function signature is in the list of signatures for

+    * its \c _function) are met.

+    *

+    * \sa ir_function::add_signature

+    */

+   inline const class ir_function *function() const

+   {

+      return this->_function;

+   }

+

+   /**

+    * Check whether the qualifiers match between this signature's parameters

+    * and the supplied parameter list.  If not, returns the name of the first

+    * parameter with mismatched qualifiers (for use in error messages).

+    */

+   const char *qualifiers_match(exec_list *params);

+

+   /**

+    * Replace the current parameter list with the given one.  This is useful

+    * if the current information came from a prototype, and either has invalid

+    * or missing parameter names.

+    */

+   void replace_parameters(exec_list *new_params);

+

+   /**

+    * Function return type.

+    *

+    * \note This discards the optional precision qualifier.

+    */

+   const struct glsl_type *return_type;

+

+   /**

+    * List of ir_variable of function parameters.

+    *

+    * This represents the storage.  The paramaters passed in a particular

+    * call will be in ir_call::actual_paramaters.

+    */

+   struct exec_list parameters;

+

+   /** Whether or not this function has a body (which may be empty). */

+   unsigned is_defined:1;

+

+   /** Whether or not this function signature is a built-in. */

+   unsigned is_builtin:1;

+

+   /** Body of instructions in the function. */

+   struct exec_list body;

+

+private:

+   /** Function of which this signature is one overload. */

+   class ir_function *_function;

+

+   friend class ir_function;

+};

+

+

+/**

+ * Header for tracking multiple overloaded functions with the same name.

+ * Contains a list of ir_function_signatures representing each of the

+ * actual functions.

+ */

+class ir_function : public ir_instruction {

+public:

+   ir_function(const char *name);

+

+   virtual ir_function *clone(void *mem_ctx, struct hash_table *ht) const;

+

+   virtual ir_function *as_function()

+   {

+      return this;

+   }

+

+   virtual void accept(ir_visitor *v)

+   {

+      v->visit(this);

+   }

+

+   virtual ir_visitor_status accept(ir_hierarchical_visitor *);

+

+   void add_signature(ir_function_signature *sig)

+   {

+      sig->_function = this;

+      this->signatures.push_tail(sig);

+   }

+

+   /**

+    * Get an iterator for the set of function signatures

+    */

+   exec_list_iterator iterator()

+   {

+      return signatures.iterator();

+   }

+

+   /**

+    * Find a signature that matches a set of actual parameters, taking implicit

+    * conversions into account.

+    */

+   ir_function_signature *matching_signature(const exec_list *actual_param);

+

+   /**

+    * Find a signature that exactly matches a set of actual parameters without

+    * any implicit type conversions.

+    */

+   ir_function_signature *exact_matching_signature(const exec_list *actual_ps);

+

+   /**

+    * Name of the function.

+    */

+   const char *name;

+

+   /** Whether or not this function has a signature that isn't a built-in. */

+   bool has_user_signature();

+

+   /**

+    * List of ir_function_signature for each overloaded function with this name.

+    */

+   struct exec_list signatures;

+};

+

+inline const char *ir_function_signature::function_name() const

+{

+   return this->_function->name;

+}

+/*@}*/

+

+

+/**

+ * IR instruction representing high-level if-statements

+ */

+class ir_if : public ir_instruction {

+public:

+   ir_if(ir_rvalue *condition)

+      : condition(condition)

+   {

+      ir_type = ir_type_if;

+   }

+

+   virtual ir_if *clone(void *mem_ctx, struct hash_table *ht) const;

+

+   virtual ir_if *as_if()

+   {

+      return this;

+   }

+

+   virtual void accept(ir_visitor *v)

+   {

+      v->visit(this);

+   }

+

+   virtual ir_visitor_status accept(ir_hierarchical_visitor *);

+

+   ir_rvalue *condition;

+   /** List of ir_instruction for the body of the then branch */

+   exec_list  then_instructions;

+   /** List of ir_instruction for the body of the else branch */

+   exec_list  else_instructions;

+};

+

+

+/**

+ * IR instruction representing a high-level loop structure.

+ */

+class ir_loop : public ir_instruction {

+public:

+   ir_loop();

+

+   virtual ir_loop *clone(void *mem_ctx, struct hash_table *ht) const;

+

+   virtual void accept(ir_visitor *v)

+   {

+      v->visit(this);

+   }

+

+   virtual ir_visitor_status accept(ir_hierarchical_visitor *);

+

+   virtual ir_loop *as_loop()

+   {

+      return this;

+   }

+

+   /**

+    * Get an iterator for the instructions of the loop body

+    */

+   exec_list_iterator iterator()

+   {

+      return body_instructions.iterator();

+   }

+

+   /** List of ir_instruction that make up the body of the loop. */

+   exec_list body_instructions;

+

+   /**

+    * \name Loop counter and controls

+    *

+    * Represents a loop like a FORTRAN \c do-loop.

+    *

+    * \note

+    * If \c from and \c to are the same value, the loop will execute once.

+    */

+   /*@{*/

+   ir_rvalue *from;             /** Value of the loop counter on the first

+				 * iteration of the loop.

+				 */

+   ir_rvalue *to;               /** Value of the loop counter on the last

+				 * iteration of the loop.

+				 */

+   ir_rvalue *increment;

+   ir_variable *counter;

+

+   /**

+    * Comparison operation in the loop terminator.

+    *

+    * If any of the loop control fields are non-\c NULL, this field must be

+    * one of \c ir_binop_less, \c ir_binop_greater, \c ir_binop_lequal,

+    * \c ir_binop_gequal, \c ir_binop_equal, or \c ir_binop_nequal.

+    */

+   int cmp;

+   /*@}*/

+};

+

+

+class ir_assignment : public ir_instruction {

+public:

+   ir_assignment(ir_rvalue *lhs, ir_rvalue *rhs, ir_rvalue *condition);

+

+   /**

+    * Construct an assignment with an explicit write mask

+    *

+    * \note

+    * Since a write mask is supplied, the LHS must already be a bare

+    * \c ir_dereference.  The cannot be any swizzles in the LHS.

+    */

+   ir_assignment(ir_dereference *lhs, ir_rvalue *rhs, ir_rvalue *condition,

+		 unsigned write_mask);

+

+   virtual ir_assignment *clone(void *mem_ctx, struct hash_table *ht) const;

+

+   virtual ir_constant *constant_expression_value();

+

+   virtual void accept(ir_visitor *v)

+   {

+      v->visit(this);

+   }

+

+   virtual ir_visitor_status accept(ir_hierarchical_visitor *);

+

+   virtual ir_assignment * as_assignment()

+   {

+      return this;

+   }

+

+   /**

+    * Get a whole variable written by an assignment

+    *

+    * If the LHS of the assignment writes a whole variable, the variable is

+    * returned.  Otherwise \c NULL is returned.  Examples of whole-variable

+    * assignment are:

+    *

+    *  - Assigning to a scalar

+    *  - Assigning to all components of a vector

+    *  - Whole array (or matrix) assignment

+    *  - Whole structure assignment

+    */

+   ir_variable *whole_variable_written();

+

+   /**

+    * Set the LHS of an assignment

+    */

+   void set_lhs(ir_rvalue *lhs);

+

+   /**

+    * Left-hand side of the assignment.

+    *

+    * This should be treated as read only.  If you need to set the LHS of an

+    * assignment, use \c ir_assignment::set_lhs.

+    */

+   ir_dereference *lhs;

+

+   /**

+    * Value being assigned

+    */

+   ir_rvalue *rhs;

+

+   /**

+    * Optional condition for the assignment.

+    */

+   ir_rvalue *condition;

+

+

+   /**

+    * Component mask written

+    *

+    * For non-vector types in the LHS, this field will be zero.  For vector

+    * types, a bit will be set for each component that is written.  Note that

+    * for \c vec2 and \c vec3 types only the lower bits will ever be set.

+    *

+    * A partially-set write mask means that each enabled channel gets

+    * the value from a consecutive channel of the rhs.  For example,

+    * to write just .xyw of gl_FrontColor with color:

+    *

+    * (assign (constant bool (1)) (xyw)

+    *     (var_ref gl_FragColor)

+    *     (swiz xyw (var_ref color)))

+    */

+   unsigned write_mask:4;

+};

+

+/* Update ir_expression::num_operands() and operator_strs when

+ * updating this list.

+ */

+enum ir_expression_operation {

+   ir_unop_bit_not,

+   ir_unop_logic_not,

+   ir_unop_neg,

+   ir_unop_abs,

+   ir_unop_sign,

+   ir_unop_rcp,

+   ir_unop_rsq,

+   ir_unop_sqrt,

+   ir_unop_exp,      /**< Log base e on gentype */

+   ir_unop_log,	     /**< Natural log on gentype */

+   ir_unop_exp2,

+   ir_unop_log2,

+   ir_unop_f2i,      /**< Float-to-integer conversion. */

+   ir_unop_i2f,      /**< Integer-to-float conversion. */

+   ir_unop_f2b,      /**< Float-to-boolean conversion */

+   ir_unop_b2f,      /**< Boolean-to-float conversion */

+   ir_unop_i2b,      /**< int-to-boolean conversion */

+   ir_unop_b2i,      /**< Boolean-to-int conversion */

+   ir_unop_u2f,      /**< Unsigned-to-float conversion. */

+   ir_unop_any,

+

+   /**

+    * \name Unary floating-point rounding operations.

+    */

+   /*@{*/

+   ir_unop_trunc,

+   ir_unop_ceil,

+   ir_unop_floor,

+   ir_unop_fract,

+   ir_unop_round_even,

+   /*@}*/

+

+   /**

+    * \name Trigonometric operations.

+    */

+   /*@{*/

+   ir_unop_sin,

+   ir_unop_cos,

+   ir_unop_sin_reduced,    /**< Reduced range sin. [-pi, pi] */

+   ir_unop_cos_reduced,    /**< Reduced range cos. [-pi, pi] */

+   /*@}*/

+

+   /**

+    * \name Partial derivatives.

+    */

+   /*@{*/

+   ir_unop_dFdx,

+   ir_unop_dFdy,

+   /*@}*/

+

+   ir_unop_noise,

+

+   /**

+    * A sentinel marking the last of the unary operations.

+    */

+   ir_last_unop = ir_unop_noise,

+

+   ir_binop_add,

+   ir_binop_sub,

+   ir_binop_mul,

+   ir_binop_div,

+

+   /**

+    * Takes one of two combinations of arguments:

+    *

+    * - mod(vecN, vecN)

+    * - mod(vecN, float)

+    *

+    * Does not take integer types.

+    */

+   ir_binop_mod,

+

+   /**

+    * \name Binary comparison operators which return a boolean vector.

+    * The type of both operands must be equal.

+    */

+   /*@{*/

+   ir_binop_less,

+   ir_binop_greater,

+   ir_binop_lequal,

+   ir_binop_gequal,

+   ir_binop_equal,

+   ir_binop_nequal,

+   /**

+    * Returns single boolean for whether all components of operands[0]

+    * equal the components of operands[1].

+    */

+   ir_binop_all_equal,

+   /**

+    * Returns single boolean for whether any component of operands[0]

+    * is not equal to the corresponding component of operands[1].

+    */

+   ir_binop_any_nequal,

+   /*@}*/

+

+   /**

+    * \name Bit-wise binary operations.

+    */

+   /*@{*/

+   ir_binop_lshift,

+   ir_binop_rshift,

+   ir_binop_bit_and,

+   ir_binop_bit_xor,

+   ir_binop_bit_or,

+   /*@}*/

+

+   ir_binop_logic_and,

+   ir_binop_logic_xor,

+   ir_binop_logic_or,

+

+   ir_binop_dot,

+   ir_binop_min,

+   ir_binop_max,

+

+   ir_binop_pow,

+

+   /**

+    * A sentinel marking the last of the binary operations.

+    */

+   ir_last_binop = ir_binop_pow,

+

+   ir_quadop_vector,

+

+   /**

+    * A sentinel marking the last of all operations.

+    */

+   ir_last_opcode = ir_last_binop

+};

+

+class ir_expression : public ir_rvalue {

+public:

+   /**

+    * Constructor for unary operation expressions

+    */

+   ir_expression(int op, const struct glsl_type *type, ir_rvalue *);

+   ir_expression(int op, ir_rvalue *);

+

+   /**

+    * Constructor for binary operation expressions

+    */

+   ir_expression(int op, const struct glsl_type *type,

+		 ir_rvalue *, ir_rvalue *);

+   ir_expression(int op, ir_rvalue *op0, ir_rvalue *op1);

+

+   /**

+    * Constructor for quad operator expressions

+    */

+   ir_expression(int op, const struct glsl_type *type,

+		 ir_rvalue *, ir_rvalue *, ir_rvalue *, ir_rvalue *);

+

+   virtual ir_expression *as_expression()

+   {

+      return this;

+   }

+

+   virtual ir_expression *clone(void *mem_ctx, struct hash_table *ht) const;

+

+   /**

+    * Attempt to constant-fold the expression

+    *

+    * If the expression cannot be constant folded, this method will return

+    * \c NULL.

+    */

+   virtual ir_constant *constant_expression_value();

+

+   /**

+    * Determine the number of operands used by an expression

+    */

+   static unsigned int get_num_operands(ir_expression_operation);

+

+   /**

+    * Determine the number of operands used by an expression

+    */

+   unsigned int get_num_operands() const

+   {

+      return (this->operation == ir_quadop_vector)

+	 ? this->type->vector_elements : get_num_operands(operation);

+   }

+

+   /**

+    * Return a string representing this expression's operator.

+    */

+   const char *operator_string();

+

+   /**

+    * Return a string representing this expression's operator.

+    */

+   static const char *operator_string(ir_expression_operation);

+

+

+   /**

+    * Do a reverse-lookup to translate the given string into an operator.

+    */

+   static ir_expression_operation get_operator(const char *);

+

+   virtual void accept(ir_visitor *v)

+   {

+      v->visit(this);

+   }

+

+   virtual ir_visitor_status accept(ir_hierarchical_visitor *);

+

+   ir_expression_operation operation;

+   ir_rvalue *operands[4];

+};

+

+

+/**

+ * IR instruction representing a function call

+ */

+class ir_call : public ir_rvalue {

+public:

+   ir_call(ir_function_signature *callee, exec_list *actual_parameters)

+      : callee(callee)

+   {

+      ir_type = ir_type_call;

+      assert(callee->return_type != NULL);

+      type = callee->return_type;

+      actual_parameters->move_nodes_to(& this->actual_parameters);

+   }

+

+   virtual ir_call *clone(void *mem_ctx, struct hash_table *ht) const;

+

+   virtual ir_constant *constant_expression_value();

+

+   virtual ir_call *as_call()

+   {

+      return this;

+   }

+

+   virtual void accept(ir_visitor *v)

+   {

+      v->visit(this);

+   }

+

+   virtual ir_visitor_status accept(ir_hierarchical_visitor *);

+

+   /**

+    * Get a generic ir_call object when an error occurs

+    *

+    * Any allocation will be performed with 'ctx' as ralloc owner.

+    */

+   static ir_call *get_error_instruction(void *ctx);

+

+   /**

+    * Get an iterator for the set of acutal parameters

+    */

+   exec_list_iterator iterator()

+   {

+      return actual_parameters.iterator();

+   }

+

+   /**

+    * Get the name of the function being called.

+    */

+   const char *callee_name() const

+   {

+      return callee->function_name();

+   }

+

+   /**

+    * Get the function signature bound to this function call

+    */

+   ir_function_signature *get_callee()

+   {

+      return callee;

+   }

+

+   /**

+    * Set the function call target

+    */

+   void set_callee(ir_function_signature *sig);

+

+   /**

+    * Generates an inline version of the function before @ir,

+    * returning the return value of the function.

+    */

+   ir_rvalue *generate_inline(ir_instruction *ir);

+

+   /* List of ir_rvalue of paramaters passed in this call. */

+   exec_list actual_parameters;

+

+private:

+   ir_call()

+      : callee(NULL)

+   {

+      this->ir_type = ir_type_call;

+   }

+

+   ir_function_signature *callee;

+};

+

+

+/**

+ * \name Jump-like IR instructions.

+ *

+ * These include \c break, \c continue, \c return, and \c discard.

+ */

+/*@{*/

+class ir_jump : public ir_instruction {

+protected:

+   ir_jump()

+   {

+      ir_type = ir_type_unset;

+   }

+};

+

+class ir_return : public ir_jump {

+public:

+   ir_return()

+      : value(NULL)

+   {

+      this->ir_type = ir_type_return;

+   }

+

+   ir_return(ir_rvalue *value)

+      : value(value)

+   {

+      this->ir_type = ir_type_return;

+   }

+

+   virtual ir_return *clone(void *mem_ctx, struct hash_table *) const;

+

+   virtual ir_return *as_return()

+   {

+      return this;

+   }

+

+   ir_rvalue *get_value() const

+   {

+      return value;

+   }

+

+   virtual void accept(ir_visitor *v)

+   {

+      v->visit(this);

+   }

+

+   virtual ir_visitor_status accept(ir_hierarchical_visitor *);

+

+   ir_rvalue *value;

+};

+

+

+/**

+ * Jump instructions used inside loops

+ *

+ * These include \c break and \c continue.  The \c break within a loop is

+ * different from the \c break within a switch-statement.

+ *

+ * \sa ir_switch_jump

+ */

+class ir_loop_jump : public ir_jump {

+public:

+   enum jump_mode {

+      jump_break,

+      jump_continue

+   };

+

+   ir_loop_jump(jump_mode mode)

+   {

+      this->ir_type = ir_type_loop_jump;

+      this->mode = mode;

+      this->loop = loop;

+   }

+

+   virtual ir_loop_jump *clone(void *mem_ctx, struct hash_table *) const;

+

+   virtual void accept(ir_visitor *v)

+   {

+      v->visit(this);

+   }

+

+   virtual ir_visitor_status accept(ir_hierarchical_visitor *);

+

+   bool is_break() const

+   {

+      return mode == jump_break;

+   }

+

+   bool is_continue() const

+   {

+      return mode == jump_continue;

+   }

+

+   /** Mode selector for the jump instruction. */

+   enum jump_mode mode;

+private:

+   /** Loop containing this break instruction. */

+   ir_loop *loop;

+};

+

+/**

+ * IR instruction representing discard statements.

+ */

+class ir_discard : public ir_jump {

+public:

+   ir_discard()

+   {

+      this->ir_type = ir_type_discard;

+      this->condition = NULL;

+   }

+

+   ir_discard(ir_rvalue *cond)

+   {

+      this->ir_type = ir_type_discard;

+      this->condition = cond;

+   }

+

+   virtual ir_discard *clone(void *mem_ctx, struct hash_table *ht) const;

+

+   virtual void accept(ir_visitor *v)

+   {

+      v->visit(this);

+   }

+

+   virtual ir_visitor_status accept(ir_hierarchical_visitor *);

+

+   virtual ir_discard *as_discard()

+   {

+      return this;

+   }

+

+   ir_rvalue *condition;

+};

+/*@}*/

+

+

+/**

+ * Texture sampling opcodes used in ir_texture

+ */

+enum ir_texture_opcode {

+   ir_tex,		/**< Regular texture look-up */

+   ir_txb,		/**< Texture look-up with LOD bias */

+   ir_txl,		/**< Texture look-up with explicit LOD */

+   ir_txd,		/**< Texture look-up with partial derivatvies */

+   ir_txf		/**< Texel fetch with explicit LOD */

+};

+

+

+/**

+ * IR instruction to sample a texture

+ *

+ * The specific form of the IR instruction depends on the \c mode value

+ * selected from \c ir_texture_opcodes.  In the printed IR, these will

+ * appear as:

+ *

+ *                             Texel offset (0 or an expression)

+ *                             | Projection divisor

+ *                             | |  Shadow comparitor

+ *                             | |  |

+ *                             v v  v

+ * (tex <sampler> <coordinate> 0 1 ( ))

+ * (txb <sampler> <coordinate> 0 1 ( ) <bias>)

+ * (txl <sampler> <coordinate> 0 1 ( ) <lod>)

+ * (txd <sampler> <coordinate> 0 1 ( ) (dPdx dPdy))

+ * (txf <sampler> <coordinate> 0       <lod>)

+ */

+class ir_texture : public ir_rvalue {

+public:

+   ir_texture(enum ir_texture_opcode op)

+      : op(op), projector(NULL), shadow_comparitor(NULL), offset(NULL)

+   {

+      this->ir_type = ir_type_texture;

+   }

+

+   virtual ir_texture *clone(void *mem_ctx, struct hash_table *) const;

+

+   virtual ir_constant *constant_expression_value();

+

+   virtual void accept(ir_visitor *v)

+   {

+      v->visit(this);

+   }

+

+   virtual ir_visitor_status accept(ir_hierarchical_visitor *);

+

+   /**

+    * Return a string representing the ir_texture_opcode.

+    */

+   const char *opcode_string();

+

+   /** Set the sampler and infer the type. */

+   void set_sampler(ir_dereference *sampler);

+

+   /**

+    * Do a reverse-lookup to translate a string into an ir_texture_opcode.

+    */

+   static ir_texture_opcode get_opcode(const char *);

+

+   enum ir_texture_opcode op;

+

+   /** Sampler to use for the texture access. */

+   ir_dereference *sampler;

+

+   /** Texture coordinate to sample */

+   ir_rvalue *coordinate;

+

+   /**

+    * Value used for projective divide.

+    *

+    * If there is no projective divide (the common case), this will be

+    * \c NULL.  Optimization passes should check for this to point to a constant

+    * of 1.0 and replace that with \c NULL.

+    */

+   ir_rvalue *projector;

+

+   /**

+    * Coordinate used for comparison on shadow look-ups.

+    *

+    * If there is no shadow comparison, this will be \c NULL.  For the

+    * \c ir_txf opcode, this *must* be \c NULL.

+    */

+   ir_rvalue *shadow_comparitor;

+

+   /** Texel offset. */

+   ir_rvalue *offset;

+

+   union {

+      ir_rvalue *lod;		/**< Floating point LOD */

+      ir_rvalue *bias;		/**< Floating point LOD bias */

+      struct {

+	 ir_rvalue *dPdx;	/**< Partial derivative of coordinate wrt X */

+	 ir_rvalue *dPdy;	/**< Partial derivative of coordinate wrt Y */

+      } grad;

+   } lod_info;

+};

+

+

+struct ir_swizzle_mask {

+   unsigned x:2;

+   unsigned y:2;

+   unsigned z:2;

+   unsigned w:2;

+

+   /**

+    * Number of components in the swizzle.

+    */

+   unsigned num_components:3;

+

+   /**

+    * Does the swizzle contain duplicate components?

+    *

+    * L-value swizzles cannot contain duplicate components.

+    */

+   unsigned has_duplicates:1;

+};

+

+

+class ir_swizzle : public ir_rvalue {

+public:

+   ir_swizzle(ir_rvalue *, unsigned x, unsigned y, unsigned z, unsigned w,

+              unsigned count);

+

+   ir_swizzle(ir_rvalue *val, const unsigned *components, unsigned count);

+

+   ir_swizzle(ir_rvalue *val, ir_swizzle_mask mask);

+

+   virtual ir_swizzle *clone(void *mem_ctx, struct hash_table *) const;

+

+   virtual ir_constant *constant_expression_value();

+

+   virtual ir_swizzle *as_swizzle()

+   {

+      return this;

+   }

+

+   /**

+    * Construct an ir_swizzle from the textual representation.  Can fail.

+    */

+   static ir_swizzle *create(ir_rvalue *, const char *, unsigned vector_length);

+

+   virtual void accept(ir_visitor *v)

+   {

+      v->visit(this);

+   }

+

+   virtual ir_visitor_status accept(ir_hierarchical_visitor *);

+

+   bool is_lvalue()

+   {

+      return val->is_lvalue() && !mask.has_duplicates;

+   }

+

+   /**

+    * Get the variable that is ultimately referenced by an r-value

+    */

+   virtual ir_variable *variable_referenced();

+

+   ir_rvalue *val;

+   ir_swizzle_mask mask;

+

+private:

+   /**

+    * Initialize the mask component of a swizzle

+    *

+    * This is used by the \c ir_swizzle constructors.

+    */

+   void init_mask(const unsigned *components, unsigned count);

+};

+

+

+class ir_dereference : public ir_rvalue {

+public:

+   virtual ir_dereference *clone(void *mem_ctx, struct hash_table *) const = 0;

+

+   virtual ir_dereference *as_dereference()

+   {

+      return this;

+   }

+

+   bool is_lvalue();

+

+   /**

+    * Get the variable that is ultimately referenced by an r-value

+    */

+   virtual ir_variable *variable_referenced() = 0;

+};

+

+

+class ir_dereference_variable : public ir_dereference {

+public:

+   ir_dereference_variable(ir_variable *var);

+

+   virtual ir_dereference_variable *clone(void *mem_ctx,

+					  struct hash_table *) const;

+

+   virtual ir_constant *constant_expression_value();

+

+   virtual ir_dereference_variable *as_dereference_variable()

+   {

+      return this;

+   }

+

+   /**

+    * Get the variable that is ultimately referenced by an r-value

+    */

+   virtual ir_variable *variable_referenced()

+   {

+      return this->var;

+   }

+

+   virtual ir_variable *whole_variable_referenced()

+   {

+      /* ir_dereference_variable objects always dereference the entire

+       * variable.  However, if this dereference is dereferenced by anything

+       * else, the complete deferefernce chain is not a whole-variable

+       * dereference.  This method should only be called on the top most

+       * ir_rvalue in a dereference chain.

+       */

+      return this->var;

+   }

+

+   virtual void accept(ir_visitor *v)

+   {

+      v->visit(this);

+   }

+

+   virtual ir_visitor_status accept(ir_hierarchical_visitor *);

+

+   /**

+    * Object being dereferenced.

+    */

+   ir_variable *var;

+};

+

+

+class ir_dereference_array : public ir_dereference {

+public:

+   ir_dereference_array(ir_rvalue *value, ir_rvalue *array_index);

+

+   ir_dereference_array(ir_variable *var, ir_rvalue *array_index);

+

+   virtual ir_dereference_array *clone(void *mem_ctx,

+				       struct hash_table *) const;

+

+   virtual ir_constant *constant_expression_value();

+

+   virtual ir_dereference_array *as_dereference_array()

+   {

+      return this;

+   }

+

+   /**

+    * Get the variable that is ultimately referenced by an r-value

+    */

+   virtual ir_variable *variable_referenced()

+   {

+      return this->array->variable_referenced();

+   }

+

+   virtual void accept(ir_visitor *v)

+   {

+      v->visit(this);

+   }

+

+   virtual ir_visitor_status accept(ir_hierarchical_visitor *);

+

+   ir_rvalue *array;

+   ir_rvalue *array_index;

+

+private:

+   void set_array(ir_rvalue *value);

+};

+

+

+class ir_dereference_record : public ir_dereference {

+public:

+   ir_dereference_record(ir_rvalue *value, const char *field);

+

+   ir_dereference_record(ir_variable *var, const char *field);

+

+   virtual ir_dereference_record *clone(void *mem_ctx,

+					struct hash_table *) const;

+

+   virtual ir_constant *constant_expression_value();

+

+   /**

+    * Get the variable that is ultimately referenced by an r-value

+    */

+   virtual ir_variable *variable_referenced()

+   {

+      return this->record->variable_referenced();

+   }

+

+   virtual void accept(ir_visitor *v)

+   {

+      v->visit(this);

+   }

+

+   virtual ir_visitor_status accept(ir_hierarchical_visitor *);

+

+   ir_rvalue *record;

+   const char *field;

+};

+

+

+/**

+ * Data stored in an ir_constant

+ */

+union ir_constant_data {

+      unsigned u[16];

+      int i[16];

+      float f[16];

+      bool b[16];

+};

+

+

+class ir_constant : public ir_rvalue {

+public:

+   ir_constant(const struct glsl_type *type, const ir_constant_data *data);

+   ir_constant(bool b);

+   ir_constant(unsigned int u);

+   ir_constant(int i);

+   ir_constant(float f);

+

+   /**

+    * Construct an ir_constant from a list of ir_constant values

+    */

+   ir_constant(const struct glsl_type *type, exec_list *values);

+

+   /**

+    * Construct an ir_constant from a scalar component of another ir_constant

+    *

+    * The new \c ir_constant inherits the type of the component from the

+    * source constant.

+    *

+    * \note

+    * In the case of a matrix constant, the new constant is a scalar, \b not

+    * a vector.

+    */

+   ir_constant(const ir_constant *c, unsigned i);

+

+   /**

+    * Return a new ir_constant of the specified type containing all zeros.

+    */

+   static ir_constant *zero(void *mem_ctx, const glsl_type *type);

+

+   virtual ir_constant *clone(void *mem_ctx, struct hash_table *) const;

+

+   virtual ir_constant *constant_expression_value();

+

+   virtual ir_constant *as_constant()

+   {

+      return this;

+   }

+

+   virtual void accept(ir_visitor *v)

+   {

+      v->visit(this);

+   }

+

+   virtual ir_visitor_status accept(ir_hierarchical_visitor *);

+

+   /**

+    * Get a particular component of a constant as a specific type

+    *

+    * This is useful, for example, to get a value from an integer constant

+    * as a float or bool.  This appears frequently when constructors are

+    * called with all constant parameters.

+    */

+   /*@{*/

+   bool get_bool_component(unsigned i) const;

+   float get_float_component(unsigned i) const;

+   int get_int_component(unsigned i) const;

+   unsigned get_uint_component(unsigned i) const;

+   /*@}*/

+

+   ir_constant *get_array_element(unsigned i) const;

+

+   ir_constant *get_record_field(const char *name);

+

+   /**

+    * Determine whether a constant has the same value as another constant

+    *

+    * \sa ir_constant::is_zero, ir_constant::is_one,

+    * ir_constant::is_negative_one

+    */

+   bool has_value(const ir_constant *) const;

+

+   virtual bool is_zero() const;

+   virtual bool is_one() const;

+   virtual bool is_negative_one() const;

+

+   /**

+    * Value of the constant.

+    *

+    * The field used to back the values supplied by the constant is determined

+    * by the type associated with the \c ir_instruction.  Constants may be

+    * scalars, vectors, or matrices.

+    */

+   union ir_constant_data value;

+

+   /* Array elements */

+   ir_constant **array_elements;

+

+   /* Structure fields */

+   exec_list components;

+

+private:

+   /**

+    * Parameterless constructor only used by the clone method

+    */

+   ir_constant(void);

+};

+

+/*@}*/

+

+/**

+ * Apply a visitor to each IR node in a list

+ */

+void

+visit_exec_list(exec_list *list, ir_visitor *visitor);

+

+/**

+ * Validate invariants on each IR node in a list

+ */

+void validate_ir_tree(exec_list *instructions);

+

+/**

+ * Make a clone of each IR instruction in a list

+ *

+ * \param in   List of IR instructions that are to be cloned

+ * \param out  List to hold the cloned instructions

+ */

+void

+clone_ir_list(void *mem_ctx, exec_list *out, const exec_list *in);

+

+extern void

+_mesa_glsl_initialize_variables(exec_list *instructions,

+				struct _mesa_glsl_parse_state *state);

+

+extern void

+_mesa_glsl_initialize_functions(_mesa_glsl_parse_state *state);

+

+extern void

+_mesa_glsl_release_functions(void);

+

+extern void

+reparent_ir(exec_list *list, void *mem_ctx);

+

+struct glsl_symbol_table;

+

+extern void

+import_prototypes(const exec_list *source, exec_list *dest,

+		  struct glsl_symbol_table *symbols, void *mem_ctx);

+

+extern bool

+ir_has_call(ir_instruction *ir);

+

+extern void

+do_set_program_inouts(exec_list *instructions, struct gl_program *prog);

+

+#endif /* IR_H */

diff --git a/mesalib/src/glsl/ir_import_prototypes.cpp b/mesalib/src/glsl/ir_import_prototypes.cpp
index be5e0c1d3..03d40bb68 100644
--- a/mesalib/src/glsl/ir_import_prototypes.cpp
+++ b/mesalib/src/glsl/ir_import_prototypes.cpp
@@ -1,123 +1,122 @@
-/*
- * 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.
- */
-
-/**
- * \file ir_import_prototypes.cpp
- * Import function prototypes from one IR tree into another.
- *
- * \author Ian Romanick
- */
-#include <cstdio>
-#include "ir.h"
-#include "glsl_symbol_table.h"
-
-/**
- * Visitor used to import function prototypes
- *
- * Normally the \c clone method of either \c ir_function or
- * \c ir_function_signature could be used.  However, we don't want a complete
- * clone of the \c ir_function_signature.  We want everything \b except the
- * body of the function.
- */
-class import_prototype_visitor : public ir_hierarchical_visitor {
-public:
-   /**
-    */
-   import_prototype_visitor(exec_list *list, glsl_symbol_table *symbols,
-			    void *mem_ctx)
-   {
-      this->mem_ctx = mem_ctx;
-      this->list = list;
-      this->symbols = symbols;
-      this->function = NULL;
-   }
-
-   virtual ir_visitor_status visit_enter(ir_function *ir)
-   {
-      assert(this->function == NULL);
-
-      this->function = this->symbols->get_function(ir->name);
-      if (!this->function) {
-	 this->function = new(this->mem_ctx) ir_function(ir->name);
-
-	 list->push_tail(this->function);
-
-	 /* Add the new function to the symbol table.
-	  */
-	 this->symbols->add_function(this->function);
-      }
-      return visit_continue;
-   }
-
-   virtual ir_visitor_status visit_leave(ir_function *ir)
-   {
-      (void) ir;
-      assert(this->function != NULL);
-
-      this->function = NULL;
-      return visit_continue;
-   }
-
-   ir_visitor_status visit_enter(ir_function_signature *ir)
-   {
-      assert(this->function != NULL);
-
-      ir_function_signature *copy = ir->clone_prototype(mem_ctx, NULL);
-
-      this->function->add_signature(copy);
-
-      /* Do not process child nodes of the ir_function_signature.  There can
-       * never be any nodes inside the ir_function_signature that we care
-       * about.  Instead continue with the next sibling.
-       */
-      return visit_continue_with_parent;
-   }
-
-private:
-   exec_list *list;
-   ir_function *function;
-   glsl_symbol_table *symbols;
-   void *mem_ctx;
-};
-
-
-/**
- * Import function prototypes from one IR tree into another
- *
- * \param source   Source instruction stream containing functions whose
- *                 prototypes are to be imported
- * \param dest     Destination instruction stream where new \c ir_function and
- *                 \c ir_function_signature nodes will be stored
- * \param symbols  Symbol table where new functions will be stored
- * \param mem_ctx  ralloc memory context used for new allocations
- */
-void
-import_prototypes(const exec_list *source, exec_list *dest,
-		  glsl_symbol_table *symbols, void *mem_ctx)
-{
-   import_prototype_visitor v(dest, symbols, mem_ctx);
-
-   /* Making source be const is just extra documentation.
-    */
-   v.run(const_cast<exec_list *>(source));
-}
+/*

+ * 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.

+ */

+

+/**

+ * \file ir_import_prototypes.cpp

+ * Import function prototypes from one IR tree into another.

+ *

+ * \author Ian Romanick

+ */

+#include "ir.h"

+#include "glsl_symbol_table.h"

+

+/**

+ * Visitor used to import function prototypes

+ *

+ * Normally the \c clone method of either \c ir_function or

+ * \c ir_function_signature could be used.  However, we don't want a complete

+ * clone of the \c ir_function_signature.  We want everything \b except the

+ * body of the function.

+ */

+class import_prototype_visitor : public ir_hierarchical_visitor {

+public:

+   /**

+    */

+   import_prototype_visitor(exec_list *list, glsl_symbol_table *symbols,

+			    void *mem_ctx)

+   {

+      this->mem_ctx = mem_ctx;

+      this->list = list;

+      this->symbols = symbols;

+      this->function = NULL;

+   }

+

+   virtual ir_visitor_status visit_enter(ir_function *ir)

+   {

+      assert(this->function == NULL);

+

+      this->function = this->symbols->get_function(ir->name);

+      if (!this->function) {

+	 this->function = new(this->mem_ctx) ir_function(ir->name);

+

+	 list->push_tail(this->function);

+

+	 /* Add the new function to the symbol table.

+	  */

+	 this->symbols->add_function(this->function);

+      }

+      return visit_continue;

+   }

+

+   virtual ir_visitor_status visit_leave(ir_function *ir)

+   {

+      (void) ir;

+      assert(this->function != NULL);

+

+      this->function = NULL;

+      return visit_continue;

+   }

+

+   ir_visitor_status visit_enter(ir_function_signature *ir)

+   {

+      assert(this->function != NULL);

+

+      ir_function_signature *copy = ir->clone_prototype(mem_ctx, NULL);

+

+      this->function->add_signature(copy);

+

+      /* Do not process child nodes of the ir_function_signature.  There can

+       * never be any nodes inside the ir_function_signature that we care

+       * about.  Instead continue with the next sibling.

+       */

+      return visit_continue_with_parent;

+   }

+

+private:

+   exec_list *list;

+   ir_function *function;

+   glsl_symbol_table *symbols;

+   void *mem_ctx;

+};

+

+

+/**

+ * Import function prototypes from one IR tree into another

+ *

+ * \param source   Source instruction stream containing functions whose

+ *                 prototypes are to be imported

+ * \param dest     Destination instruction stream where new \c ir_function and

+ *                 \c ir_function_signature nodes will be stored

+ * \param symbols  Symbol table where new functions will be stored

+ * \param mem_ctx  ralloc memory context used for new allocations

+ */

+void

+import_prototypes(const exec_list *source, exec_list *dest,

+		  glsl_symbol_table *symbols, void *mem_ctx)

+{

+   import_prototype_visitor v(dest, symbols, mem_ctx);

+

+   /* Making source be const is just extra documentation.

+    */

+   v.run(const_cast<exec_list *>(source));

+}

diff --git a/mesalib/src/glsl/ir_print_visitor.cpp b/mesalib/src/glsl/ir_print_visitor.cpp
index be76945a2..f7dc29689 100644
--- a/mesalib/src/glsl/ir_print_visitor.cpp
+++ b/mesalib/src/glsl/ir_print_visitor.cpp
@@ -1,474 +1,471 @@
-/*
- * 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_print_visitor.h"
-#include "glsl_types.h"
-#include "glsl_parser_extras.h"
-
-using std::printf;
-using std::strncmp;
-
-static void print_type(const glsl_type *t);
-
-void
-ir_instruction::print(void) const
-{
-   ir_instruction *deconsted = const_cast<ir_instruction *>(this);
-
-   ir_print_visitor v;
-   deconsted->accept(&v);
-}
-
-void
-_mesa_print_ir(exec_list *instructions,
-	       struct _mesa_glsl_parse_state *state)
-{
-   if (state) {
-      for (unsigned i = 0; i < state->num_user_structures; i++) {
-	 const glsl_type *const s = state->user_structures[i];
-
-	 printf("(structure (%s) (%s@%p) (%u) (\n",
-		s->name, s->name, (void *) s, s->length);
-
-	 for (unsigned j = 0; j < s->length; j++) {
-	    printf("\t((");
-	    print_type(s->fields.structure[j].type);
-	    printf(")(%s))\n", s->fields.structure[j].name);
-	 }
-
-	 printf(")\n");
-      }
-   }
-
-   printf("(\n");
-   foreach_iter(exec_list_iterator, iter, *instructions) {
-      ir_instruction *ir = (ir_instruction *)iter.get();
-      ir->print();
-      if (ir->ir_type != ir_type_function)
-	 printf("\n");
-   }
-   printf("\n)");
-}
-
-
-void ir_print_visitor::indent(void)
-{
-   for (int i = 0; i < indentation; i++)
-      printf("  ");
-}
-
-static void
-print_type(const glsl_type *t)
-{
-   if (t->base_type == GLSL_TYPE_ARRAY) {
-      printf("(array ");
-      print_type(t->fields.array);
-      printf(" %u)", t->length);
-   } else if ((t->base_type == GLSL_TYPE_STRUCT)
-	      && (strncmp("gl_", t->name, 3) != 0)) {
-      printf("%s@%p", t->name, (void *) t);
-   } else {
-      printf("%s", t->name);
-   }
-}
-
-
-void ir_print_visitor::visit(ir_variable *ir)
-{
-   printf("(declare ");
-
-   const char *const cent = (ir->centroid) ? "centroid " : "";
-   const char *const inv = (ir->invariant) ? "invariant " : "";
-   const char *const mode[] = { "", "uniform ", "in ", "out ", "inout ",
-			        "const_in ", "sys ", "temporary " };
-   const char *const interp[] = { "", "flat", "noperspective" };
-
-   printf("(%s%s%s%s) ",
-	  cent, inv, mode[ir->mode], interp[ir->interpolation]);
-
-   print_type(ir->type);
-   printf(" %s@%p)", ir->name, (void *) ir);
-}
-
-
-void ir_print_visitor::visit(ir_function_signature *ir)
-{
-   printf("(signature ");
-   indentation++;
-
-   print_type(ir->return_type);
-   printf("\n");
-   indent();
-
-   printf("(parameters\n");
-   indentation++;
-
-   foreach_iter(exec_list_iterator, iter, ir->parameters) {
-      ir_variable *const inst = (ir_variable *) iter.get();
-
-      indent();
-      inst->accept(this);
-      printf("\n");
-   }
-   indentation--;
-
-   indent();
-   printf(")\n");
-
-   indent();
-
-   printf("(\n");
-   indentation++;
-
-   foreach_iter(exec_list_iterator, iter, ir->body) {
-      ir_instruction *const inst = (ir_instruction *) iter.get();
-
-      indent();
-      inst->accept(this);
-      printf("\n");
-   }
-   indentation--;
-   indent();
-   printf("))\n");
-   indentation--;
-}
-
-
-void ir_print_visitor::visit(ir_function *ir)
-{
-   printf("(function %s\n", ir->name);
-   indentation++;
-   foreach_iter(exec_list_iterator, iter, *ir) {
-      ir_function_signature *const sig = (ir_function_signature *) iter.get();
-      indent();
-      sig->accept(this);
-      printf("\n");
-   }
-   indentation--;
-   indent();
-   printf(")\n\n");
-}
-
-
-void ir_print_visitor::visit(ir_expression *ir)
-{
-   printf("(expression ");
-
-   print_type(ir->type);
-
-   printf(" %s ", ir->operator_string());
-
-   for (unsigned i = 0; i < ir->get_num_operands(); i++) {
-      ir->operands[i]->accept(this);
-   }
-
-   printf(") ");
-}
-
-
-void ir_print_visitor::visit(ir_texture *ir)
-{
-   printf("(%s ", ir->opcode_string());
-
-   ir->sampler->accept(this);
-   printf(" ");
-
-   ir->coordinate->accept(this);
-
-   printf(" ");
-
-   if (ir->offset != NULL) {
-      ir->offset->accept(this);
-   } else {
-      printf("0");
-   }
-
-   printf(" ");
-
-   if (ir->op != ir_txf) {
-      if (ir->projector)
-	 ir->projector->accept(this);
-      else
-	 printf("1");
-
-      if (ir->shadow_comparitor) {
-	 printf(" ");
-	 ir->shadow_comparitor->accept(this);
-      } else {
-	 printf(" ()");
-      }
-   }
-
-   printf(" ");
-   switch (ir->op)
-   {
-   case ir_tex:
-      break;
-   case ir_txb:
-      ir->lod_info.bias->accept(this);
-      break;
-   case ir_txl:
-   case ir_txf:
-      ir->lod_info.lod->accept(this);
-      break;
-   case ir_txd:
-      printf("(");
-      ir->lod_info.grad.dPdx->accept(this);
-      printf(" ");
-      ir->lod_info.grad.dPdy->accept(this);
-      printf(")");
-      break;
-   };
-   printf(")");
-}
-
-
-void ir_print_visitor::visit(ir_swizzle *ir)
-{
-   const unsigned swiz[4] = {
-      ir->mask.x,
-      ir->mask.y,
-      ir->mask.z,
-      ir->mask.w,
-   };
-
-   printf("(swiz ");
-   for (unsigned i = 0; i < ir->mask.num_components; i++) {
-      printf("%c", "xyzw"[swiz[i]]);
-   }
-   printf(" ");
-   ir->val->accept(this);
-   printf(")");
-}
-
-
-void ir_print_visitor::visit(ir_dereference_variable *ir)
-{
-   ir_variable *var = ir->variable_referenced();
-   printf("(var_ref %s@%p) ", var->name, (void *) var);
-}
-
-
-void ir_print_visitor::visit(ir_dereference_array *ir)
-{
-   printf("(array_ref ");
-   ir->array->accept(this);
-   ir->array_index->accept(this);
-   printf(") ");
-}
-
-
-void ir_print_visitor::visit(ir_dereference_record *ir)
-{
-   printf("(record_ref ");
-   ir->record->accept(this);
-   printf(" %s) ", ir->field);
-}
-
-
-void ir_print_visitor::visit(ir_assignment *ir)
-{
-   printf("(assign ");
-
-   if (ir->condition)
-      ir->condition->accept(this);
-
-   char mask[5];
-   unsigned j = 0;
-
-   for (unsigned i = 0; i < 4; i++) {
-      if ((ir->write_mask & (1 << i)) != 0) {
-	 mask[j] = "xyzw"[i];
-	 j++;
-      }
-   }
-   mask[j] = '\0';
-
-   printf(" (%s) ", mask);
-
-   ir->lhs->accept(this);
-
-   printf(" ");
-
-   ir->rhs->accept(this);
-   printf(") ");
-}
-
-
-void ir_print_visitor::visit(ir_constant *ir)
-{
-   const glsl_type *const base_type = ir->type->get_base_type();
-
-   printf("(constant ");
-   print_type(ir->type);
-   printf(" (");
-
-   if (ir->type->is_array()) {
-      for (unsigned i = 0; i < ir->type->length; i++)
-	 ir->get_array_element(i)->accept(this);
-   } else if (ir->type->is_record()) {
-      ir_constant *value = (ir_constant *) ir->components.get_head();
-      for (unsigned i = 0; i < ir->type->length; i++) {
-	 printf("(%s ", ir->type->fields.structure->name);
-	 value->accept(this);
-	 printf(")");
-
-	 value = (ir_constant *) value->next;
-      }
-   } else {
-      for (unsigned i = 0; i < ir->type->components(); i++) {
-	 if (i != 0)
-	    printf(" ");
-	 switch (base_type->base_type) {
-	 case GLSL_TYPE_UINT:  printf("%u", ir->value.u[i]); break;
-	 case GLSL_TYPE_INT:   printf("%d", ir->value.i[i]); break;
-	 case GLSL_TYPE_FLOAT: printf("%f", ir->value.f[i]); break;
-	 case GLSL_TYPE_BOOL:  printf("%d", ir->value.b[i]); break;
-	 default: assert(0);
-	 }
-      }
-   }
-   printf(")) ");
-}
-
-
-void
-ir_print_visitor::visit(ir_call *ir)
-{
-   printf("(call %s (", ir->callee_name());
-   foreach_iter(exec_list_iterator, iter, *ir) {
-      ir_instruction *const inst = (ir_instruction *) iter.get();
-
-      inst->accept(this);
-   }
-   printf("))\n");
-}
-
-
-void
-ir_print_visitor::visit(ir_return *ir)
-{
-   printf("(return");
-
-   ir_rvalue *const value = ir->get_value();
-   if (value) {
-      printf(" ");
-      value->accept(this);
-   }
-
-   printf(")");
-}
-
-
-void
-ir_print_visitor::visit(ir_discard *ir)
-{
-   printf("(discard ");
-
-   if (ir->condition != NULL) {
-      printf(" ");
-      ir->condition->accept(this);
-   }
-
-   printf(")");
-}
-
-
-void
-ir_print_visitor::visit(ir_if *ir)
-{
-   printf("(if ");
-   ir->condition->accept(this);
-
-   printf("(\n");
-   indentation++;
-
-   foreach_iter(exec_list_iterator, iter, ir->then_instructions) {
-      ir_instruction *const inst = (ir_instruction *) iter.get();
-
-      indent();
-      inst->accept(this);
-      printf("\n");
-   }
-
-   indentation--;
-   indent();
-   printf(")\n");
-
-   indent();
-   if (!ir->else_instructions.is_empty()) {
-      printf("(\n");
-      indentation++;
-
-      foreach_iter(exec_list_iterator, iter, ir->else_instructions) {
-	 ir_instruction *const inst = (ir_instruction *) iter.get();
-
-	 indent();
-	 inst->accept(this);
-	 printf("\n");
-      }
-      indentation--;
-      indent();
-      printf("))\n");
-   } else {
-      printf("())\n");
-   }
-}
-
-
-void
-ir_print_visitor::visit(ir_loop *ir)
-{
-   printf("(loop (");
-   if (ir->counter != NULL)
-      ir->counter->accept(this);
-   printf(") (");
-   if (ir->from != NULL)
-      ir->from->accept(this);
-   printf(") (");
-   if (ir->to != NULL)
-      ir->to->accept(this);
-   printf(") (");
-   if (ir->increment != NULL)
-      ir->increment->accept(this);
-   printf(") (\n");
-   indentation++;
-
-   foreach_iter(exec_list_iterator, iter, ir->body_instructions) {
-      ir_instruction *const inst = (ir_instruction *) iter.get();
-
-      indent();
-      inst->accept(this);
-      printf("\n");
-   }
-   indentation--;
-   indent();
-   printf("))\n");
-}
-
-
-void
-ir_print_visitor::visit(ir_loop_jump *ir)
-{
-   printf("%s", ir->is_break() ? "break" : "continue");
-}
+/*

+ * 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_print_visitor.h"

+#include "glsl_types.h"

+#include "glsl_parser_extras.h"

+

+static void print_type(const glsl_type *t);

+

+void

+ir_instruction::print(void) const

+{

+   ir_instruction *deconsted = const_cast<ir_instruction *>(this);

+

+   ir_print_visitor v;

+   deconsted->accept(&v);

+}

+

+void

+_mesa_print_ir(exec_list *instructions,

+	       struct _mesa_glsl_parse_state *state)

+{

+   if (state) {

+      for (unsigned i = 0; i < state->num_user_structures; i++) {

+	 const glsl_type *const s = state->user_structures[i];

+

+	 printf("(structure (%s) (%s@%p) (%u) (\n",

+		s->name, s->name, (void *) s, s->length);

+

+	 for (unsigned j = 0; j < s->length; j++) {

+	    printf("\t((");

+	    print_type(s->fields.structure[j].type);

+	    printf(")(%s))\n", s->fields.structure[j].name);

+	 }

+

+	 printf(")\n");

+      }

+   }

+

+   printf("(\n");

+   foreach_iter(exec_list_iterator, iter, *instructions) {

+      ir_instruction *ir = (ir_instruction *)iter.get();

+      ir->print();

+      if (ir->ir_type != ir_type_function)

+	 printf("\n");

+   }

+   printf("\n)");

+}

+

+

+void ir_print_visitor::indent(void)

+{

+   for (int i = 0; i < indentation; i++)

+      printf("  ");

+}

+

+static void

+print_type(const glsl_type *t)

+{

+   if (t->base_type == GLSL_TYPE_ARRAY) {

+      printf("(array ");

+      print_type(t->fields.array);

+      printf(" %u)", t->length);

+   } else if ((t->base_type == GLSL_TYPE_STRUCT)

+	      && (strncmp("gl_", t->name, 3) != 0)) {

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

+   } else {

+      printf("%s", t->name);

+   }

+}

+

+

+void ir_print_visitor::visit(ir_variable *ir)

+{

+   printf("(declare ");

+

+   const char *const cent = (ir->centroid) ? "centroid " : "";

+   const char *const inv = (ir->invariant) ? "invariant " : "";

+   const char *const mode[] = { "", "uniform ", "in ", "out ", "inout ",

+			        "const_in ", "sys ", "temporary " };

+   const char *const interp[] = { "", "flat", "noperspective" };

+

+   printf("(%s%s%s%s) ",

+	  cent, inv, mode[ir->mode], interp[ir->interpolation]);

+

+   print_type(ir->type);

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

+}

+

+

+void ir_print_visitor::visit(ir_function_signature *ir)

+{

+   printf("(signature ");

+   indentation++;

+

+   print_type(ir->return_type);

+   printf("\n");

+   indent();

+

+   printf("(parameters\n");

+   indentation++;

+

+   foreach_iter(exec_list_iterator, iter, ir->parameters) {

+      ir_variable *const inst = (ir_variable *) iter.get();

+

+      indent();

+      inst->accept(this);

+      printf("\n");

+   }

+   indentation--;

+

+   indent();

+   printf(")\n");

+

+   indent();

+

+   printf("(\n");

+   indentation++;

+

+   foreach_iter(exec_list_iterator, iter, ir->body) {

+      ir_instruction *const inst = (ir_instruction *) iter.get();

+

+      indent();

+      inst->accept(this);

+      printf("\n");

+   }

+   indentation--;

+   indent();

+   printf("))\n");

+   indentation--;

+}

+

+

+void ir_print_visitor::visit(ir_function *ir)

+{

+   printf("(function %s\n", ir->name);

+   indentation++;

+   foreach_iter(exec_list_iterator, iter, *ir) {

+      ir_function_signature *const sig = (ir_function_signature *) iter.get();

+      indent();

+      sig->accept(this);

+      printf("\n");

+   }

+   indentation--;

+   indent();

+   printf(")\n\n");

+}

+

+

+void ir_print_visitor::visit(ir_expression *ir)

+{

+   printf("(expression ");

+

+   print_type(ir->type);

+

+   printf(" %s ", ir->operator_string());

+

+   for (unsigned i = 0; i < ir->get_num_operands(); i++) {

+      ir->operands[i]->accept(this);

+   }

+

+   printf(") ");

+}

+

+

+void ir_print_visitor::visit(ir_texture *ir)

+{

+   printf("(%s ", ir->opcode_string());

+

+   ir->sampler->accept(this);

+   printf(" ");

+

+   ir->coordinate->accept(this);

+

+   printf(" ");

+

+   if (ir->offset != NULL) {

+      ir->offset->accept(this);

+   } else {

+      printf("0");

+   }

+

+   printf(" ");

+

+   if (ir->op != ir_txf) {

+      if (ir->projector)

+	 ir->projector->accept(this);

+      else

+	 printf("1");

+

+      if (ir->shadow_comparitor) {

+	 printf(" ");

+	 ir->shadow_comparitor->accept(this);

+      } else {

+	 printf(" ()");

+      }

+   }

+

+   printf(" ");

+   switch (ir->op)

+   {

+   case ir_tex:

+      break;

+   case ir_txb:

+      ir->lod_info.bias->accept(this);

+      break;

+   case ir_txl:

+   case ir_txf:

+      ir->lod_info.lod->accept(this);

+      break;

+   case ir_txd:

+      printf("(");

+      ir->lod_info.grad.dPdx->accept(this);

+      printf(" ");

+      ir->lod_info.grad.dPdy->accept(this);

+      printf(")");

+      break;

+   };

+   printf(")");

+}

+

+

+void ir_print_visitor::visit(ir_swizzle *ir)

+{

+   const unsigned swiz[4] = {

+      ir->mask.x,

+      ir->mask.y,

+      ir->mask.z,

+      ir->mask.w,

+   };

+

+   printf("(swiz ");

+   for (unsigned i = 0; i < ir->mask.num_components; i++) {

+      printf("%c", "xyzw"[swiz[i]]);

+   }

+   printf(" ");

+   ir->val->accept(this);

+   printf(")");

+}

+

+

+void ir_print_visitor::visit(ir_dereference_variable *ir)

+{

+   ir_variable *var = ir->variable_referenced();

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

+}

+

+

+void ir_print_visitor::visit(ir_dereference_array *ir)

+{

+   printf("(array_ref ");

+   ir->array->accept(this);

+   ir->array_index->accept(this);

+   printf(") ");

+}

+

+

+void ir_print_visitor::visit(ir_dereference_record *ir)

+{

+   printf("(record_ref ");

+   ir->record->accept(this);

+   printf(" %s) ", ir->field);

+}

+

+

+void ir_print_visitor::visit(ir_assignment *ir)

+{

+   printf("(assign ");

+

+   if (ir->condition)

+      ir->condition->accept(this);

+

+   char mask[5];

+   unsigned j = 0;

+

+   for (unsigned i = 0; i < 4; i++) {

+      if ((ir->write_mask & (1 << i)) != 0) {

+	 mask[j] = "xyzw"[i];

+	 j++;

+      }

+   }

+   mask[j] = '\0';

+

+   printf(" (%s) ", mask);

+

+   ir->lhs->accept(this);

+

+   printf(" ");

+

+   ir->rhs->accept(this);

+   printf(") ");

+}

+

+

+void ir_print_visitor::visit(ir_constant *ir)

+{

+   const glsl_type *const base_type = ir->type->get_base_type();

+

+   printf("(constant ");

+   print_type(ir->type);

+   printf(" (");

+

+   if (ir->type->is_array()) {

+      for (unsigned i = 0; i < ir->type->length; i++)

+	 ir->get_array_element(i)->accept(this);

+   } else if (ir->type->is_record()) {

+      ir_constant *value = (ir_constant *) ir->components.get_head();

+      for (unsigned i = 0; i < ir->type->length; i++) {

+	 printf("(%s ", ir->type->fields.structure->name);

+	 value->accept(this);

+	 printf(")");

+

+	 value = (ir_constant *) value->next;

+      }

+   } else {

+      for (unsigned i = 0; i < ir->type->components(); i++) {

+	 if (i != 0)

+	    printf(" ");

+	 switch (base_type->base_type) {

+	 case GLSL_TYPE_UINT:  printf("%u", ir->value.u[i]); break;

+	 case GLSL_TYPE_INT:   printf("%d", ir->value.i[i]); break;

+	 case GLSL_TYPE_FLOAT: printf("%f", ir->value.f[i]); break;

+	 case GLSL_TYPE_BOOL:  printf("%d", ir->value.b[i]); break;

+	 default: assert(0);

+	 }

+      }

+   }

+   printf(")) ");

+}

+

+

+void

+ir_print_visitor::visit(ir_call *ir)

+{

+   printf("(call %s (", ir->callee_name());

+   foreach_iter(exec_list_iterator, iter, *ir) {

+      ir_instruction *const inst = (ir_instruction *) iter.get();

+

+      inst->accept(this);

+   }

+   printf("))\n");

+}

+

+

+void

+ir_print_visitor::visit(ir_return *ir)

+{

+   printf("(return");

+

+   ir_rvalue *const value = ir->get_value();

+   if (value) {

+      printf(" ");

+      value->accept(this);

+   }

+

+   printf(")");

+}

+

+

+void

+ir_print_visitor::visit(ir_discard *ir)

+{

+   printf("(discard ");

+

+   if (ir->condition != NULL) {

+      printf(" ");

+      ir->condition->accept(this);

+   }

+

+   printf(")");

+}

+

+

+void

+ir_print_visitor::visit(ir_if *ir)

+{

+   printf("(if ");

+   ir->condition->accept(this);

+

+   printf("(\n");

+   indentation++;

+

+   foreach_iter(exec_list_iterator, iter, ir->then_instructions) {

+      ir_instruction *const inst = (ir_instruction *) iter.get();

+

+      indent();

+      inst->accept(this);

+      printf("\n");

+   }

+

+   indentation--;

+   indent();

+   printf(")\n");

+

+   indent();

+   if (!ir->else_instructions.is_empty()) {

+      printf("(\n");

+      indentation++;

+

+      foreach_iter(exec_list_iterator, iter, ir->else_instructions) {

+	 ir_instruction *const inst = (ir_instruction *) iter.get();

+

+	 indent();

+	 inst->accept(this);

+	 printf("\n");

+      }

+      indentation--;

+      indent();

+      printf("))\n");

+   } else {

+      printf("())\n");

+   }

+}

+

+

+void

+ir_print_visitor::visit(ir_loop *ir)

+{

+   printf("(loop (");

+   if (ir->counter != NULL)

+      ir->counter->accept(this);

+   printf(") (");

+   if (ir->from != NULL)

+      ir->from->accept(this);

+   printf(") (");

+   if (ir->to != NULL)

+      ir->to->accept(this);

+   printf(") (");

+   if (ir->increment != NULL)

+      ir->increment->accept(this);

+   printf(") (\n");

+   indentation++;

+

+   foreach_iter(exec_list_iterator, iter, ir->body_instructions) {

+      ir_instruction *const inst = (ir_instruction *) iter.get();

+

+      indent();

+      inst->accept(this);

+      printf("\n");

+   }

+   indentation--;

+   indent();

+   printf("))\n");

+}

+

+

+void

+ir_print_visitor::visit(ir_loop_jump *ir)

+{

+   printf("%s", ir->is_break() ? "break" : "continue");

+}

diff --git a/mesalib/src/glsl/ir_validate.cpp b/mesalib/src/glsl/ir_validate.cpp
index b0dd6c21f..4d9d4562c 100644
--- a/mesalib/src/glsl/ir_validate.cpp
+++ b/mesalib/src/glsl/ir_validate.cpp
@@ -1,532 +1,529 @@
-/*
- * 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.
- */
-
-/**
- * \file ir_validate.cpp
- *
- * Attempts to verify that various invariants of the IR tree are true.
- *
- * In particular, at the moment it makes sure that no single
- * ir_instruction node except for ir_variable appears multiple times
- * in the ir tree.  ir_variable does appear multiple times: Once as a
- * declaration in an exec_list, and multiple times as the endpoint of
- * a dereference chain.
- */
-
-#include <inttypes.h>
-#include "ir.h"
-#include "ir_hierarchical_visitor.h"
-#include "program/hash_table.h"
-#include "glsl_types.h"
-
-using std::abort;
-using std::printf;
-
-class ir_validate : public ir_hierarchical_visitor {
-public:
-   ir_validate()
-   {
-      this->ht = hash_table_ctor(0, hash_table_pointer_hash,
-				 hash_table_pointer_compare);
-
-      this->current_function = NULL;
-
-      this->callback = ir_validate::validate_ir;
-      this->data = ht;
-   }
-
-   ~ir_validate()
-   {
-      hash_table_dtor(this->ht);
-   }
-
-   virtual ir_visitor_status visit(ir_variable *v);
-   virtual ir_visitor_status visit(ir_dereference_variable *ir);
-   virtual ir_visitor_status visit(ir_if *ir);
-
-   virtual ir_visitor_status visit_leave(ir_loop *ir);
-   virtual ir_visitor_status visit_enter(ir_function *ir);
-   virtual ir_visitor_status visit_leave(ir_function *ir);
-   virtual ir_visitor_status visit_enter(ir_function_signature *ir);
-
-   virtual ir_visitor_status visit_leave(ir_expression *ir);
-   virtual ir_visitor_status visit_leave(ir_swizzle *ir);
-
-   virtual ir_visitor_status visit_enter(ir_assignment *ir);
-
-   static void validate_ir(ir_instruction *ir, void *data);
-
-   ir_function *current_function;
-
-   struct hash_table *ht;
-};
-
-
-ir_visitor_status
-ir_validate::visit(ir_dereference_variable *ir)
-{
-   if ((ir->var == NULL) || (ir->var->as_variable() == NULL)) {
-      printf("ir_dereference_variable @ %p does not specify a variable %p\n",
-	     (void *) ir, (void *) ir->var);
-      abort();
-   }
-
-   if (hash_table_find(ht, ir->var) == NULL) {
-      printf("ir_dereference_variable @ %p specifies undeclared variable "
-	     "`%s' @ %p\n",
-	     (void *) ir, ir->var->name, (void *) ir->var);
-      abort();
-   }
-
-   this->validate_ir(ir, this->data);
-
-   return visit_continue;
-}
-
-ir_visitor_status
-ir_validate::visit(ir_if *ir)
-{
-   if (ir->condition->type != glsl_type::bool_type) {
-      printf("ir_if condition %s type instead of bool.\n",
-	     ir->condition->type->name);
-      ir->print();
-      printf("\n");
-      abort();
-   }
-
-   return visit_continue;
-}
-
-
-ir_visitor_status
-ir_validate::visit_leave(ir_loop *ir)
-{
-   if (ir->counter != NULL) {
-      if ((ir->from == NULL) || (ir->from == NULL) || (ir->increment == NULL)) {
-	 printf("ir_loop has invalid loop controls:\n"
-		"    counter:   %p\n"
-		"    from:      %p\n"
-		"    to:        %p\n"
-		"    increment: %p\n",
-		(void *) ir->counter, (void *) ir->from, (void *) ir->to,
-                (void *) ir->increment);
-	 abort();
-      }
-
-      if ((ir->cmp < ir_binop_less) || (ir->cmp > ir_binop_nequal)) {
-	 printf("ir_loop has invalid comparitor %d\n", ir->cmp);
-	 abort();
-      }
-   } else {
-      if ((ir->from != NULL) || (ir->from != NULL) || (ir->increment != NULL)) {
-	 printf("ir_loop has invalid loop controls:\n"
-		"    counter:   %p\n"
-		"    from:      %p\n"
-		"    to:        %p\n"
-		"    increment: %p\n",
-		(void *) ir->counter, (void *) ir->from, (void *) ir->to,
-                (void *) ir->increment);
-	 abort();
-      }
-   }
-
-   return visit_continue;
-}
-
-
-ir_visitor_status
-ir_validate::visit_enter(ir_function *ir)
-{
-   /* Function definitions cannot be nested.
-    */
-   if (this->current_function != NULL) {
-      printf("Function definition nested inside another function "
-	     "definition:\n");
-      printf("%s %p inside %s %p\n",
-	     ir->name, (void *) ir,
-	     this->current_function->name, (void *) this->current_function);
-      abort();
-   }
-
-   /* Store the current function hierarchy being traversed.  This is used
-    * by the function signature visitor to ensure that the signatures are
-    * linked with the correct functions.
-    */
-   this->current_function = ir;
-
-   this->validate_ir(ir, this->data);
-
-   return visit_continue;
-}
-
-ir_visitor_status
-ir_validate::visit_leave(ir_function *ir)
-{
-   assert(ralloc_parent(ir->name) == ir);
-
-   this->current_function = NULL;
-   return visit_continue;
-}
-
-ir_visitor_status
-ir_validate::visit_enter(ir_function_signature *ir)
-{
-   if (this->current_function != ir->function()) {
-      printf("Function signature nested inside wrong function "
-	     "definition:\n");
-      printf("%p inside %s %p instead of %s %p\n",
-	     (void *) ir,
-	     this->current_function->name, (void *) this->current_function,
-	     ir->function_name(), (void *) ir->function());
-      abort();
-   }
-
-   this->validate_ir(ir, this->data);
-
-   return visit_continue;
-}
-
-ir_visitor_status
-ir_validate::visit_leave(ir_expression *ir)
-{
-   switch (ir->operation) {
-   case ir_unop_bit_not:
-      assert(ir->operands[0]->type == ir->type);
-      break;
-   case ir_unop_logic_not:
-      assert(ir->type->base_type == GLSL_TYPE_BOOL);
-      assert(ir->operands[0]->type->base_type == GLSL_TYPE_BOOL);
-      break;
-
-   case ir_unop_neg:
-   case ir_unop_abs:
-   case ir_unop_sign:
-   case ir_unop_rcp:
-   case ir_unop_rsq:
-   case ir_unop_sqrt:
-      assert(ir->type == ir->operands[0]->type);
-      break;
-
-   case ir_unop_exp:
-   case ir_unop_log:
-   case ir_unop_exp2:
-   case ir_unop_log2:
-      assert(ir->operands[0]->type->base_type == GLSL_TYPE_FLOAT);
-      assert(ir->type == ir->operands[0]->type);
-      break;
-
-   case ir_unop_f2i:
-      assert(ir->operands[0]->type->base_type == GLSL_TYPE_FLOAT);
-      assert(ir->type->base_type == GLSL_TYPE_INT);
-      break;
-   case ir_unop_i2f:
-      assert(ir->operands[0]->type->base_type == GLSL_TYPE_INT);
-      assert(ir->type->base_type == GLSL_TYPE_FLOAT);
-      break;
-   case ir_unop_f2b:
-      assert(ir->operands[0]->type->base_type == GLSL_TYPE_FLOAT);
-      assert(ir->type->base_type == GLSL_TYPE_BOOL);
-      break;
-   case ir_unop_b2f:
-      assert(ir->operands[0]->type->base_type == GLSL_TYPE_BOOL);
-      assert(ir->type->base_type == GLSL_TYPE_FLOAT);
-      break;
-   case ir_unop_i2b:
-      assert(ir->operands[0]->type->base_type == GLSL_TYPE_INT);
-      assert(ir->type->base_type == GLSL_TYPE_BOOL);
-      break;
-   case ir_unop_b2i:
-      assert(ir->operands[0]->type->base_type == GLSL_TYPE_BOOL);
-      assert(ir->type->base_type == GLSL_TYPE_INT);
-      break;
-   case ir_unop_u2f:
-      assert(ir->operands[0]->type->base_type == GLSL_TYPE_UINT);
-      assert(ir->type->base_type == GLSL_TYPE_FLOAT);
-      break;
-
-   case ir_unop_any:
-      assert(ir->operands[0]->type->base_type == GLSL_TYPE_BOOL);
-      assert(ir->type == glsl_type::bool_type);
-      break;
-
-   case ir_unop_trunc:
-   case ir_unop_round_even:
-   case ir_unop_ceil:
-   case ir_unop_floor:
-   case ir_unop_fract:
-   case ir_unop_sin:
-   case ir_unop_cos:
-   case ir_unop_sin_reduced:
-   case ir_unop_cos_reduced:
-   case ir_unop_dFdx:
-   case ir_unop_dFdy:
-      assert(ir->operands[0]->type->base_type == GLSL_TYPE_FLOAT);
-      assert(ir->operands[0]->type == ir->type);
-      break;
-
-   case ir_unop_noise:
-      /* XXX what can we assert here? */
-      break;
-
-   case ir_binop_add:
-   case ir_binop_sub:
-   case ir_binop_mul:
-   case ir_binop_div:
-   case ir_binop_mod:
-   case ir_binop_min:
-   case ir_binop_max:
-   case ir_binop_pow:
-      if (ir->operands[0]->type->is_scalar())
-	 assert(ir->operands[1]->type == ir->type);
-      else if (ir->operands[1]->type->is_scalar())
-	 assert(ir->operands[0]->type == ir->type);
-      else if (ir->operands[0]->type->is_vector() &&
-	       ir->operands[1]->type->is_vector()) {
-	 assert(ir->operands[0]->type == ir->operands[1]->type);
-	 assert(ir->operands[0]->type == ir->type);
-      }
-      break;
-
-   case ir_binop_less:
-   case ir_binop_greater:
-   case ir_binop_lequal:
-   case ir_binop_gequal:
-   case ir_binop_equal:
-   case ir_binop_nequal:
-      /* The semantics of the IR operators differ from the GLSL <, >, <=, >=,
-       * ==, and != operators.  The IR operators perform a component-wise
-       * comparison on scalar or vector types and return a boolean scalar or
-       * vector type of the same size.
-       */
-      assert(ir->type->base_type == GLSL_TYPE_BOOL);
-      assert(ir->operands[0]->type == ir->operands[1]->type);
-      assert(ir->operands[0]->type->is_vector()
-	     || ir->operands[0]->type->is_scalar());
-      assert(ir->operands[0]->type->vector_elements
-	     == ir->type->vector_elements);
-      break;
-
-   case ir_binop_all_equal:
-   case ir_binop_any_nequal:
-      /* GLSL == and != operate on scalars, vectors, matrices and arrays, and
-       * return a scalar boolean.  The IR matches that.
-       */
-      assert(ir->type == glsl_type::bool_type);
-      assert(ir->operands[0]->type == ir->operands[1]->type);
-      break;
-
-   case ir_binop_lshift:
-   case ir_binop_rshift:
-      assert(ir->operands[0]->type->is_integer() &&
-             ir->operands[1]->type->is_integer());
-      if (ir->operands[0]->type->is_scalar()) {
-          assert(ir->operands[1]->type->is_scalar());
-      }
-      if (ir->operands[0]->type->is_vector() &&
-          ir->operands[1]->type->is_vector()) {
-          assert(ir->operands[0]->type->components() ==
-                 ir->operands[1]->type->components());
-      }
-      assert(ir->type == ir->operands[0]->type);
-      break;
-
-   case ir_binop_bit_and:
-   case ir_binop_bit_xor:
-   case ir_binop_bit_or:
-       assert(ir->operands[0]->type->base_type ==
-              ir->operands[1]->type->base_type);
-       assert(ir->type->is_integer());
-       if (ir->operands[0]->type->is_vector() &&
-           ir->operands[1]->type->is_vector()) {
-           assert(ir->operands[0]->type->vector_elements ==
-                  ir->operands[1]->type->vector_elements);
-       }
-       break;
-
-   case ir_binop_logic_and:
-   case ir_binop_logic_xor:
-   case ir_binop_logic_or:
-      assert(ir->type == glsl_type::bool_type);
-      assert(ir->operands[0]->type == glsl_type::bool_type);
-      assert(ir->operands[1]->type == glsl_type::bool_type);
-      break;
-
-   case ir_binop_dot:
-      assert(ir->type == glsl_type::float_type);
-      assert(ir->operands[0]->type->base_type == GLSL_TYPE_FLOAT);
-      assert(ir->operands[0]->type->is_vector());
-      assert(ir->operands[0]->type == ir->operands[1]->type);
-      break;
-
-   case ir_quadop_vector:
-      /* The vector operator collects some number of scalars and generates a
-       * vector from them.
-       *
-       *  - All of the operands must be scalar.
-       *  - Number of operands must matche the size of the resulting vector.
-       *  - Base type of the operands must match the base type of the result.
-       */
-      assert(ir->type->is_vector());
-      switch (ir->type->vector_elements) {
-      case 2:
-	 assert(ir->operands[0]->type->is_scalar());
-	 assert(ir->operands[0]->type->base_type == ir->type->base_type);
-	 assert(ir->operands[1]->type->is_scalar());
-	 assert(ir->operands[1]->type->base_type == ir->type->base_type);
-	 assert(ir->operands[2] == NULL);
-	 assert(ir->operands[3] == NULL);
-	 break;
-      case 3:
-	 assert(ir->operands[0]->type->is_scalar());
-	 assert(ir->operands[0]->type->base_type == ir->type->base_type);
-	 assert(ir->operands[1]->type->is_scalar());
-	 assert(ir->operands[1]->type->base_type == ir->type->base_type);
-	 assert(ir->operands[2]->type->is_scalar());
-	 assert(ir->operands[2]->type->base_type == ir->type->base_type);
-	 assert(ir->operands[3] == NULL);
-	 break;
-      case 4:
-	 assert(ir->operands[0]->type->is_scalar());
-	 assert(ir->operands[0]->type->base_type == ir->type->base_type);
-	 assert(ir->operands[1]->type->is_scalar());
-	 assert(ir->operands[1]->type->base_type == ir->type->base_type);
-	 assert(ir->operands[2]->type->is_scalar());
-	 assert(ir->operands[2]->type->base_type == ir->type->base_type);
-	 assert(ir->operands[3]->type->is_scalar());
-	 assert(ir->operands[3]->type->base_type == ir->type->base_type);
-	 break;
-      default:
-	 /* The is_vector assertion above should prevent execution from ever
-	  * getting here.
-	  */
-	 assert(!"Should not get here.");
-	 break;
-      }
-   }
-
-   return visit_continue;
-}
-
-ir_visitor_status
-ir_validate::visit_leave(ir_swizzle *ir)
-{
-   int chans[4] = {ir->mask.x, ir->mask.y, ir->mask.z, ir->mask.w};
-
-   for (unsigned int i = 0; i < ir->type->vector_elements; i++) {
-      if (chans[i] >= ir->val->type->vector_elements) {
-	 printf("ir_swizzle @ %p specifies a channel not present "
-		"in the value.\n", (void *) ir);
-	 ir->print();
-	 abort();
-      }
-   }
-
-   return visit_continue;
-}
-
-ir_visitor_status
-ir_validate::visit(ir_variable *ir)
-{
-   /* An ir_variable is the one thing that can (and will) appear multiple times
-    * in an IR tree.  It is added to the hashtable so that it can be used
-    * in the ir_dereference_variable handler to ensure that a variable is
-    * declared before it is dereferenced.
-    */
-   if (ir->name)
-      assert(ralloc_parent(ir->name) == ir);
-
-   hash_table_insert(ht, ir, ir);
-   return visit_continue;
-}
-
-ir_visitor_status
-ir_validate::visit_enter(ir_assignment *ir)
-{
-   const ir_dereference *const lhs = ir->lhs;
-   if (lhs->type->is_scalar() || lhs->type->is_vector()) {
-      if (ir->write_mask == 0) {
-	 printf("Assignment LHS is %s, but write mask is 0:\n",
-		lhs->type->is_scalar() ? "scalar" : "vector");
-	 ir->print();
-	 abort();
-      }
-
-      int lhs_components = 0;
-      for (int i = 0; i < 4; i++) {
-	 if (ir->write_mask & (1 << i))
-	    lhs_components++;
-      }
-
-      if (lhs_components != ir->rhs->type->vector_elements) {
-	 printf("Assignment count of LHS write mask channels enabled not\n"
-		"matching RHS vector size (%d LHS, %d RHS).\n",
-		lhs_components, ir->rhs->type->vector_elements);
-	 ir->print();
-	 abort();
-      }
-   }
-
-   this->validate_ir(ir, this->data);
-
-   return visit_continue;
-}
-
-void
-ir_validate::validate_ir(ir_instruction *ir, void *data)
-{
-   struct hash_table *ht = (struct hash_table *) data;
-
-   if (hash_table_find(ht, ir)) {
-      printf("Instruction node present twice in ir tree:\n");
-      ir->print();
-      printf("\n");
-      abort();
-   }
-   hash_table_insert(ht, ir, ir);
-}
-
-void
-check_node_type(ir_instruction *ir, void *data)
-{
-   (void) data;
-
-   if (ir->ir_type <= ir_type_unset || ir->ir_type >= ir_type_max) {
-      printf("Instruction node with unset type\n");
-      ir->print(); printf("\n");
-   }
-   assert(ir->type != glsl_type::error_type);
-}
-
-void
-validate_ir_tree(exec_list *instructions)
-{
-   ir_validate v;
-
-   v.run(instructions);
-
-   foreach_iter(exec_list_iterator, iter, *instructions) {
-      ir_instruction *ir = (ir_instruction *)iter.get();
-
-      visit_tree(ir, check_node_type, NULL);
-   }
-}
+/*

+ * 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.

+ */

+

+/**

+ * \file ir_validate.cpp

+ *

+ * Attempts to verify that various invariants of the IR tree are true.

+ *

+ * In particular, at the moment it makes sure that no single

+ * ir_instruction node except for ir_variable appears multiple times

+ * in the ir tree.  ir_variable does appear multiple times: Once as a

+ * declaration in an exec_list, and multiple times as the endpoint of

+ * a dereference chain.

+ */

+

+#include <inttypes.h>

+#include "ir.h"

+#include "ir_hierarchical_visitor.h"

+#include "program/hash_table.h"

+#include "glsl_types.h"

+

+class ir_validate : public ir_hierarchical_visitor {

+public:

+   ir_validate()

+   {

+      this->ht = hash_table_ctor(0, hash_table_pointer_hash,

+				 hash_table_pointer_compare);

+

+      this->current_function = NULL;

+

+      this->callback = ir_validate::validate_ir;

+      this->data = ht;

+   }

+

+   ~ir_validate()

+   {

+      hash_table_dtor(this->ht);

+   }

+

+   virtual ir_visitor_status visit(ir_variable *v);

+   virtual ir_visitor_status visit(ir_dereference_variable *ir);

+   virtual ir_visitor_status visit(ir_if *ir);

+

+   virtual ir_visitor_status visit_leave(ir_loop *ir);

+   virtual ir_visitor_status visit_enter(ir_function *ir);

+   virtual ir_visitor_status visit_leave(ir_function *ir);

+   virtual ir_visitor_status visit_enter(ir_function_signature *ir);

+

+   virtual ir_visitor_status visit_leave(ir_expression *ir);

+   virtual ir_visitor_status visit_leave(ir_swizzle *ir);

+

+   virtual ir_visitor_status visit_enter(ir_assignment *ir);

+

+   static void validate_ir(ir_instruction *ir, void *data);

+

+   ir_function *current_function;

+

+   struct hash_table *ht;

+};

+

+

+ir_visitor_status

+ir_validate::visit(ir_dereference_variable *ir)

+{

+   if ((ir->var == NULL) || (ir->var->as_variable() == NULL)) {

+      printf("ir_dereference_variable @ %p does not specify a variable %p\n",

+	     (void *) ir, (void *) ir->var);

+      abort();

+   }

+

+   if (hash_table_find(ht, ir->var) == NULL) {

+      printf("ir_dereference_variable @ %p specifies undeclared variable "

+	     "`%s' @ %p\n",

+	     (void *) ir, ir->var->name, (void *) ir->var);

+      abort();

+   }

+

+   this->validate_ir(ir, this->data);

+

+   return visit_continue;

+}

+

+ir_visitor_status

+ir_validate::visit(ir_if *ir)

+{

+   if (ir->condition->type != glsl_type::bool_type) {

+      printf("ir_if condition %s type instead of bool.\n",

+	     ir->condition->type->name);

+      ir->print();

+      printf("\n");

+      abort();

+   }

+

+   return visit_continue;

+}

+

+

+ir_visitor_status

+ir_validate::visit_leave(ir_loop *ir)

+{

+   if (ir->counter != NULL) {

+      if ((ir->from == NULL) || (ir->from == NULL) || (ir->increment == NULL)) {

+	 printf("ir_loop has invalid loop controls:\n"

+		"    counter:   %p\n"

+		"    from:      %p\n"

+		"    to:        %p\n"

+		"    increment: %p\n",

+		(void *) ir->counter, (void *) ir->from, (void *) ir->to,

+                (void *) ir->increment);

+	 abort();

+      }

+

+      if ((ir->cmp < ir_binop_less) || (ir->cmp > ir_binop_nequal)) {

+	 printf("ir_loop has invalid comparitor %d\n", ir->cmp);

+	 abort();

+      }

+   } else {

+      if ((ir->from != NULL) || (ir->from != NULL) || (ir->increment != NULL)) {

+	 printf("ir_loop has invalid loop controls:\n"

+		"    counter:   %p\n"

+		"    from:      %p\n"

+		"    to:        %p\n"

+		"    increment: %p\n",

+		(void *) ir->counter, (void *) ir->from, (void *) ir->to,

+                (void *) ir->increment);

+	 abort();

+      }

+   }

+

+   return visit_continue;

+}

+

+

+ir_visitor_status

+ir_validate::visit_enter(ir_function *ir)

+{

+   /* Function definitions cannot be nested.

+    */

+   if (this->current_function != NULL) {

+      printf("Function definition nested inside another function "

+	     "definition:\n");

+      printf("%s %p inside %s %p\n",

+	     ir->name, (void *) ir,

+	     this->current_function->name, (void *) this->current_function);

+      abort();

+   }

+

+   /* Store the current function hierarchy being traversed.  This is used

+    * by the function signature visitor to ensure that the signatures are

+    * linked with the correct functions.

+    */

+   this->current_function = ir;

+

+   this->validate_ir(ir, this->data);

+

+   return visit_continue;

+}

+

+ir_visitor_status

+ir_validate::visit_leave(ir_function *ir)

+{

+   assert(ralloc_parent(ir->name) == ir);

+

+   this->current_function = NULL;

+   return visit_continue;

+}

+

+ir_visitor_status

+ir_validate::visit_enter(ir_function_signature *ir)

+{

+   if (this->current_function != ir->function()) {

+      printf("Function signature nested inside wrong function "

+	     "definition:\n");

+      printf("%p inside %s %p instead of %s %p\n",

+	     (void *) ir,

+	     this->current_function->name, (void *) this->current_function,

+	     ir->function_name(), (void *) ir->function());

+      abort();

+   }

+

+   this->validate_ir(ir, this->data);

+

+   return visit_continue;

+}

+

+ir_visitor_status

+ir_validate::visit_leave(ir_expression *ir)

+{

+   switch (ir->operation) {

+   case ir_unop_bit_not:

+      assert(ir->operands[0]->type == ir->type);

+      break;

+   case ir_unop_logic_not:

+      assert(ir->type->base_type == GLSL_TYPE_BOOL);

+      assert(ir->operands[0]->type->base_type == GLSL_TYPE_BOOL);

+      break;

+

+   case ir_unop_neg:

+   case ir_unop_abs:

+   case ir_unop_sign:

+   case ir_unop_rcp:

+   case ir_unop_rsq:

+   case ir_unop_sqrt:

+      assert(ir->type == ir->operands[0]->type);

+      break;

+

+   case ir_unop_exp:

+   case ir_unop_log:

+   case ir_unop_exp2:

+   case ir_unop_log2:

+      assert(ir->operands[0]->type->base_type == GLSL_TYPE_FLOAT);

+      assert(ir->type == ir->operands[0]->type);

+      break;

+

+   case ir_unop_f2i:

+      assert(ir->operands[0]->type->base_type == GLSL_TYPE_FLOAT);

+      assert(ir->type->base_type == GLSL_TYPE_INT);

+      break;

+   case ir_unop_i2f:

+      assert(ir->operands[0]->type->base_type == GLSL_TYPE_INT);

+      assert(ir->type->base_type == GLSL_TYPE_FLOAT);

+      break;

+   case ir_unop_f2b:

+      assert(ir->operands[0]->type->base_type == GLSL_TYPE_FLOAT);

+      assert(ir->type->base_type == GLSL_TYPE_BOOL);

+      break;

+   case ir_unop_b2f:

+      assert(ir->operands[0]->type->base_type == GLSL_TYPE_BOOL);

+      assert(ir->type->base_type == GLSL_TYPE_FLOAT);

+      break;

+   case ir_unop_i2b:

+      assert(ir->operands[0]->type->base_type == GLSL_TYPE_INT);

+      assert(ir->type->base_type == GLSL_TYPE_BOOL);

+      break;

+   case ir_unop_b2i:

+      assert(ir->operands[0]->type->base_type == GLSL_TYPE_BOOL);

+      assert(ir->type->base_type == GLSL_TYPE_INT);

+      break;

+   case ir_unop_u2f:

+      assert(ir->operands[0]->type->base_type == GLSL_TYPE_UINT);

+      assert(ir->type->base_type == GLSL_TYPE_FLOAT);

+      break;

+

+   case ir_unop_any:

+      assert(ir->operands[0]->type->base_type == GLSL_TYPE_BOOL);

+      assert(ir->type == glsl_type::bool_type);

+      break;

+

+   case ir_unop_trunc:

+   case ir_unop_round_even:

+   case ir_unop_ceil:

+   case ir_unop_floor:

+   case ir_unop_fract:

+   case ir_unop_sin:

+   case ir_unop_cos:

+   case ir_unop_sin_reduced:

+   case ir_unop_cos_reduced:

+   case ir_unop_dFdx:

+   case ir_unop_dFdy:

+      assert(ir->operands[0]->type->base_type == GLSL_TYPE_FLOAT);

+      assert(ir->operands[0]->type == ir->type);

+      break;

+

+   case ir_unop_noise:

+      /* XXX what can we assert here? */

+      break;

+

+   case ir_binop_add:

+   case ir_binop_sub:

+   case ir_binop_mul:

+   case ir_binop_div:

+   case ir_binop_mod:

+   case ir_binop_min:

+   case ir_binop_max:

+   case ir_binop_pow:

+      if (ir->operands[0]->type->is_scalar())

+	 assert(ir->operands[1]->type == ir->type);

+      else if (ir->operands[1]->type->is_scalar())

+	 assert(ir->operands[0]->type == ir->type);

+      else if (ir->operands[0]->type->is_vector() &&

+	       ir->operands[1]->type->is_vector()) {

+	 assert(ir->operands[0]->type == ir->operands[1]->type);

+	 assert(ir->operands[0]->type == ir->type);

+      }

+      break;

+

+   case ir_binop_less:

+   case ir_binop_greater:

+   case ir_binop_lequal:

+   case ir_binop_gequal:

+   case ir_binop_equal:

+   case ir_binop_nequal:

+      /* The semantics of the IR operators differ from the GLSL <, >, <=, >=,

+       * ==, and != operators.  The IR operators perform a component-wise

+       * comparison on scalar or vector types and return a boolean scalar or

+       * vector type of the same size.

+       */

+      assert(ir->type->base_type == GLSL_TYPE_BOOL);

+      assert(ir->operands[0]->type == ir->operands[1]->type);

+      assert(ir->operands[0]->type->is_vector()

+	     || ir->operands[0]->type->is_scalar());

+      assert(ir->operands[0]->type->vector_elements

+	     == ir->type->vector_elements);

+      break;

+

+   case ir_binop_all_equal:

+   case ir_binop_any_nequal:

+      /* GLSL == and != operate on scalars, vectors, matrices and arrays, and

+       * return a scalar boolean.  The IR matches that.

+       */

+      assert(ir->type == glsl_type::bool_type);

+      assert(ir->operands[0]->type == ir->operands[1]->type);

+      break;

+

+   case ir_binop_lshift:

+   case ir_binop_rshift:

+      assert(ir->operands[0]->type->is_integer() &&

+             ir->operands[1]->type->is_integer());

+      if (ir->operands[0]->type->is_scalar()) {

+          assert(ir->operands[1]->type->is_scalar());

+      }

+      if (ir->operands[0]->type->is_vector() &&

+          ir->operands[1]->type->is_vector()) {

+          assert(ir->operands[0]->type->components() ==

+                 ir->operands[1]->type->components());

+      }

+      assert(ir->type == ir->operands[0]->type);

+      break;

+

+   case ir_binop_bit_and:

+   case ir_binop_bit_xor:

+   case ir_binop_bit_or:

+       assert(ir->operands[0]->type->base_type ==

+              ir->operands[1]->type->base_type);

+       assert(ir->type->is_integer());

+       if (ir->operands[0]->type->is_vector() &&

+           ir->operands[1]->type->is_vector()) {

+           assert(ir->operands[0]->type->vector_elements ==

+                  ir->operands[1]->type->vector_elements);

+       }

+       break;

+

+   case ir_binop_logic_and:

+   case ir_binop_logic_xor:

+   case ir_binop_logic_or:

+      assert(ir->type == glsl_type::bool_type);

+      assert(ir->operands[0]->type == glsl_type::bool_type);

+      assert(ir->operands[1]->type == glsl_type::bool_type);

+      break;

+

+   case ir_binop_dot:

+      assert(ir->type == glsl_type::float_type);

+      assert(ir->operands[0]->type->base_type == GLSL_TYPE_FLOAT);

+      assert(ir->operands[0]->type->is_vector());

+      assert(ir->operands[0]->type == ir->operands[1]->type);

+      break;

+

+   case ir_quadop_vector:

+      /* The vector operator collects some number of scalars and generates a

+       * vector from them.

+       *

+       *  - All of the operands must be scalar.

+       *  - Number of operands must matche the size of the resulting vector.

+       *  - Base type of the operands must match the base type of the result.

+       */

+      assert(ir->type->is_vector());

+      switch (ir->type->vector_elements) {

+      case 2:

+	 assert(ir->operands[0]->type->is_scalar());

+	 assert(ir->operands[0]->type->base_type == ir->type->base_type);

+	 assert(ir->operands[1]->type->is_scalar());

+	 assert(ir->operands[1]->type->base_type == ir->type->base_type);

+	 assert(ir->operands[2] == NULL);

+	 assert(ir->operands[3] == NULL);

+	 break;

+      case 3:

+	 assert(ir->operands[0]->type->is_scalar());

+	 assert(ir->operands[0]->type->base_type == ir->type->base_type);

+	 assert(ir->operands[1]->type->is_scalar());

+	 assert(ir->operands[1]->type->base_type == ir->type->base_type);

+	 assert(ir->operands[2]->type->is_scalar());

+	 assert(ir->operands[2]->type->base_type == ir->type->base_type);

+	 assert(ir->operands[3] == NULL);

+	 break;

+      case 4:

+	 assert(ir->operands[0]->type->is_scalar());

+	 assert(ir->operands[0]->type->base_type == ir->type->base_type);

+	 assert(ir->operands[1]->type->is_scalar());

+	 assert(ir->operands[1]->type->base_type == ir->type->base_type);

+	 assert(ir->operands[2]->type->is_scalar());

+	 assert(ir->operands[2]->type->base_type == ir->type->base_type);

+	 assert(ir->operands[3]->type->is_scalar());

+	 assert(ir->operands[3]->type->base_type == ir->type->base_type);

+	 break;

+      default:

+	 /* The is_vector assertion above should prevent execution from ever

+	  * getting here.

+	  */

+	 assert(!"Should not get here.");

+	 break;

+      }

+   }

+

+   return visit_continue;

+}

+

+ir_visitor_status

+ir_validate::visit_leave(ir_swizzle *ir)

+{

+   int chans[4] = {ir->mask.x, ir->mask.y, ir->mask.z, ir->mask.w};

+

+   for (unsigned int i = 0; i < ir->type->vector_elements; i++) {

+      if (chans[i] >= ir->val->type->vector_elements) {

+	 printf("ir_swizzle @ %p specifies a channel not present "

+		"in the value.\n", (void *) ir);

+	 ir->print();

+	 abort();

+      }

+   }

+

+   return visit_continue;

+}

+

+ir_visitor_status

+ir_validate::visit(ir_variable *ir)

+{

+   /* An ir_variable is the one thing that can (and will) appear multiple times

+    * in an IR tree.  It is added to the hashtable so that it can be used

+    * in the ir_dereference_variable handler to ensure that a variable is

+    * declared before it is dereferenced.

+    */

+   if (ir->name)

+      assert(ralloc_parent(ir->name) == ir);

+

+   hash_table_insert(ht, ir, ir);

+   return visit_continue;

+}

+

+ir_visitor_status

+ir_validate::visit_enter(ir_assignment *ir)

+{

+   const ir_dereference *const lhs = ir->lhs;

+   if (lhs->type->is_scalar() || lhs->type->is_vector()) {

+      if (ir->write_mask == 0) {

+	 printf("Assignment LHS is %s, but write mask is 0:\n",

+		lhs->type->is_scalar() ? "scalar" : "vector");

+	 ir->print();

+	 abort();

+      }

+

+      int lhs_components = 0;

+      for (int i = 0; i < 4; i++) {

+	 if (ir->write_mask & (1 << i))

+	    lhs_components++;

+      }

+

+      if (lhs_components != ir->rhs->type->vector_elements) {

+	 printf("Assignment count of LHS write mask channels enabled not\n"

+		"matching RHS vector size (%d LHS, %d RHS).\n",

+		lhs_components, ir->rhs->type->vector_elements);

+	 ir->print();

+	 abort();

+      }

+   }

+

+   this->validate_ir(ir, this->data);

+

+   return visit_continue;

+}

+

+void

+ir_validate::validate_ir(ir_instruction *ir, void *data)

+{

+   struct hash_table *ht = (struct hash_table *) data;

+

+   if (hash_table_find(ht, ir)) {

+      printf("Instruction node present twice in ir tree:\n");

+      ir->print();

+      printf("\n");

+      abort();

+   }

+   hash_table_insert(ht, ir, ir);

+}

+

+void

+check_node_type(ir_instruction *ir, void *data)

+{

+   (void) data;

+

+   if (ir->ir_type <= ir_type_unset || ir->ir_type >= ir_type_max) {

+      printf("Instruction node with unset type\n");

+      ir->print(); printf("\n");

+   }

+   assert(ir->type != glsl_type::error_type);

+}

+

+void

+validate_ir_tree(exec_list *instructions)

+{

+   ir_validate v;

+

+   v.run(instructions);

+

+   foreach_iter(exec_list_iterator, iter, *instructions) {

+      ir_instruction *ir = (ir_instruction *)iter.get();

+

+      visit_tree(ir, check_node_type, NULL);

+   }

+}

diff --git a/mesalib/src/glsl/link_functions.cpp b/mesalib/src/glsl/link_functions.cpp
index 861fa39b5..bc8758438 100644
--- a/mesalib/src/glsl/link_functions.cpp
+++ b/mesalib/src/glsl/link_functions.cpp
@@ -1,270 +1,266 @@
-/*
- * 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 <cstdlib>
-#include <cstdio>
-#include <cstdarg>
-
-#include "main/core.h"
-#include "glsl_symbol_table.h"
-#include "glsl_parser_extras.h"
-#include "ir.h"
-#include "program.h"
-#include "program/hash_table.h"
-#include "linker.h"
-
-static ir_function_signature *
-find_matching_signature(const char *name, const exec_list *actual_parameters,
-			gl_shader **shader_list, unsigned num_shaders);
-
-class call_link_visitor : public ir_hierarchical_visitor {
-public:
-   call_link_visitor(gl_shader_program *prog, gl_shader *linked,
-		     gl_shader **shader_list, unsigned num_shaders)
-   {
-      this->prog = prog;
-      this->shader_list = shader_list;
-      this->num_shaders = num_shaders;
-      this->success = true;
-      this->linked = linked;
-
-      this->locals = hash_table_ctor(0, hash_table_pointer_hash,
-				     hash_table_pointer_compare);
-   }
-
-   ~call_link_visitor()
-   {
-      hash_table_dtor(this->locals);
-   }
-
-   virtual ir_visitor_status visit(ir_variable *ir)
-   {
-      hash_table_insert(locals, ir, ir);
-      return visit_continue;
-   }
-
-   virtual ir_visitor_status visit_enter(ir_call *ir)
-   {
-      /* If ir is an ir_call from a function that was imported from another
-       * shader callee will point to an ir_function_signature in the original
-       * shader.  In this case the function signature MUST NOT BE MODIFIED.
-       * Doing so will modify the original shader.  This may prevent that
-       * shader from being linkable in other programs.
-       */
-      const ir_function_signature *const callee = ir->get_callee();
-      assert(callee != NULL);
-      const char *const name = callee->function_name();
-
-      /* Determine if the requested function signature already exists in the
-       * final linked shader.  If it does, use it as the target of the call.
-       */
-      ir_function_signature *sig =
-	 find_matching_signature(name, &callee->parameters, &linked, 1);
-      if (sig != NULL) {
-	 ir->set_callee(sig);
-	 return visit_continue;
-      }
-
-      /* Try to find the signature in one of the other shaders that is being
-       * linked.  If it's not found there, return an error.
-       */
-      sig = find_matching_signature(name, &ir->actual_parameters, shader_list,
-				    num_shaders);
-      if (sig == NULL) {
-	 /* FINISHME: Log the full signature of unresolved function.
-	  */
-	 linker_error_printf(this->prog, "unresolved reference to function "
-			     "`%s'\n", name);
-	 this->success = false;
-	 return visit_stop;
-      }
-
-      /* Find the prototype information in the linked shader.  Generate any
-       * details that may be missing.
-       */
-      ir_function *f = linked->symbols->get_function(name);
-      if (f == NULL)
-	 f = new(linked) ir_function(name);
-
-      ir_function_signature *linked_sig =
-	 f->exact_matching_signature(&callee->parameters);
-      if (linked_sig == NULL) {
-	 linked_sig = new(linked) ir_function_signature(callee->return_type);
-	 f->add_signature(linked_sig);
-      }
-
-      /* At this point linked_sig and called may be the same.  If ir is an
-       * ir_call from linked then linked_sig and callee will be
-       * ir_function_signatures that have no definitions (is_defined is false).
-       */
-      assert(!linked_sig->is_defined);
-      assert(linked_sig->body.is_empty());
-
-      /* Create an in-place clone of the function definition.  This multistep
-       * process introduces some complexity here, but it has some advantages.
-       * The parameter list and the and function body are cloned separately.
-       * The clone of the parameter list is used to prime the hashtable used
-       * to replace variable references in the cloned body.
-       *
-       * The big advantage is that the ir_function_signature does not change.
-       * This means that we don't have to process the rest of the IR tree to
-       * patch ir_call nodes.  In addition, there is no way to remove or
-       * replace signature stored in a function.  One could easily be added,
-       * but this avoids the need.
-       */
-      struct hash_table *ht = hash_table_ctor(0, hash_table_pointer_hash,
-					      hash_table_pointer_compare);
-      exec_list formal_parameters;
-      foreach_list_const(node, &sig->parameters) {
-	 const ir_instruction *const original = (ir_instruction *) node;
-	 assert(const_cast<ir_instruction *>(original)->as_variable());
-
-	 ir_instruction *copy = original->clone(linked, ht);
-	 formal_parameters.push_tail(copy);
-      }
-
-      linked_sig->replace_parameters(&formal_parameters);
-
-      foreach_list_const(node, &sig->body) {
-	 const ir_instruction *const original = (ir_instruction *) node;
-
-	 ir_instruction *copy = original->clone(linked, ht);
-	 linked_sig->body.push_tail(copy);
-      }
-
-      linked_sig->is_defined = true;
-      hash_table_dtor(ht);
-
-      /* Patch references inside the function to things outside the function
-       * (i.e., function calls and global variables).
-       */
-      linked_sig->accept(this);
-
-      ir->set_callee(linked_sig);
-
-      return visit_continue;
-   }
-
-   virtual ir_visitor_status visit(ir_dereference_variable *ir)
-   {
-      if (hash_table_find(locals, ir->var) == NULL) {
-	 /* The non-function variable must be a global, so try to find the
-	  * variable in the shader's symbol table.  If the variable is not
-	  * found, then it's a global that *MUST* be defined in the original
-	  * shader.
-	  */
-	 ir_variable *var = linked->symbols->get_variable(ir->var->name);
-	 if (var == NULL) {
-	    /* Clone the ir_variable that the dereference already has and add
-	     * it to the linked shader.
-	     */
-	    var = ir->var->clone(linked, NULL);
-	    linked->symbols->add_variable(var);
-	    linked->ir->push_head(var);
-	 } else if (var->type->is_array()) {
-	    /* It is possible to have a global array declared in multiple
-	     * shaders without a size.  The array is implicitly sized by the
-	     * maximal access to it in *any* shader.  Because of this, we
-	     * need to track the maximal access to the array as linking pulls
-	     * more functions in that access the array.
-	     */
-	    var->max_array_access =
-	       MAX2(var->max_array_access, ir->var->max_array_access);
-
-	    if (var->type->length == 0 && ir->var->type->length != 0)
-	       var->type = ir->var->type;
-	 }
-
-	 ir->var = var;
-      }
-
-      return visit_continue;
-   }
-
-   /** Was function linking successful? */
-   bool success;
-
-private:
-   /**
-    * Shader program being linked
-    *
-    * This is only used for logging error messages.
-    */
-   gl_shader_program *prog;
-
-   /** List of shaders available for linking. */
-   gl_shader **shader_list;
-
-   /** Number of shaders available for linking. */
-   unsigned num_shaders;
-
-   /**
-    * Final linked shader
-    *
-    * This is used two ways.  It is used to find global variables in the
-    * linked shader that are accessed by the function.  It is also used to add
-    * global variables from the shader where the function originated.
-    */
-   gl_shader *linked;
-
-   /**
-    * Table of variables local to the function.
-    */
-   hash_table *locals;
-};
-
-
-/**
- * Searches a list of shaders for a particular function definition
- */
-ir_function_signature *
-find_matching_signature(const char *name, const exec_list *actual_parameters,
-			gl_shader **shader_list, unsigned num_shaders)
-{
-   for (unsigned i = 0; i < num_shaders; i++) {
-      ir_function *const f = shader_list[i]->symbols->get_function(name);
-
-      if (f == NULL)
-	 continue;
-
-      ir_function_signature *sig = f->matching_signature(actual_parameters);
-
-      if ((sig == NULL) || !sig->is_defined)
-	 continue;
-
-      return sig;
-   }
-
-   return NULL;
-}
-
-
-bool
-link_function_calls(gl_shader_program *prog, gl_shader *main,
-		    gl_shader **shader_list, unsigned num_shaders)
-{
-   call_link_visitor v(prog, main, shader_list, num_shaders);
-
-   v.run(main->ir);
-   return v.success;
-}
+/*

+ * 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 "main/core.h"

+#include "glsl_symbol_table.h"

+#include "glsl_parser_extras.h"

+#include "ir.h"

+#include "program.h"

+#include "program/hash_table.h"

+#include "linker.h"

+

+static ir_function_signature *

+find_matching_signature(const char *name, const exec_list *actual_parameters,

+			gl_shader **shader_list, unsigned num_shaders);

+

+class call_link_visitor : public ir_hierarchical_visitor {

+public:

+   call_link_visitor(gl_shader_program *prog, gl_shader *linked,

+		     gl_shader **shader_list, unsigned num_shaders)

+   {

+      this->prog = prog;

+      this->shader_list = shader_list;

+      this->num_shaders = num_shaders;

+      this->success = true;

+      this->linked = linked;

+

+      this->locals = hash_table_ctor(0, hash_table_pointer_hash,

+				     hash_table_pointer_compare);

+   }

+

+   ~call_link_visitor()

+   {

+      hash_table_dtor(this->locals);

+   }

+

+   virtual ir_visitor_status visit(ir_variable *ir)

+   {

+      hash_table_insert(locals, ir, ir);

+      return visit_continue;

+   }

+

+   virtual ir_visitor_status visit_enter(ir_call *ir)

+   {

+      /* If ir is an ir_call from a function that was imported from another

+       * shader callee will point to an ir_function_signature in the original

+       * shader.  In this case the function signature MUST NOT BE MODIFIED.

+       * Doing so will modify the original shader.  This may prevent that

+       * shader from being linkable in other programs.

+       */

+      const ir_function_signature *const callee = ir->get_callee();

+      assert(callee != NULL);

+      const char *const name = callee->function_name();

+

+      /* Determine if the requested function signature already exists in the

+       * final linked shader.  If it does, use it as the target of the call.

+       */

+      ir_function_signature *sig =

+	 find_matching_signature(name, &callee->parameters, &linked, 1);

+      if (sig != NULL) {

+	 ir->set_callee(sig);

+	 return visit_continue;

+      }

+

+      /* Try to find the signature in one of the other shaders that is being

+       * linked.  If it's not found there, return an error.

+       */

+      sig = find_matching_signature(name, &ir->actual_parameters, shader_list,

+				    num_shaders);

+      if (sig == NULL) {

+	 /* FINISHME: Log the full signature of unresolved function.

+	  */

+	 linker_error_printf(this->prog, "unresolved reference to function "

+			     "`%s'\n", name);

+	 this->success = false;

+	 return visit_stop;

+      }

+

+      /* Find the prototype information in the linked shader.  Generate any

+       * details that may be missing.

+       */

+      ir_function *f = linked->symbols->get_function(name);

+      if (f == NULL)

+	 f = new(linked) ir_function(name);

+

+      ir_function_signature *linked_sig =

+	 f->exact_matching_signature(&callee->parameters);

+      if (linked_sig == NULL) {

+	 linked_sig = new(linked) ir_function_signature(callee->return_type);

+	 f->add_signature(linked_sig);

+      }

+

+      /* At this point linked_sig and called may be the same.  If ir is an

+       * ir_call from linked then linked_sig and callee will be

+       * ir_function_signatures that have no definitions (is_defined is false).

+       */

+      assert(!linked_sig->is_defined);

+      assert(linked_sig->body.is_empty());

+

+      /* Create an in-place clone of the function definition.  This multistep

+       * process introduces some complexity here, but it has some advantages.

+       * The parameter list and the and function body are cloned separately.

+       * The clone of the parameter list is used to prime the hashtable used

+       * to replace variable references in the cloned body.

+       *

+       * The big advantage is that the ir_function_signature does not change.

+       * This means that we don't have to process the rest of the IR tree to

+       * patch ir_call nodes.  In addition, there is no way to remove or

+       * replace signature stored in a function.  One could easily be added,

+       * but this avoids the need.

+       */

+      struct hash_table *ht = hash_table_ctor(0, hash_table_pointer_hash,

+					      hash_table_pointer_compare);

+      exec_list formal_parameters;

+      foreach_list_const(node, &sig->parameters) {

+	 const ir_instruction *const original = (ir_instruction *) node;

+	 assert(const_cast<ir_instruction *>(original)->as_variable());

+

+	 ir_instruction *copy = original->clone(linked, ht);

+	 formal_parameters.push_tail(copy);

+      }

+

+      linked_sig->replace_parameters(&formal_parameters);

+

+      foreach_list_const(node, &sig->body) {

+	 const ir_instruction *const original = (ir_instruction *) node;

+

+	 ir_instruction *copy = original->clone(linked, ht);

+	 linked_sig->body.push_tail(copy);

+      }

+

+      linked_sig->is_defined = true;

+      hash_table_dtor(ht);

+

+      /* Patch references inside the function to things outside the function

+       * (i.e., function calls and global variables).

+       */

+      linked_sig->accept(this);

+

+      ir->set_callee(linked_sig);

+

+      return visit_continue;

+   }

+

+   virtual ir_visitor_status visit(ir_dereference_variable *ir)

+   {

+      if (hash_table_find(locals, ir->var) == NULL) {

+	 /* The non-function variable must be a global, so try to find the

+	  * variable in the shader's symbol table.  If the variable is not

+	  * found, then it's a global that *MUST* be defined in the original

+	  * shader.

+	  */

+	 ir_variable *var = linked->symbols->get_variable(ir->var->name);

+	 if (var == NULL) {

+	    /* Clone the ir_variable that the dereference already has and add

+	     * it to the linked shader.

+	     */

+	    var = ir->var->clone(linked, NULL);

+	    linked->symbols->add_variable(var);

+	    linked->ir->push_head(var);

+	 } else if (var->type->is_array()) {

+	    /* It is possible to have a global array declared in multiple

+	     * shaders without a size.  The array is implicitly sized by the

+	     * maximal access to it in *any* shader.  Because of this, we

+	     * need to track the maximal access to the array as linking pulls

+	     * more functions in that access the array.

+	     */

+	    var->max_array_access =

+	       MAX2(var->max_array_access, ir->var->max_array_access);

+

+	    if (var->type->length == 0 && ir->var->type->length != 0)

+	       var->type = ir->var->type;

+	 }

+

+	 ir->var = var;

+      }

+

+      return visit_continue;

+   }

+

+   /** Was function linking successful? */

+   bool success;

+

+private:

+   /**

+    * Shader program being linked

+    *

+    * This is only used for logging error messages.

+    */

+   gl_shader_program *prog;

+

+   /** List of shaders available for linking. */

+   gl_shader **shader_list;

+

+   /** Number of shaders available for linking. */

+   unsigned num_shaders;

+

+   /**

+    * Final linked shader

+    *

+    * This is used two ways.  It is used to find global variables in the

+    * linked shader that are accessed by the function.  It is also used to add

+    * global variables from the shader where the function originated.

+    */

+   gl_shader *linked;

+

+   /**

+    * Table of variables local to the function.

+    */

+   hash_table *locals;

+};

+

+

+/**

+ * Searches a list of shaders for a particular function definition

+ */

+ir_function_signature *

+find_matching_signature(const char *name, const exec_list *actual_parameters,

+			gl_shader **shader_list, unsigned num_shaders)

+{

+   for (unsigned i = 0; i < num_shaders; i++) {

+      ir_function *const f = shader_list[i]->symbols->get_function(name);

+

+      if (f == NULL)

+	 continue;

+

+      ir_function_signature *sig = f->matching_signature(actual_parameters);

+

+      if ((sig == NULL) || !sig->is_defined)

+	 continue;

+

+      return sig;

+   }

+

+   return NULL;

+}

+

+

+bool

+link_function_calls(gl_shader_program *prog, gl_shader *main,

+		    gl_shader **shader_list, unsigned num_shaders)

+{

+   call_link_visitor v(prog, main, shader_list, num_shaders);

+

+   v.run(main->ir);

+   return v.success;

+}

diff --git a/mesalib/src/glsl/linker.cpp b/mesalib/src/glsl/linker.cpp
index a9a2a5e20..7760b4f2c 100644
--- a/mesalib/src/glsl/linker.cpp
+++ b/mesalib/src/glsl/linker.cpp
@@ -63,10 +63,6 @@
  *

  * \author Ian Romanick <ian.d.romanick@intel.com>

  */

-#include <cstdlib>

-#include <cstdio>

-#include <cstdarg>

-#include <climits>

 

 #include "main/core.h"

 #include "glsl_symbol_table.h"

diff --git a/mesalib/src/glsl/loop_controls.cpp b/mesalib/src/glsl/loop_controls.cpp
index 9eaa50f22..9b77ef460 100644
--- a/mesalib/src/glsl/loop_controls.cpp
+++ b/mesalib/src/glsl/loop_controls.cpp
@@ -1,304 +1,304 @@
-/*
- * 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 <climits>
-#include "main/compiler.h"
-#include "glsl_types.h"
-#include "loop_analysis.h"
-#include "ir_hierarchical_visitor.h"
-
-/**
- * Find an initializer of a variable outside a loop
- *
- * Works backwards from the loop to find the pre-loop value of the variable.
- * This is used, for example, to find the initial value of loop induction
- * variables.
- *
- * \param loop  Loop where \c var is an induction variable
- * \param var   Variable whose initializer is to be found
- *
- * \return
- * The \c ir_rvalue assigned to the variable outside the loop.  May return
- * \c NULL if no initializer can be found.
- */
-ir_rvalue *
-find_initial_value(ir_loop *loop, ir_variable *var)
-{
-   for (exec_node *node = loop->prev;
-	!node->is_head_sentinel();
-	node = node->prev) {
-      ir_instruction *ir = (ir_instruction *) node;
-
-      switch (ir->ir_type) {
-      case ir_type_call:
-      case ir_type_loop:
-      case ir_type_loop_jump:
-      case ir_type_return:
-      case ir_type_if:
-	 return NULL;
-
-      case ir_type_function:
-      case ir_type_function_signature:
-	 assert(!"Should not get here.");
-	 return NULL;
-
-      case ir_type_assignment: {
-	 ir_assignment *assign = ir->as_assignment();
-	 ir_variable *assignee = assign->lhs->whole_variable_referenced();
-
-	 if (assignee == var)
-	    return (assign->condition != NULL) ? NULL : assign->rhs;
-
-	 break;
-      }
-
-      default:
-	 break;
-      }
-   }
-
-   return NULL;
-}
-
-
-int
-calculate_iterations(ir_rvalue *from, ir_rvalue *to, ir_rvalue *increment,
-		     enum ir_expression_operation op)
-{
-   if (from == NULL || to == NULL || increment == NULL)
-      return -1;
-
-   void *mem_ctx = ralloc_context(NULL);
-
-   ir_expression *const sub =
-      new(mem_ctx) ir_expression(ir_binop_sub, from->type, to, from);
-
-   ir_expression *const div =
-      new(mem_ctx) ir_expression(ir_binop_div, sub->type, sub, increment);
-
-   ir_constant *iter = div->constant_expression_value();
-
-   if (iter == NULL)
-      return -1;
-
-   if (!iter->type->is_integer()) {
-      ir_rvalue *cast =
-	 new(mem_ctx) ir_expression(ir_unop_f2i, glsl_type::int_type, iter,
-				    NULL);
-
-      iter = cast->constant_expression_value();
-   }
-
-   int iter_value = iter->get_int_component(0);
-
-   /* Make sure that the calculated number of iterations satisfies the exit
-    * condition.  This is needed to catch off-by-one errors and some types of
-    * ill-formed loops.  For example, we need to detect that the following
-    * loop does not have a maximum iteration count.
-    *
-    *    for (float x = 0.0; x != 0.9; x += 0.2)
-    *        ;
-    */
-   const int bias[] = { -1, 0, 1 };
-   bool valid_loop = false;
-
-   for (unsigned i = 0; i < Elements(bias); i++) {
-      iter = (increment->type->is_integer())
-	 ? new(mem_ctx) ir_constant(iter_value + bias[i])
-	 : new(mem_ctx) ir_constant(float(iter_value + bias[i]));
-
-      ir_expression *const mul =
-	 new(mem_ctx) ir_expression(ir_binop_mul, increment->type, iter,
-				    increment);
-
-      ir_expression *const add =
-	 new(mem_ctx) ir_expression(ir_binop_add, mul->type, mul, from);
-
-      ir_expression *const cmp =
-	 new(mem_ctx) ir_expression(op, glsl_type::bool_type, add, to);
-
-      ir_constant *const cmp_result = cmp->constant_expression_value();
-
-      assert(cmp_result != NULL);
-      if (cmp_result->get_bool_component(0)) {
-	 iter_value += bias[i];
-	 valid_loop = true;
-	 break;
-      }
-   }
-
-   ralloc_free(mem_ctx);
-   return (valid_loop) ? iter_value : -1;
-}
-
-
-class loop_control_visitor : public ir_hierarchical_visitor {
-public:
-   loop_control_visitor(loop_state *state)
-   {
-      this->state = state;
-      this->progress = false;
-   }
-
-   virtual ir_visitor_status visit_leave(ir_loop *ir);
-
-   loop_state *state;
-
-   bool progress;
-};
-
-
-ir_visitor_status
-loop_control_visitor::visit_leave(ir_loop *ir)
-{
-   loop_variable_state *const ls = this->state->get(ir);
-
-   /* If we've entered a loop that hasn't been analyzed, something really,
-    * really bad has happened.
-    */
-   if (ls == NULL) {
-      assert(ls != NULL);
-      return visit_continue;
-   }
-
-   /* Search the loop terminating conditions for one of the form 'i < c' where
-    * i is a loop induction variable, c is a constant, and < is any relative
-    * operator.
-    */
-   int max_iterations = ls->max_iterations;
-
-   if(ir->from && ir->to && ir->increment)
-      max_iterations = calculate_iterations(ir->from, ir->to, ir->increment, (ir_expression_operation)ir->cmp);
-
-   if(max_iterations < 0)
-      max_iterations = INT_MAX;
-
-   foreach_list(node, &ls->terminators) {
-      loop_terminator *t = (loop_terminator *) node;
-      ir_if *if_stmt = t->ir;
-
-      /* If-statements can be either 'if (expr)' or 'if (deref)'.  We only care
-       * about the former here.
-       */
-      ir_expression *cond = if_stmt->condition->as_expression();
-      if (cond == NULL)
-	 continue;
-
-      switch (cond->operation) {
-      case ir_binop_less:
-      case ir_binop_greater:
-      case ir_binop_lequal:
-      case ir_binop_gequal: {
-	 /* The expressions that we care about will either be of the form
-	  * 'counter < limit' or 'limit < counter'.  Figure out which is
-	  * which.
-	  */
-	 ir_rvalue *counter = cond->operands[0]->as_dereference_variable();
-	 ir_constant *limit = cond->operands[1]->as_constant();
-	 enum ir_expression_operation cmp = cond->operation;
-
-	 if (limit == NULL) {
-	    counter = cond->operands[1]->as_dereference_variable();
-	    limit = cond->operands[0]->as_constant();
-
-	    switch (cmp) {
-	    case ir_binop_less:    cmp = ir_binop_gequal;  break;
-	    case ir_binop_greater: cmp = ir_binop_lequal;  break;
-	    case ir_binop_lequal:  cmp = ir_binop_greater; break;
-	    case ir_binop_gequal:  cmp = ir_binop_less;    break;
-	    default: assert(!"Should not get here.");
-	    }
-	 }
-
-	 if ((counter == NULL) || (limit == NULL))
-	    break;
-
-	 ir_variable *var = counter->variable_referenced();
-
-	 ir_rvalue *init = find_initial_value(ir, var);
-
-	 foreach_list(iv_node, &ls->induction_variables) {
-	    loop_variable *lv = (loop_variable *) iv_node;
-
-	    if (lv->var == var) {
-	       const int iterations = calculate_iterations(init, limit,
-							   lv->increment,
-							   cmp);
-	       if (iterations >= 0) {
-		  /* If the new iteration count is lower than the previously
-		   * believed iteration count, update the loop control values.
-		   */
-		  if (iterations < max_iterations) {
-		     ir->from = init->clone(ir, NULL);
-		     ir->to = limit->clone(ir, NULL);
-		     ir->increment = lv->increment->clone(ir, NULL);
-		     ir->counter = lv->var;
-		     ir->cmp = cmp;
-
-		     max_iterations = iterations;
-		  }
-
-		  /* Remove the conditional break statement.  The loop
-		   * controls are now set such that the exit condition will be
-		   * satisfied.
-		   */
-		  if_stmt->remove();
-
-		  assert(ls->num_loop_jumps > 0);
-		  ls->num_loop_jumps--;
-
-		  this->progress = true;
-	       }
-
-	       break;
-	    }
-	 }
-	 break;
-      }
-
-      default:
-	 break;
-      }
-   }
-
-   /* If we have proven the one of the loop exit conditions is satisifed before
-    * running the loop once, remove the loop.
-    */
-   if (max_iterations == 0)
-      ir->remove();
-   else
-      ls->max_iterations = max_iterations;
-
-   return visit_continue;
-}
-
-
-bool
-set_loop_controls(exec_list *instructions, loop_state *ls)
-{
-   loop_control_visitor v(ls);
-
-   v.run(instructions);
-
-   return v.progress;
-}
+/*

+ * 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 <limits.h>

+#include "main/compiler.h"

+#include "glsl_types.h"

+#include "loop_analysis.h"

+#include "ir_hierarchical_visitor.h"

+

+/**

+ * Find an initializer of a variable outside a loop

+ *

+ * Works backwards from the loop to find the pre-loop value of the variable.

+ * This is used, for example, to find the initial value of loop induction

+ * variables.

+ *

+ * \param loop  Loop where \c var is an induction variable

+ * \param var   Variable whose initializer is to be found

+ *

+ * \return

+ * The \c ir_rvalue assigned to the variable outside the loop.  May return

+ * \c NULL if no initializer can be found.

+ */

+ir_rvalue *

+find_initial_value(ir_loop *loop, ir_variable *var)

+{

+   for (exec_node *node = loop->prev;

+	!node->is_head_sentinel();

+	node = node->prev) {

+      ir_instruction *ir = (ir_instruction *) node;

+

+      switch (ir->ir_type) {

+      case ir_type_call:

+      case ir_type_loop:

+      case ir_type_loop_jump:

+      case ir_type_return:

+      case ir_type_if:

+	 return NULL;

+

+      case ir_type_function:

+      case ir_type_function_signature:

+	 assert(!"Should not get here.");

+	 return NULL;

+

+      case ir_type_assignment: {

+	 ir_assignment *assign = ir->as_assignment();

+	 ir_variable *assignee = assign->lhs->whole_variable_referenced();

+

+	 if (assignee == var)

+	    return (assign->condition != NULL) ? NULL : assign->rhs;

+

+	 break;

+      }

+

+      default:

+	 break;

+      }

+   }

+

+   return NULL;

+}

+

+

+int

+calculate_iterations(ir_rvalue *from, ir_rvalue *to, ir_rvalue *increment,

+		     enum ir_expression_operation op)

+{

+   if (from == NULL || to == NULL || increment == NULL)

+      return -1;

+

+   void *mem_ctx = ralloc_context(NULL);

+

+   ir_expression *const sub =

+      new(mem_ctx) ir_expression(ir_binop_sub, from->type, to, from);

+

+   ir_expression *const div =

+      new(mem_ctx) ir_expression(ir_binop_div, sub->type, sub, increment);

+

+   ir_constant *iter = div->constant_expression_value();

+

+   if (iter == NULL)

+      return -1;

+

+   if (!iter->type->is_integer()) {

+      ir_rvalue *cast =

+	 new(mem_ctx) ir_expression(ir_unop_f2i, glsl_type::int_type, iter,

+				    NULL);

+

+      iter = cast->constant_expression_value();

+   }

+

+   int iter_value = iter->get_int_component(0);

+

+   /* Make sure that the calculated number of iterations satisfies the exit

+    * condition.  This is needed to catch off-by-one errors and some types of

+    * ill-formed loops.  For example, we need to detect that the following

+    * loop does not have a maximum iteration count.

+    *

+    *    for (float x = 0.0; x != 0.9; x += 0.2)

+    *        ;

+    */

+   const int bias[] = { -1, 0, 1 };

+   bool valid_loop = false;

+

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

+      iter = (increment->type->is_integer())

+	 ? new(mem_ctx) ir_constant(iter_value + bias[i])

+	 : new(mem_ctx) ir_constant(float(iter_value + bias[i]));

+

+      ir_expression *const mul =

+	 new(mem_ctx) ir_expression(ir_binop_mul, increment->type, iter,

+				    increment);

+

+      ir_expression *const add =

+	 new(mem_ctx) ir_expression(ir_binop_add, mul->type, mul, from);

+

+      ir_expression *const cmp =

+	 new(mem_ctx) ir_expression(op, glsl_type::bool_type, add, to);

+

+      ir_constant *const cmp_result = cmp->constant_expression_value();

+

+      assert(cmp_result != NULL);

+      if (cmp_result->get_bool_component(0)) {

+	 iter_value += bias[i];

+	 valid_loop = true;

+	 break;

+      }

+   }

+

+   ralloc_free(mem_ctx);

+   return (valid_loop) ? iter_value : -1;

+}

+

+

+class loop_control_visitor : public ir_hierarchical_visitor {

+public:

+   loop_control_visitor(loop_state *state)

+   {

+      this->state = state;

+      this->progress = false;

+   }

+

+   virtual ir_visitor_status visit_leave(ir_loop *ir);

+

+   loop_state *state;

+

+   bool progress;

+};

+

+

+ir_visitor_status

+loop_control_visitor::visit_leave(ir_loop *ir)

+{

+   loop_variable_state *const ls = this->state->get(ir);

+

+   /* If we've entered a loop that hasn't been analyzed, something really,

+    * really bad has happened.

+    */

+   if (ls == NULL) {

+      assert(ls != NULL);

+      return visit_continue;

+   }

+

+   /* Search the loop terminating conditions for one of the form 'i < c' where

+    * i is a loop induction variable, c is a constant, and < is any relative

+    * operator.

+    */

+   int max_iterations = ls->max_iterations;

+

+   if(ir->from && ir->to && ir->increment)

+      max_iterations = calculate_iterations(ir->from, ir->to, ir->increment, (ir_expression_operation)ir->cmp);

+

+   if(max_iterations < 0)

+      max_iterations = INT_MAX;

+

+   foreach_list(node, &ls->terminators) {

+      loop_terminator *t = (loop_terminator *) node;

+      ir_if *if_stmt = t->ir;

+

+      /* If-statements can be either 'if (expr)' or 'if (deref)'.  We only care

+       * about the former here.

+       */

+      ir_expression *cond = if_stmt->condition->as_expression();

+      if (cond == NULL)

+	 continue;

+

+      switch (cond->operation) {

+      case ir_binop_less:

+      case ir_binop_greater:

+      case ir_binop_lequal:

+      case ir_binop_gequal: {

+	 /* The expressions that we care about will either be of the form

+	  * 'counter < limit' or 'limit < counter'.  Figure out which is

+	  * which.

+	  */

+	 ir_rvalue *counter = cond->operands[0]->as_dereference_variable();

+	 ir_constant *limit = cond->operands[1]->as_constant();

+	 enum ir_expression_operation cmp = cond->operation;

+

+	 if (limit == NULL) {

+	    counter = cond->operands[1]->as_dereference_variable();

+	    limit = cond->operands[0]->as_constant();

+

+	    switch (cmp) {

+	    case ir_binop_less:    cmp = ir_binop_gequal;  break;

+	    case ir_binop_greater: cmp = ir_binop_lequal;  break;

+	    case ir_binop_lequal:  cmp = ir_binop_greater; break;

+	    case ir_binop_gequal:  cmp = ir_binop_less;    break;

+	    default: assert(!"Should not get here.");

+	    }

+	 }

+

+	 if ((counter == NULL) || (limit == NULL))

+	    break;

+

+	 ir_variable *var = counter->variable_referenced();

+

+	 ir_rvalue *init = find_initial_value(ir, var);

+

+	 foreach_list(iv_node, &ls->induction_variables) {

+	    loop_variable *lv = (loop_variable *) iv_node;

+

+	    if (lv->var == var) {

+	       const int iterations = calculate_iterations(init, limit,

+							   lv->increment,

+							   cmp);

+	       if (iterations >= 0) {

+		  /* If the new iteration count is lower than the previously

+		   * believed iteration count, update the loop control values.

+		   */

+		  if (iterations < max_iterations) {

+		     ir->from = init->clone(ir, NULL);

+		     ir->to = limit->clone(ir, NULL);

+		     ir->increment = lv->increment->clone(ir, NULL);

+		     ir->counter = lv->var;

+		     ir->cmp = cmp;

+

+		     max_iterations = iterations;

+		  }

+

+		  /* Remove the conditional break statement.  The loop

+		   * controls are now set such that the exit condition will be

+		   * satisfied.

+		   */

+		  if_stmt->remove();

+

+		  assert(ls->num_loop_jumps > 0);

+		  ls->num_loop_jumps--;

+

+		  this->progress = true;

+	       }

+

+	       break;

+	    }

+	 }

+	 break;

+      }

+

+      default:

+	 break;

+      }

+   }

+

+   /* If we have proven the one of the loop exit conditions is satisifed before

+    * running the loop once, remove the loop.

+    */

+   if (max_iterations == 0)

+      ir->remove();

+   else

+      ls->max_iterations = max_iterations;

+

+   return visit_continue;

+}

+

+

+bool

+set_loop_controls(exec_list *instructions, loop_state *ls)

+{

+   loop_control_visitor v(ls);

+

+   v.run(instructions);

+

+   return v.progress;

+}

diff --git a/mesalib/src/glsl/lower_mat_op_to_vec.cpp b/mesalib/src/glsl/lower_mat_op_to_vec.cpp
index bdc53a1f8..dc46ed417 100644
--- a/mesalib/src/glsl/lower_mat_op_to_vec.cpp
+++ b/mesalib/src/glsl/lower_mat_op_to_vec.cpp
@@ -1,493 +1,490 @@
-/*
- * 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.
- */
-
-/**
- * \file lower_mat_op_to_vec.cpp
- *
- * Breaks matrix operation expressions down to a series of vector operations.
- *
- * Generally this is how we have to codegen matrix operations for a
- * GPU, so this gives us the chance to constant fold operations on a
- * column or row.
- */
-
-#include "ir.h"
-#include "ir_expression_flattening.h"
-#include "glsl_types.h"
-
-using std::abort;
-using std::printf;
-
-class ir_mat_op_to_vec_visitor : public ir_hierarchical_visitor {
-public:
-   ir_mat_op_to_vec_visitor()
-   {
-      this->made_progress = false;
-      this->mem_ctx = NULL;
-   }
-
-   ir_visitor_status visit_leave(ir_assignment *);
-
-   ir_dereference *get_column(ir_variable *var, int col);
-   ir_rvalue *get_element(ir_variable *var, int col, int row);
-
-   void do_mul_mat_mat(ir_variable *result_var,
-		       ir_variable *a_var, ir_variable *b_var);
-   void do_mul_mat_vec(ir_variable *result_var,
-		       ir_variable *a_var, ir_variable *b_var);
-   void do_mul_vec_mat(ir_variable *result_var,
-		       ir_variable *a_var, ir_variable *b_var);
-   void do_mul_mat_scalar(ir_variable *result_var,
-			  ir_variable *a_var, ir_variable *b_var);
-   void do_equal_mat_mat(ir_variable *result_var, ir_variable *a_var,
-			 ir_variable *b_var, bool test_equal);
-
-   void *mem_ctx;
-   bool made_progress;
-};
-
-static bool
-mat_op_to_vec_predicate(ir_instruction *ir)
-{
-   ir_expression *expr = ir->as_expression();
-   unsigned int i;
-
-   if (!expr)
-      return false;
-
-   for (i = 0; i < expr->get_num_operands(); i++) {
-      if (expr->operands[i]->type->is_matrix())
-	 return true;
-   }
-
-   return false;
-}
-
-bool
-do_mat_op_to_vec(exec_list *instructions)
-{
-   ir_mat_op_to_vec_visitor v;
-
-   /* Pull out any matrix expression to a separate assignment to a
-    * temp.  This will make our handling of the breakdown to
-    * operations on the matrix's vector components much easier.
-    */
-   do_expression_flattening(instructions, mat_op_to_vec_predicate);
-
-   visit_list_elements(&v, instructions);
-
-   return v.made_progress;
-}
-
-ir_rvalue *
-ir_mat_op_to_vec_visitor::get_element(ir_variable *var, int col, int row)
-{
-   ir_dereference *deref;
-
-   deref = new(mem_ctx) ir_dereference_variable(var);
-
-   if (var->type->is_matrix()) {
-      deref = new(mem_ctx) ir_dereference_array(var,
-						new(mem_ctx) ir_constant(col));
-   } else {
-      assert(col == 0);
-   }
-
-   return new(mem_ctx) ir_swizzle(deref, row, 0, 0, 0, 1);
-}
-
-ir_dereference *
-ir_mat_op_to_vec_visitor::get_column(ir_variable *var, int row)
-{
-   ir_dereference *deref;
-
-   if (!var->type->is_matrix()) {
-      deref = new(mem_ctx) ir_dereference_variable(var);
-   } else {
-      deref = new(mem_ctx) ir_dereference_variable(var);
-      deref = new(mem_ctx) ir_dereference_array(deref,
-						new(mem_ctx) ir_constant(row));
-   }
-
-   return deref;
-}
-
-void
-ir_mat_op_to_vec_visitor::do_mul_mat_mat(ir_variable *result_var,
-					 ir_variable *a_var,
-					 ir_variable *b_var)
-{
-   int b_col, i;
-   ir_assignment *assign;
-   ir_expression *expr;
-
-   for (b_col = 0; b_col < b_var->type->matrix_columns; b_col++) {
-      ir_rvalue *a = get_column(a_var, 0);
-      ir_rvalue *b = get_element(b_var, b_col, 0);
-
-      /* first column */
-      expr = new(mem_ctx) ir_expression(ir_binop_mul,
-					a->type,
-					a,
-					b);
-
-      /* following columns */
-      for (i = 1; i < a_var->type->matrix_columns; i++) {
-	 ir_expression *mul_expr;
-
-	 a = get_column(a_var, i);
-	 b = get_element(b_var, b_col, i);
-
-	 mul_expr = new(mem_ctx) ir_expression(ir_binop_mul,
-					       a->type,
-					       a,
-					       b);
-	 expr = new(mem_ctx) ir_expression(ir_binop_add,
-					   a->type,
-					   expr,
-					   mul_expr);
-      }
-
-      ir_rvalue *result = get_column(result_var, b_col);
-      assign = new(mem_ctx) ir_assignment(result,
-					  expr,
-					  NULL);
-      base_ir->insert_before(assign);
-   }
-}
-
-void
-ir_mat_op_to_vec_visitor::do_mul_mat_vec(ir_variable *result_var,
-					 ir_variable *a_var,
-					 ir_variable *b_var)
-{
-   int i;
-   ir_rvalue *a = get_column(a_var, 0);
-   ir_rvalue *b = get_element(b_var, 0, 0);
-   ir_assignment *assign;
-   ir_expression *expr;
-
-   /* first column */
-   expr = new(mem_ctx) ir_expression(ir_binop_mul,
-				     result_var->type,
-				     a,
-				     b);
-
-   /* following columns */
-   for (i = 1; i < a_var->type->matrix_columns; i++) {
-      ir_expression *mul_expr;
-
-      a = get_column(a_var, i);
-      b = get_element(b_var, 0, i);
-
-      mul_expr = new(mem_ctx) ir_expression(ir_binop_mul,
-					    result_var->type,
-					    a,
-					    b);
-      expr = new(mem_ctx) ir_expression(ir_binop_add,
-					result_var->type,
-					expr,
-					mul_expr);
-   }
-
-   ir_rvalue *result = new(mem_ctx) ir_dereference_variable(result_var);
-   assign = new(mem_ctx) ir_assignment(result,
-				       expr,
-				       NULL);
-   base_ir->insert_before(assign);
-}
-
-void
-ir_mat_op_to_vec_visitor::do_mul_vec_mat(ir_variable *result_var,
-					 ir_variable *a_var,
-					 ir_variable *b_var)
-{
-   int i;
-
-   for (i = 0; i < b_var->type->matrix_columns; i++) {
-      ir_rvalue *a = new(mem_ctx) ir_dereference_variable(a_var);
-      ir_rvalue *b = get_column(b_var, i);
-      ir_rvalue *result;
-      ir_expression *column_expr;
-      ir_assignment *column_assign;
-
-      result = new(mem_ctx) ir_dereference_variable(result_var);
-      result = new(mem_ctx) ir_swizzle(result, i, 0, 0, 0, 1);
-
-      column_expr = new(mem_ctx) ir_expression(ir_binop_dot,
-					       result->type,
-					       a,
-					       b);
-
-      column_assign = new(mem_ctx) ir_assignment(result,
-						 column_expr,
-						 NULL);
-      base_ir->insert_before(column_assign);
-   }
-}
-
-void
-ir_mat_op_to_vec_visitor::do_mul_mat_scalar(ir_variable *result_var,
-					    ir_variable *a_var,
-					    ir_variable *b_var)
-{
-   int i;
-
-   for (i = 0; i < a_var->type->matrix_columns; i++) {
-      ir_rvalue *a = get_column(a_var, i);
-      ir_rvalue *b = new(mem_ctx) ir_dereference_variable(b_var);
-      ir_rvalue *result = get_column(result_var, i);
-      ir_expression *column_expr;
-      ir_assignment *column_assign;
-
-      column_expr = new(mem_ctx) ir_expression(ir_binop_mul,
-					       result->type,
-					       a,
-					       b);
-
-      column_assign = new(mem_ctx) ir_assignment(result,
-						 column_expr,
-						 NULL);
-      base_ir->insert_before(column_assign);
-   }
-}
-
-void
-ir_mat_op_to_vec_visitor::do_equal_mat_mat(ir_variable *result_var,
-					   ir_variable *a_var,
-					   ir_variable *b_var,
-					   bool test_equal)
-{
-   /* This essentially implements the following GLSL:
-    *
-    * bool equal(mat4 a, mat4 b)
-    * {
-    *   return !any(bvec4(a[0] != b[0],
-    *                     a[1] != b[1],
-    *                     a[2] != b[2],
-    *                     a[3] != b[3]);
-    * }
-    *
-    * bool nequal(mat4 a, mat4 b)
-    * {
-    *   return any(bvec4(a[0] != b[0],
-    *                    a[1] != b[1],
-    *                    a[2] != b[2],
-    *                    a[3] != b[3]);
-    * }
-    */
-   const unsigned columns = a_var->type->matrix_columns;
-   const glsl_type *const bvec_type =
-      glsl_type::get_instance(GLSL_TYPE_BOOL, columns, 1);
-
-   ir_variable *const tmp_bvec =
-      new(this->mem_ctx) ir_variable(bvec_type, "mat_cmp_bvec",
-				     ir_var_temporary);
-   this->base_ir->insert_before(tmp_bvec);
-
-   for (unsigned i = 0; i < columns; i++) {
-      ir_dereference *const op0 = get_column(a_var, i);
-      ir_dereference *const op1 = get_column(b_var, i);
-
-      ir_expression *const cmp =
-	 new(this->mem_ctx) ir_expression(ir_binop_any_nequal,
-					  glsl_type::bool_type, op0, op1);
-
-      ir_dereference *const lhs =
-	 new(this->mem_ctx) ir_dereference_variable(tmp_bvec);
-
-      ir_assignment *const assign =
-	 new(this->mem_ctx) ir_assignment(lhs, cmp, NULL, (1U << i));
-
-      this->base_ir->insert_before(assign);
-   }
-
-   ir_rvalue *const val =
-      new(this->mem_ctx) ir_dereference_variable(tmp_bvec);
-
-   ir_expression *any =
-      new(this->mem_ctx) ir_expression(ir_unop_any, glsl_type::bool_type,
-				       val, NULL);
-
-   if (test_equal)
-      any = new(this->mem_ctx) ir_expression(ir_unop_logic_not,
-					     glsl_type::bool_type,
-					     any, NULL);
-
-   ir_rvalue *const result =
-      new(this->mem_ctx) ir_dereference_variable(result_var);
-
-   ir_assignment *const assign =
-	 new(mem_ctx) ir_assignment(result, any, NULL);
-   base_ir->insert_before(assign);
-}
-
-static bool
-has_matrix_operand(const ir_expression *expr, unsigned &columns)
-{
-   for (unsigned i = 0; i < expr->get_num_operands(); i++) {
-      if (expr->operands[i]->type->is_matrix()) {
-	 columns = expr->operands[i]->type->matrix_columns;
-	 return true;
-      }
-   }
-
-   return false;
-}
-
-
-ir_visitor_status
-ir_mat_op_to_vec_visitor::visit_leave(ir_assignment *orig_assign)
-{
-   ir_expression *orig_expr = orig_assign->rhs->as_expression();
-   unsigned int i, matrix_columns = 1;
-   ir_variable *op_var[2];
-
-   if (!orig_expr)
-      return visit_continue;
-
-   if (!has_matrix_operand(orig_expr, matrix_columns))
-      return visit_continue;
-
-   assert(orig_expr->get_num_operands() <= 2);
-
-   mem_ctx = ralloc_parent(orig_assign);
-
-   ir_dereference_variable *lhs_deref =
-      orig_assign->lhs->as_dereference_variable();
-   assert(lhs_deref);
-
-   ir_variable *result_var = lhs_deref->var;
-
-   /* Store the expression operands in temps so we can use them
-    * multiple times.
-    */
-   for (i = 0; i < orig_expr->get_num_operands(); i++) {
-      ir_assignment *assign;
-
-      op_var[i] = new(mem_ctx) ir_variable(orig_expr->operands[i]->type,
-					   "mat_op_to_vec",
-					   ir_var_temporary);
-      base_ir->insert_before(op_var[i]);
-
-      lhs_deref = new(mem_ctx) ir_dereference_variable(op_var[i]);
-      assign = new(mem_ctx) ir_assignment(lhs_deref,
-					  orig_expr->operands[i],
-					  NULL);
-      base_ir->insert_before(assign);
-   }
-
-   /* OK, time to break down this matrix operation. */
-   switch (orig_expr->operation) {
-   case ir_unop_neg: {
-      const unsigned mask = (1U << result_var->type->vector_elements) - 1;
-
-      /* Apply the operation to each column.*/
-      for (i = 0; i < matrix_columns; i++) {
-	 ir_rvalue *op0 = get_column(op_var[0], i);
-	 ir_dereference *result = get_column(result_var, i);
-	 ir_expression *column_expr;
-	 ir_assignment *column_assign;
-
-	 column_expr = new(mem_ctx) ir_expression(orig_expr->operation,
-						  result->type,
-						  op0,
-						  NULL);
-
-	 column_assign = new(mem_ctx) ir_assignment(result,
-						    column_expr,
-						    NULL,
-						    mask);
-	 assert(column_assign->write_mask != 0);
-	 base_ir->insert_before(column_assign);
-      }
-      break;
-   }
-   case ir_binop_add:
-   case ir_binop_sub:
-   case ir_binop_div:
-   case ir_binop_mod: {
-      const unsigned mask = (1U << result_var->type->vector_elements) - 1;
-
-      /* For most operations, the matrix version is just going
-       * column-wise through and applying the operation to each column
-       * if available.
-       */
-      for (i = 0; i < matrix_columns; i++) {
-	 ir_rvalue *op0 = get_column(op_var[0], i);
-	 ir_rvalue *op1 = get_column(op_var[1], i);
-	 ir_dereference *result = get_column(result_var, i);
-	 ir_expression *column_expr;
-	 ir_assignment *column_assign;
-
-	 column_expr = new(mem_ctx) ir_expression(orig_expr->operation,
-						  result->type,
-						  op0,
-						  op1);
-
-	 column_assign = new(mem_ctx) ir_assignment(result,
-						    column_expr,
-						    NULL,
-						    mask);
-	 assert(column_assign->write_mask != 0);
-	 base_ir->insert_before(column_assign);
-      }
-      break;
-   }
-   case ir_binop_mul:
-      if (op_var[0]->type->is_matrix()) {
-	 if (op_var[1]->type->is_matrix()) {
-	    do_mul_mat_mat(result_var, op_var[0], op_var[1]);
-	 } else if (op_var[1]->type->is_vector()) {
-	    do_mul_mat_vec(result_var, op_var[0], op_var[1]);
-	 } else {
-	    assert(op_var[1]->type->is_scalar());
-	    do_mul_mat_scalar(result_var, op_var[0], op_var[1]);
-	 }
-      } else {
-	 assert(op_var[1]->type->is_matrix());
-	 if (op_var[0]->type->is_vector()) {
-	    do_mul_vec_mat(result_var, op_var[0], op_var[1]);
-	 } else {
-	    assert(op_var[0]->type->is_scalar());
-	    do_mul_mat_scalar(result_var, op_var[1], op_var[0]);
-	 }
-      }
-      break;
-
-   case ir_binop_all_equal:
-   case ir_binop_any_nequal:
-      do_equal_mat_mat(result_var, op_var[1], op_var[0],
-		       (orig_expr->operation == ir_binop_all_equal));
-      break;
-
-   default:
-      printf("FINISHME: Handle matrix operation for %s\n",
-	     orig_expr->operator_string());
-      abort();
-   }
-   orig_assign->remove();
-   this->made_progress = true;
-
-   return visit_continue;
-}
+/*

+ * 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.

+ */

+

+/**

+ * \file lower_mat_op_to_vec.cpp

+ *

+ * Breaks matrix operation expressions down to a series of vector operations.

+ *

+ * Generally this is how we have to codegen matrix operations for a

+ * GPU, so this gives us the chance to constant fold operations on a

+ * column or row.

+ */

+

+#include "ir.h"

+#include "ir_expression_flattening.h"

+#include "glsl_types.h"

+

+class ir_mat_op_to_vec_visitor : public ir_hierarchical_visitor {

+public:

+   ir_mat_op_to_vec_visitor()

+   {

+      this->made_progress = false;

+      this->mem_ctx = NULL;

+   }

+

+   ir_visitor_status visit_leave(ir_assignment *);

+

+   ir_dereference *get_column(ir_variable *var, int col);

+   ir_rvalue *get_element(ir_variable *var, int col, int row);

+

+   void do_mul_mat_mat(ir_variable *result_var,

+		       ir_variable *a_var, ir_variable *b_var);

+   void do_mul_mat_vec(ir_variable *result_var,

+		       ir_variable *a_var, ir_variable *b_var);

+   void do_mul_vec_mat(ir_variable *result_var,

+		       ir_variable *a_var, ir_variable *b_var);

+   void do_mul_mat_scalar(ir_variable *result_var,

+			  ir_variable *a_var, ir_variable *b_var);

+   void do_equal_mat_mat(ir_variable *result_var, ir_variable *a_var,

+			 ir_variable *b_var, bool test_equal);

+

+   void *mem_ctx;

+   bool made_progress;

+};

+

+static bool

+mat_op_to_vec_predicate(ir_instruction *ir)

+{

+   ir_expression *expr = ir->as_expression();

+   unsigned int i;

+

+   if (!expr)

+      return false;

+

+   for (i = 0; i < expr->get_num_operands(); i++) {

+      if (expr->operands[i]->type->is_matrix())

+	 return true;

+   }

+

+   return false;

+}

+

+bool

+do_mat_op_to_vec(exec_list *instructions)

+{

+   ir_mat_op_to_vec_visitor v;

+

+   /* Pull out any matrix expression to a separate assignment to a

+    * temp.  This will make our handling of the breakdown to

+    * operations on the matrix's vector components much easier.

+    */

+   do_expression_flattening(instructions, mat_op_to_vec_predicate);

+

+   visit_list_elements(&v, instructions);

+

+   return v.made_progress;

+}

+

+ir_rvalue *

+ir_mat_op_to_vec_visitor::get_element(ir_variable *var, int col, int row)

+{

+   ir_dereference *deref;

+

+   deref = new(mem_ctx) ir_dereference_variable(var);

+

+   if (var->type->is_matrix()) {

+      deref = new(mem_ctx) ir_dereference_array(var,

+						new(mem_ctx) ir_constant(col));

+   } else {

+      assert(col == 0);

+   }

+

+   return new(mem_ctx) ir_swizzle(deref, row, 0, 0, 0, 1);

+}

+

+ir_dereference *

+ir_mat_op_to_vec_visitor::get_column(ir_variable *var, int row)

+{

+   ir_dereference *deref;

+

+   if (!var->type->is_matrix()) {

+      deref = new(mem_ctx) ir_dereference_variable(var);

+   } else {

+      deref = new(mem_ctx) ir_dereference_variable(var);

+      deref = new(mem_ctx) ir_dereference_array(deref,

+						new(mem_ctx) ir_constant(row));

+   }

+

+   return deref;

+}

+

+void

+ir_mat_op_to_vec_visitor::do_mul_mat_mat(ir_variable *result_var,

+					 ir_variable *a_var,

+					 ir_variable *b_var)

+{

+   int b_col, i;

+   ir_assignment *assign;

+   ir_expression *expr;

+

+   for (b_col = 0; b_col < b_var->type->matrix_columns; b_col++) {

+      ir_rvalue *a = get_column(a_var, 0);

+      ir_rvalue *b = get_element(b_var, b_col, 0);

+

+      /* first column */

+      expr = new(mem_ctx) ir_expression(ir_binop_mul,

+					a->type,

+					a,

+					b);

+

+      /* following columns */

+      for (i = 1; i < a_var->type->matrix_columns; i++) {

+	 ir_expression *mul_expr;

+

+	 a = get_column(a_var, i);

+	 b = get_element(b_var, b_col, i);

+

+	 mul_expr = new(mem_ctx) ir_expression(ir_binop_mul,

+					       a->type,

+					       a,

+					       b);

+	 expr = new(mem_ctx) ir_expression(ir_binop_add,

+					   a->type,

+					   expr,

+					   mul_expr);

+      }

+

+      ir_rvalue *result = get_column(result_var, b_col);

+      assign = new(mem_ctx) ir_assignment(result,

+					  expr,

+					  NULL);

+      base_ir->insert_before(assign);

+   }

+}

+

+void

+ir_mat_op_to_vec_visitor::do_mul_mat_vec(ir_variable *result_var,

+					 ir_variable *a_var,

+					 ir_variable *b_var)

+{

+   int i;

+   ir_rvalue *a = get_column(a_var, 0);

+   ir_rvalue *b = get_element(b_var, 0, 0);

+   ir_assignment *assign;

+   ir_expression *expr;

+

+   /* first column */

+   expr = new(mem_ctx) ir_expression(ir_binop_mul,

+				     result_var->type,

+				     a,

+				     b);

+

+   /* following columns */

+   for (i = 1; i < a_var->type->matrix_columns; i++) {

+      ir_expression *mul_expr;

+

+      a = get_column(a_var, i);

+      b = get_element(b_var, 0, i);

+

+      mul_expr = new(mem_ctx) ir_expression(ir_binop_mul,

+					    result_var->type,

+					    a,

+					    b);

+      expr = new(mem_ctx) ir_expression(ir_binop_add,

+					result_var->type,

+					expr,

+					mul_expr);

+   }

+

+   ir_rvalue *result = new(mem_ctx) ir_dereference_variable(result_var);

+   assign = new(mem_ctx) ir_assignment(result,

+				       expr,

+				       NULL);

+   base_ir->insert_before(assign);

+}

+

+void

+ir_mat_op_to_vec_visitor::do_mul_vec_mat(ir_variable *result_var,

+					 ir_variable *a_var,

+					 ir_variable *b_var)

+{

+   int i;

+

+   for (i = 0; i < b_var->type->matrix_columns; i++) {

+      ir_rvalue *a = new(mem_ctx) ir_dereference_variable(a_var);

+      ir_rvalue *b = get_column(b_var, i);

+      ir_rvalue *result;

+      ir_expression *column_expr;

+      ir_assignment *column_assign;

+

+      result = new(mem_ctx) ir_dereference_variable(result_var);

+      result = new(mem_ctx) ir_swizzle(result, i, 0, 0, 0, 1);

+

+      column_expr = new(mem_ctx) ir_expression(ir_binop_dot,

+					       result->type,

+					       a,

+					       b);

+

+      column_assign = new(mem_ctx) ir_assignment(result,

+						 column_expr,

+						 NULL);

+      base_ir->insert_before(column_assign);

+   }

+}

+

+void

+ir_mat_op_to_vec_visitor::do_mul_mat_scalar(ir_variable *result_var,

+					    ir_variable *a_var,

+					    ir_variable *b_var)

+{

+   int i;

+

+   for (i = 0; i < a_var->type->matrix_columns; i++) {

+      ir_rvalue *a = get_column(a_var, i);

+      ir_rvalue *b = new(mem_ctx) ir_dereference_variable(b_var);

+      ir_rvalue *result = get_column(result_var, i);

+      ir_expression *column_expr;

+      ir_assignment *column_assign;

+

+      column_expr = new(mem_ctx) ir_expression(ir_binop_mul,

+					       result->type,

+					       a,

+					       b);

+

+      column_assign = new(mem_ctx) ir_assignment(result,

+						 column_expr,

+						 NULL);

+      base_ir->insert_before(column_assign);

+   }

+}

+

+void

+ir_mat_op_to_vec_visitor::do_equal_mat_mat(ir_variable *result_var,

+					   ir_variable *a_var,

+					   ir_variable *b_var,

+					   bool test_equal)

+{

+   /* This essentially implements the following GLSL:

+    *

+    * bool equal(mat4 a, mat4 b)

+    * {

+    *   return !any(bvec4(a[0] != b[0],

+    *                     a[1] != b[1],

+    *                     a[2] != b[2],

+    *                     a[3] != b[3]);

+    * }

+    *

+    * bool nequal(mat4 a, mat4 b)

+    * {

+    *   return any(bvec4(a[0] != b[0],

+    *                    a[1] != b[1],

+    *                    a[2] != b[2],

+    *                    a[3] != b[3]);

+    * }

+    */

+   const unsigned columns = a_var->type->matrix_columns;

+   const glsl_type *const bvec_type =

+      glsl_type::get_instance(GLSL_TYPE_BOOL, columns, 1);

+

+   ir_variable *const tmp_bvec =

+      new(this->mem_ctx) ir_variable(bvec_type, "mat_cmp_bvec",

+				     ir_var_temporary);

+   this->base_ir->insert_before(tmp_bvec);

+

+   for (unsigned i = 0; i < columns; i++) {

+      ir_dereference *const op0 = get_column(a_var, i);

+      ir_dereference *const op1 = get_column(b_var, i);

+

+      ir_expression *const cmp =

+	 new(this->mem_ctx) ir_expression(ir_binop_any_nequal,

+					  glsl_type::bool_type, op0, op1);

+

+      ir_dereference *const lhs =

+	 new(this->mem_ctx) ir_dereference_variable(tmp_bvec);

+

+      ir_assignment *const assign =

+	 new(this->mem_ctx) ir_assignment(lhs, cmp, NULL, (1U << i));

+

+      this->base_ir->insert_before(assign);

+   }

+

+   ir_rvalue *const val =

+      new(this->mem_ctx) ir_dereference_variable(tmp_bvec);

+

+   ir_expression *any =

+      new(this->mem_ctx) ir_expression(ir_unop_any, glsl_type::bool_type,

+				       val, NULL);

+

+   if (test_equal)

+      any = new(this->mem_ctx) ir_expression(ir_unop_logic_not,

+					     glsl_type::bool_type,

+					     any, NULL);

+

+   ir_rvalue *const result =

+      new(this->mem_ctx) ir_dereference_variable(result_var);

+

+   ir_assignment *const assign =

+	 new(mem_ctx) ir_assignment(result, any, NULL);

+   base_ir->insert_before(assign);

+}

+

+static bool

+has_matrix_operand(const ir_expression *expr, unsigned &columns)

+{

+   for (unsigned i = 0; i < expr->get_num_operands(); i++) {

+      if (expr->operands[i]->type->is_matrix()) {

+	 columns = expr->operands[i]->type->matrix_columns;

+	 return true;

+      }

+   }

+

+   return false;

+}

+

+

+ir_visitor_status

+ir_mat_op_to_vec_visitor::visit_leave(ir_assignment *orig_assign)

+{

+   ir_expression *orig_expr = orig_assign->rhs->as_expression();

+   unsigned int i, matrix_columns = 1;

+   ir_variable *op_var[2];

+

+   if (!orig_expr)

+      return visit_continue;

+

+   if (!has_matrix_operand(orig_expr, matrix_columns))

+      return visit_continue;

+

+   assert(orig_expr->get_num_operands() <= 2);

+

+   mem_ctx = ralloc_parent(orig_assign);

+

+   ir_dereference_variable *lhs_deref =

+      orig_assign->lhs->as_dereference_variable();

+   assert(lhs_deref);

+

+   ir_variable *result_var = lhs_deref->var;

+

+   /* Store the expression operands in temps so we can use them

+    * multiple times.

+    */

+   for (i = 0; i < orig_expr->get_num_operands(); i++) {

+      ir_assignment *assign;

+

+      op_var[i] = new(mem_ctx) ir_variable(orig_expr->operands[i]->type,

+					   "mat_op_to_vec",

+					   ir_var_temporary);

+      base_ir->insert_before(op_var[i]);

+

+      lhs_deref = new(mem_ctx) ir_dereference_variable(op_var[i]);

+      assign = new(mem_ctx) ir_assignment(lhs_deref,

+					  orig_expr->operands[i],

+					  NULL);

+      base_ir->insert_before(assign);

+   }

+

+   /* OK, time to break down this matrix operation. */

+   switch (orig_expr->operation) {

+   case ir_unop_neg: {

+      const unsigned mask = (1U << result_var->type->vector_elements) - 1;

+

+      /* Apply the operation to each column.*/

+      for (i = 0; i < matrix_columns; i++) {

+	 ir_rvalue *op0 = get_column(op_var[0], i);

+	 ir_dereference *result = get_column(result_var, i);

+	 ir_expression *column_expr;

+	 ir_assignment *column_assign;

+

+	 column_expr = new(mem_ctx) ir_expression(orig_expr->operation,

+						  result->type,

+						  op0,

+						  NULL);

+

+	 column_assign = new(mem_ctx) ir_assignment(result,

+						    column_expr,

+						    NULL,

+						    mask);

+	 assert(column_assign->write_mask != 0);

+	 base_ir->insert_before(column_assign);

+      }

+      break;

+   }

+   case ir_binop_add:

+   case ir_binop_sub:

+   case ir_binop_div:

+   case ir_binop_mod: {

+      const unsigned mask = (1U << result_var->type->vector_elements) - 1;

+

+      /* For most operations, the matrix version is just going

+       * column-wise through and applying the operation to each column

+       * if available.

+       */

+      for (i = 0; i < matrix_columns; i++) {

+	 ir_rvalue *op0 = get_column(op_var[0], i);

+	 ir_rvalue *op1 = get_column(op_var[1], i);

+	 ir_dereference *result = get_column(result_var, i);

+	 ir_expression *column_expr;

+	 ir_assignment *column_assign;

+

+	 column_expr = new(mem_ctx) ir_expression(orig_expr->operation,

+						  result->type,

+						  op0,

+						  op1);

+

+	 column_assign = new(mem_ctx) ir_assignment(result,

+						    column_expr,

+						    NULL,

+						    mask);

+	 assert(column_assign->write_mask != 0);

+	 base_ir->insert_before(column_assign);

+      }

+      break;

+   }

+   case ir_binop_mul:

+      if (op_var[0]->type->is_matrix()) {

+	 if (op_var[1]->type->is_matrix()) {

+	    do_mul_mat_mat(result_var, op_var[0], op_var[1]);

+	 } else if (op_var[1]->type->is_vector()) {

+	    do_mul_mat_vec(result_var, op_var[0], op_var[1]);

+	 } else {

+	    assert(op_var[1]->type->is_scalar());

+	    do_mul_mat_scalar(result_var, op_var[0], op_var[1]);

+	 }

+      } else {

+	 assert(op_var[1]->type->is_matrix());

+	 if (op_var[0]->type->is_vector()) {

+	    do_mul_vec_mat(result_var, op_var[0], op_var[1]);

+	 } else {

+	    assert(op_var[0]->type->is_scalar());

+	    do_mul_mat_scalar(result_var, op_var[1], op_var[0]);

+	 }

+      }

+      break;

+

+   case ir_binop_all_equal:

+   case ir_binop_any_nequal:

+      do_equal_mat_mat(result_var, op_var[1], op_var[0],

+		       (orig_expr->operation == ir_binop_all_equal));

+      break;

+

+   default:

+      printf("FINISHME: Handle matrix operation for %s\n",

+	     orig_expr->operator_string());

+      abort();

+   }

+   orig_assign->remove();

+   this->made_progress = true;

+

+   return visit_continue;

+}

diff --git a/mesalib/src/glsl/main.cpp b/mesalib/src/glsl/main.cpp
index 6321a4a17..873a4fa16 100644
--- a/mesalib/src/glsl/main.cpp
+++ b/mesalib/src/glsl/main.cpp
@@ -1,347 +1,345 @@
-/*
- * Copyright © 2008, 2009 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 <cstdlib>
-#include <cstdio>
-#include <io.h>
-
-#ifdef _MSC_VER
-#define __STDC__ 1
-#include <getopt.h>
-#define open _open
-#define read _read
-#define fstat _fstat
-#define stat _stat
-#define close _close
-#define O_RDONLY _O_RDONLY
-#endif
-
-#include "ast.h"
-#include "glsl_parser_extras.h"
-#include "glsl_parser.h"
-#include "ir_optimization.h"
-#include "ir_print_visitor.h"
-#include "program.h"
-#include "loop_analysis.h"
-
-extern "C" struct gl_shader *
-_mesa_new_shader(struct gl_context *ctx, GLuint name, GLenum type);
-
-extern "C" void
-_mesa_reference_shader(struct gl_context *ctx, struct gl_shader **ptr,
-                       struct gl_shader *sh);
-
-/* Copied from shader_api.c for the stand-alone compiler.
- */
-void
-_mesa_reference_shader(struct gl_context *ctx, struct gl_shader **ptr,
-                       struct gl_shader *sh)
-{
-   *ptr = sh;
-}
-
-struct gl_shader *
-_mesa_new_shader(struct gl_context *ctx, GLuint name, GLenum type)
-{
-   struct gl_shader *shader;
-
-   (void) ctx;
-
-   assert(type == GL_FRAGMENT_SHADER || type == GL_VERTEX_SHADER);
-   shader = rzalloc(NULL, struct gl_shader);
-   if (shader) {
-      shader->Type = type;
-      shader->Name = name;
-      shader->RefCount = 1;
-   }
-   return shader;
-}
-
-static void
-initialize_context(struct gl_context *ctx, gl_api api)
-{
-   memset(ctx, 0, sizeof(*ctx));
-
-   ctx->API = api;
-
-   ctx->Extensions.ARB_ES2_compatibility = GL_TRUE;
-   ctx->Extensions.ARB_draw_buffers = GL_TRUE;
-   ctx->Extensions.ARB_draw_instanced = GL_TRUE;
-   ctx->Extensions.ARB_fragment_coord_conventions = GL_TRUE;
-   ctx->Extensions.EXT_texture_array = GL_TRUE;
-   ctx->Extensions.NV_texture_rectangle = GL_TRUE;
-
-   /* GLSL 1.30 isn't fully supported, but we need to advertise 1.30 so that
-    * the built-in functions for 1.30 can be built.
-    */
-   ctx->Const.GLSLVersion = 130;
-
-   /* 1.10 minimums. */
-   ctx->Const.MaxLights = 8;
-   ctx->Const.MaxClipPlanes = 8;
-   ctx->Const.MaxTextureUnits = 2;
-
-   /* More than the 1.10 minimum to appease parser tests taken from
-    * apps that (hopefully) already checked the number of coords.
-    */
-   ctx->Const.MaxTextureCoordUnits = 4;
-
-   ctx->Const.VertexProgram.MaxAttribs = 16;
-   ctx->Const.VertexProgram.MaxUniformComponents = 512;
-   ctx->Const.MaxVarying = 8;
-   ctx->Const.MaxVertexTextureImageUnits = 0;
-   ctx->Const.MaxCombinedTextureImageUnits = 2;
-   ctx->Const.MaxTextureImageUnits = 2;
-   ctx->Const.FragmentProgram.MaxUniformComponents = 64;
-
-   ctx->Const.MaxDrawBuffers = 2;
-
-   ctx->Driver.NewShader = _mesa_new_shader;
-}
-
-/* Returned string will have 'ctx' as its ralloc owner. */
-static char *
-load_text_file(void *ctx, const char *file_name)
-{
-	char *text = NULL;
-	size_t size;
-	size_t total_read = 0;
-	FILE *fp = fopen(file_name, "rb");
-
-	if (!fp) {
-		return NULL;
-	}
-
-	fseek(fp, 0L, SEEK_END);
-	size = ftell(fp);
-	fseek(fp, 0L, SEEK_SET);
-
-	text = (char *) ralloc_size(ctx, size + 1);
-	if (text != NULL) {
-		do {
-			size_t bytes = fread(text + total_read,
-					     1, size - total_read, fp);
-			if (bytes < size - total_read) {
-				free(text);
-				text = NULL;
-				break;
-			}
-
-			if (bytes == 0) {
-				break;
-			}
-
-			total_read += bytes;
-		} while (total_read < size);
-
-		text[total_read] = '\0';
-	}
-
-	fclose(fp);
-
-	return text;
-}
-
-int glsl_es = 0;
-int dump_ast = 0;
-int dump_hir = 0;
-int dump_lir = 0;
-int do_link = 0;
-
-const struct option compiler_opts[] = {
-   { "glsl-es",  0, &glsl_es,  1 },
-   { "dump-ast", 0, &dump_ast, 1 },
-   { "dump-hir", 0, &dump_hir, 1 },
-   { "dump-lir", 0, &dump_lir, 1 },
-   { "link",     0, &do_link,  1 },
-   { NULL, 0, NULL, 0 }
-};
-
-/**
- * \brief Print proper usage and exit with failure.
- */
-void
-usage_fail(const char *name)
-{
-
-   const char *header =
-      "usage: %s [options] <file.vert | file.geom | file.frag>\n"
-      "\n"
-      "Possible options are:\n";
-   printf(header, name, name);
-   for (const struct option *o = compiler_opts; o->name != 0; ++o) {
-      printf("    --%s\n", o->name);
-   }
-   exit(EXIT_FAILURE);
-}
-
-
-void
-compile_shader(struct gl_context *ctx, struct gl_shader *shader)
-{
-   struct _mesa_glsl_parse_state *state =
-      new(shader) _mesa_glsl_parse_state(ctx, shader->Type, shader);
-
-   const char *source = shader->Source;
-   state->error = preprocess(state, &source, &state->info_log,
-			     state->extensions, ctx->API) != 0;
-
-   if (!state->error) {
-      _mesa_glsl_lexer_ctor(state, source);
-      _mesa_glsl_parse(state);
-      _mesa_glsl_lexer_dtor(state);
-   }
-
-   if (dump_ast) {
-      foreach_list_const(n, &state->translation_unit) {
-	 ast_node *ast = exec_node_data(ast_node, n, link);
-	 ast->print();
-      }
-      printf("\n\n");
-   }
-
-   shader->ir = new(shader) exec_list;
-   if (!state->error && !state->translation_unit.is_empty())
-      _mesa_ast_to_hir(shader->ir, state);
-
-   /* Print out the unoptimized IR. */
-   if (!state->error && dump_hir) {
-      validate_ir_tree(shader->ir);
-      _mesa_print_ir(shader->ir, state);
-   }
-
-   /* Optimization passes */
-   if (!state->error && !shader->ir->is_empty()) {
-      bool progress;
-      do {
-	 progress = do_common_optimization(shader->ir, false, 32);
-      } while (progress);
-
-      validate_ir_tree(shader->ir);
-   }
-
-
-   /* Print out the resulting IR */
-   if (!state->error && dump_lir) {
-      _mesa_print_ir(shader->ir, state);
-   }
-
-   shader->symbols = state->symbols;
-   shader->CompileStatus = !state->error;
-   shader->Version = state->language_version;
-   memcpy(shader->builtins_to_link, state->builtins_to_link,
-	  sizeof(shader->builtins_to_link[0]) * state->num_builtins_to_link);
-   shader->num_builtins_to_link = state->num_builtins_to_link;
-
-   if (shader->InfoLog)
-      ralloc_free(shader->InfoLog);
-
-   shader->InfoLog = state->info_log;
-
-   /* Retain any live IR, but trash the rest. */
-   reparent_ir(shader->ir, shader);
-
-   ralloc_free(state);
-
-   return;
-}
-
-int
-main(int argc, char **argv)
-{
-   int status = EXIT_SUCCESS;
-   struct gl_context local_ctx;
-   struct gl_context *ctx = &local_ctx;
-
-   int c;
-   int idx = 0;
-   while ((c = getopt_long(argc, argv, "", compiler_opts, &idx)) != -1)
-      /* empty */ ;
-
-
-   if (argc <= optind)
-      usage_fail(argv[0]);
-
-   initialize_context(ctx, (glsl_es) ? API_OPENGLES2 : API_OPENGL);
-
-   struct gl_shader_program *whole_program;
-
-   whole_program = rzalloc (NULL, struct gl_shader_program);
-   assert(whole_program != NULL);
-
-   for (/* empty */; argc > optind; optind++) {
-      whole_program->Shaders =
-	 reralloc(whole_program, whole_program->Shaders,
-		  struct gl_shader *, whole_program->NumShaders + 1);
-      assert(whole_program->Shaders != NULL);
-
-      struct gl_shader *shader = rzalloc(whole_program, gl_shader);
-
-      whole_program->Shaders[whole_program->NumShaders] = shader;
-      whole_program->NumShaders++;
-
-      const unsigned len = strlen(argv[optind]);
-      if (len < 6)
-	 usage_fail(argv[0]);
-
-      const char *const ext = & argv[optind][len - 5];
-      if (strncmp(".vert", ext, 5) == 0)
-	 shader->Type = GL_VERTEX_SHADER;
-      else if (strncmp(".geom", ext, 5) == 0)
-	 shader->Type = GL_GEOMETRY_SHADER;
-      else if (strncmp(".frag", ext, 5) == 0)
-	 shader->Type = GL_FRAGMENT_SHADER;
-      else
-	 usage_fail(argv[0]);
-
-      shader->Source = load_text_file(whole_program, argv[optind]);
-      if (shader->Source == NULL) {
-	 printf("File \"%s\" does not exist.\n", argv[optind]);
-	 exit(EXIT_FAILURE);
-      }
-
-      compile_shader(ctx, shader);
-
-      if (!shader->CompileStatus) {
-	 printf("Info log for %s:\n%s\n", argv[optind], shader->InfoLog);
-	 status = EXIT_FAILURE;
-	 break;
-      }
-   }
-
-   if ((status == EXIT_SUCCESS) && do_link)  {
-      link_shaders(ctx, whole_program);
-      status = (whole_program->LinkStatus) ? EXIT_SUCCESS : EXIT_FAILURE;
-
-      if (strlen(whole_program->InfoLog) > 0)
-	 printf("Info log for linking:\n%s\n", whole_program->InfoLog);
-   }
-
-   for (unsigned i = 0; i < MESA_SHADER_TYPES; i++)
-      ralloc_free(whole_program->_LinkedShaders[i]);
-
-   ralloc_free(whole_program);
-   _mesa_glsl_release_types();
-   _mesa_glsl_release_functions();
-
-   return status;
-}
+/*

+ * Copyright © 2008, 2009 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 <io.h>

+

+#ifdef _MSC_VER

+#define __STDC__ 1

+#include <getopt.h>

+#define open _open

+#define read _read

+#define fstat _fstat

+#define stat _stat

+#define close _close

+#define O_RDONLY _O_RDONLY

+#endif

+

+#include "ast.h"

+#include "glsl_parser_extras.h"

+#include "glsl_parser.h"

+#include "ir_optimization.h"

+#include "ir_print_visitor.h"

+#include "program.h"

+#include "loop_analysis.h"

+

+extern "C" struct gl_shader *

+_mesa_new_shader(struct gl_context *ctx, GLuint name, GLenum type);

+

+extern "C" void

+_mesa_reference_shader(struct gl_context *ctx, struct gl_shader **ptr,

+                       struct gl_shader *sh);

+

+/* Copied from shader_api.c for the stand-alone compiler.

+ */

+void

+_mesa_reference_shader(struct gl_context *ctx, struct gl_shader **ptr,

+                       struct gl_shader *sh)

+{

+   *ptr = sh;

+}

+

+struct gl_shader *

+_mesa_new_shader(struct gl_context *ctx, GLuint name, GLenum type)

+{

+   struct gl_shader *shader;

+

+   (void) ctx;

+

+   assert(type == GL_FRAGMENT_SHADER || type == GL_VERTEX_SHADER);

+   shader = rzalloc(NULL, struct gl_shader);

+   if (shader) {

+      shader->Type = type;

+      shader->Name = name;

+      shader->RefCount = 1;

+   }

+   return shader;

+}

+

+static void

+initialize_context(struct gl_context *ctx, gl_api api)

+{

+   memset(ctx, 0, sizeof(*ctx));

+

+   ctx->API = api;

+

+   ctx->Extensions.ARB_ES2_compatibility = GL_TRUE;

+   ctx->Extensions.ARB_draw_buffers = GL_TRUE;

+   ctx->Extensions.ARB_draw_instanced = GL_TRUE;

+   ctx->Extensions.ARB_fragment_coord_conventions = GL_TRUE;

+   ctx->Extensions.EXT_texture_array = GL_TRUE;

+   ctx->Extensions.NV_texture_rectangle = GL_TRUE;

+

+   /* GLSL 1.30 isn't fully supported, but we need to advertise 1.30 so that

+    * the built-in functions for 1.30 can be built.

+    */

+   ctx->Const.GLSLVersion = 130;

+

+   /* 1.10 minimums. */

+   ctx->Const.MaxLights = 8;

+   ctx->Const.MaxClipPlanes = 8;

+   ctx->Const.MaxTextureUnits = 2;

+

+   /* More than the 1.10 minimum to appease parser tests taken from

+    * apps that (hopefully) already checked the number of coords.

+    */

+   ctx->Const.MaxTextureCoordUnits = 4;

+

+   ctx->Const.VertexProgram.MaxAttribs = 16;

+   ctx->Const.VertexProgram.MaxUniformComponents = 512;

+   ctx->Const.MaxVarying = 8;

+   ctx->Const.MaxVertexTextureImageUnits = 0;

+   ctx->Const.MaxCombinedTextureImageUnits = 2;

+   ctx->Const.MaxTextureImageUnits = 2;

+   ctx->Const.FragmentProgram.MaxUniformComponents = 64;

+

+   ctx->Const.MaxDrawBuffers = 2;

+

+   ctx->Driver.NewShader = _mesa_new_shader;

+}

+

+/* Returned string will have 'ctx' as its ralloc owner. */

+static char *

+load_text_file(void *ctx, const char *file_name)

+{

+	char *text = NULL;

+	size_t size;

+	size_t total_read = 0;

+	FILE *fp = fopen(file_name, "rb");

+

+	if (!fp) {

+		return NULL;

+	}

+

+	fseek(fp, 0L, SEEK_END);

+	size = ftell(fp);

+	fseek(fp, 0L, SEEK_SET);

+

+	text = (char *) ralloc_size(ctx, size + 1);

+	if (text != NULL) {

+		do {

+			size_t bytes = fread(text + total_read,

+					     1, size - total_read, fp);

+			if (bytes < size - total_read) {

+				free(text);

+				text = NULL;

+				break;

+			}

+

+			if (bytes == 0) {

+				break;

+			}

+

+			total_read += bytes;

+		} while (total_read < size);

+

+		text[total_read] = '\0';

+	}

+

+	fclose(fp);

+

+	return text;

+}

+

+int glsl_es = 0;

+int dump_ast = 0;

+int dump_hir = 0;

+int dump_lir = 0;

+int do_link = 0;

+

+const struct option compiler_opts[] = {

+   { "glsl-es",  0, &glsl_es,  1 },

+   { "dump-ast", 0, &dump_ast, 1 },

+   { "dump-hir", 0, &dump_hir, 1 },

+   { "dump-lir", 0, &dump_lir, 1 },

+   { "link",     0, &do_link,  1 },

+   { NULL, 0, NULL, 0 }

+};

+

+/**

+ * \brief Print proper usage and exit with failure.

+ */

+void

+usage_fail(const char *name)

+{

+

+   const char *header =

+      "usage: %s [options] <file.vert | file.geom | file.frag>\n"

+      "\n"

+      "Possible options are:\n";

+   printf(header, name, name);

+   for (const struct option *o = compiler_opts; o->name != 0; ++o) {

+      printf("    --%s\n", o->name);

+   }

+   exit(EXIT_FAILURE);

+}

+

+

+void

+compile_shader(struct gl_context *ctx, struct gl_shader *shader)

+{

+   struct _mesa_glsl_parse_state *state =

+      new(shader) _mesa_glsl_parse_state(ctx, shader->Type, shader);

+

+   const char *source = shader->Source;

+   state->error = preprocess(state, &source, &state->info_log,

+			     state->extensions, ctx->API) != 0;

+

+   if (!state->error) {

+      _mesa_glsl_lexer_ctor(state, source);

+      _mesa_glsl_parse(state);

+      _mesa_glsl_lexer_dtor(state);

+   }

+

+   if (dump_ast) {

+      foreach_list_const(n, &state->translation_unit) {

+	 ast_node *ast = exec_node_data(ast_node, n, link);

+	 ast->print();

+      }

+      printf("\n\n");

+   }

+

+   shader->ir = new(shader) exec_list;

+   if (!state->error && !state->translation_unit.is_empty())

+      _mesa_ast_to_hir(shader->ir, state);

+

+   /* Print out the unoptimized IR. */

+   if (!state->error && dump_hir) {

+      validate_ir_tree(shader->ir);

+      _mesa_print_ir(shader->ir, state);

+   }

+

+   /* Optimization passes */

+   if (!state->error && !shader->ir->is_empty()) {

+      bool progress;

+      do {

+	 progress = do_common_optimization(shader->ir, false, 32);

+      } while (progress);

+

+      validate_ir_tree(shader->ir);

+   }

+

+

+   /* Print out the resulting IR */

+   if (!state->error && dump_lir) {

+      _mesa_print_ir(shader->ir, state);

+   }

+

+   shader->symbols = state->symbols;

+   shader->CompileStatus = !state->error;

+   shader->Version = state->language_version;

+   memcpy(shader->builtins_to_link, state->builtins_to_link,

+	  sizeof(shader->builtins_to_link[0]) * state->num_builtins_to_link);

+   shader->num_builtins_to_link = state->num_builtins_to_link;

+

+   if (shader->InfoLog)

+      ralloc_free(shader->InfoLog);

+

+   shader->InfoLog = state->info_log;

+

+   /* Retain any live IR, but trash the rest. */

+   reparent_ir(shader->ir, shader);

+

+   ralloc_free(state);

+

+   return;

+}

+

+int

+main(int argc, char **argv)

+{

+   int status = EXIT_SUCCESS;

+   struct gl_context local_ctx;

+   struct gl_context *ctx = &local_ctx;

+

+   int c;

+   int idx = 0;

+   while ((c = getopt_long(argc, argv, "", compiler_opts, &idx)) != -1)

+      /* empty */ ;

+

+

+   if (argc <= optind)

+      usage_fail(argv[0]);

+

+   initialize_context(ctx, (glsl_es) ? API_OPENGLES2 : API_OPENGL);

+

+   struct gl_shader_program *whole_program;

+

+   whole_program = rzalloc (NULL, struct gl_shader_program);

+   assert(whole_program != NULL);

+

+   for (/* empty */; argc > optind; optind++) {

+      whole_program->Shaders =

+	 reralloc(whole_program, whole_program->Shaders,

+		  struct gl_shader *, whole_program->NumShaders + 1);

+      assert(whole_program->Shaders != NULL);

+

+      struct gl_shader *shader = rzalloc(whole_program, gl_shader);

+

+      whole_program->Shaders[whole_program->NumShaders] = shader;

+      whole_program->NumShaders++;

+

+      const unsigned len = strlen(argv[optind]);

+      if (len < 6)

+	 usage_fail(argv[0]);

+

+      const char *const ext = & argv[optind][len - 5];

+      if (strncmp(".vert", ext, 5) == 0)

+	 shader->Type = GL_VERTEX_SHADER;

+      else if (strncmp(".geom", ext, 5) == 0)

+	 shader->Type = GL_GEOMETRY_SHADER;

+      else if (strncmp(".frag", ext, 5) == 0)

+	 shader->Type = GL_FRAGMENT_SHADER;

+      else

+	 usage_fail(argv[0]);

+

+      shader->Source = load_text_file(whole_program, argv[optind]);

+      if (shader->Source == NULL) {

+	 printf("File \"%s\" does not exist.\n", argv[optind]);

+	 exit(EXIT_FAILURE);

+      }

+

+      compile_shader(ctx, shader);

+

+      if (!shader->CompileStatus) {

+	 printf("Info log for %s:\n%s\n", argv[optind], shader->InfoLog);

+	 status = EXIT_FAILURE;

+	 break;

+      }

+   }

+

+   if ((status == EXIT_SUCCESS) && do_link)  {

+      link_shaders(ctx, whole_program);

+      status = (whole_program->LinkStatus) ? EXIT_SUCCESS : EXIT_FAILURE;

+

+      if (strlen(whole_program->InfoLog) > 0)

+	 printf("Info log for linking:\n%s\n", whole_program->InfoLog);

+   }

+

+   for (unsigned i = 0; i < MESA_SHADER_TYPES; i++)

+      ralloc_free(whole_program->_LinkedShaders[i]);

+

+   ralloc_free(whole_program);

+   _mesa_glsl_release_types();

+   _mesa_glsl_release_functions();

+

+   return status;

+}

diff --git a/mesalib/src/glsl/opt_constant_propagation.cpp b/mesalib/src/glsl/opt_constant_propagation.cpp
index 814f6e61f..55c271200 100644
--- a/mesalib/src/glsl/opt_constant_propagation.cpp
+++ b/mesalib/src/glsl/opt_constant_propagation.cpp
@@ -1,436 +1,434 @@
-/*
- * Copyright © 2010 Intel Corporation
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * constant of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, constant, 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 constantright 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 CONSTANTRIGHT 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.
- */
-
-/**
- * \file opt_constant_propagation.cpp
- *
- * Tracks assignments of constants to channels of variables, and
- * usage of those constant channels with direct usage of the constants.
- *
- * This can lead to constant folding and algebraic optimizations in
- * those later expressions, while causing no increase in instruction
- * count (due to constants being generally free to load from a
- * constant push buffer or as instruction immediate values) and
- * possibly reducing register pressure.
- */
-
-#include "ir.h"
-#include "ir_visitor.h"
-#include "ir_rvalue_visitor.h"
-#include "ir_basic_block.h"
-#include "ir_optimization.h"
-#include "glsl_types.h"
-
-using std::memset;
-
-class acp_entry : public exec_node
-{
-public:
-   acp_entry(ir_variable *var, unsigned write_mask, ir_constant *constant)
-   {
-      assert(var);
-      assert(constant);
-      this->var = var;
-      this->write_mask = write_mask;
-      this->constant = constant;
-   }
-
-   ir_variable *var;
-   ir_constant *constant;
-   unsigned write_mask;
-};
-
-
-class kill_entry : public exec_node
-{
-public:
-   kill_entry(ir_variable *var, unsigned write_mask)
-   {
-      assert(var);
-      this->var = var;
-      this->write_mask = write_mask;
-   }
-
-   ir_variable *var;
-   unsigned write_mask;
-};
-
-class ir_constant_propagation_visitor : public ir_rvalue_visitor {
-public:
-   ir_constant_propagation_visitor()
-   {
-      progress = false;
-      mem_ctx = ralloc_context(0);
-      this->acp = new(mem_ctx) exec_list;
-      this->kills = new(mem_ctx) exec_list;
-   }
-   ~ir_constant_propagation_visitor()
-   {
-      ralloc_free(mem_ctx);
-   }
-
-   virtual ir_visitor_status visit_enter(class ir_loop *);
-   virtual ir_visitor_status visit_enter(class ir_function_signature *);
-   virtual ir_visitor_status visit_enter(class ir_function *);
-   virtual ir_visitor_status visit_leave(class ir_assignment *);
-   virtual ir_visitor_status visit_enter(class ir_call *);
-   virtual ir_visitor_status visit_enter(class ir_if *);
-
-   void add_constant(ir_assignment *ir);
-   void kill(ir_variable *ir, unsigned write_mask);
-   void handle_if_block(exec_list *instructions);
-   void handle_rvalue(ir_rvalue **rvalue);
-
-   /** List of acp_entry: The available constants to propagate */
-   exec_list *acp;
-
-   /**
-    * List of kill_entry: The masks of variables whose values were
-    * killed in this block.
-    */
-   exec_list *kills;
-
-   bool progress;
-
-   bool killed_all;
-
-   void *mem_ctx;
-};
-
-
-void
-ir_constant_propagation_visitor::handle_rvalue(ir_rvalue **rvalue)
-{
-   if (this->in_assignee || !*rvalue)
-      return;
-
-   const glsl_type *type = (*rvalue)->type;
-   if (!type->is_scalar() && !type->is_vector())
-      return;
-
-   ir_swizzle *swiz = NULL;
-   ir_dereference_variable *deref = (*rvalue)->as_dereference_variable();
-   if (!deref) {
-      swiz = (*rvalue)->as_swizzle();
-      if (!swiz)
-	 return;
-
-      deref = swiz->val->as_dereference_variable();
-      if (!deref)
-	 return;
-   }
-
-   ir_constant_data data;
-   memset(&data, 0, sizeof(data));
-
-   for (unsigned int i = 0; i < type->components(); i++) {
-      int channel;
-      acp_entry *found = NULL;
-
-      if (swiz) {
-	 switch (i) {
-	 case 0: channel = swiz->mask.x; break;
-	 case 1: channel = swiz->mask.y; break;
-	 case 2: channel = swiz->mask.z; break;
-	 case 3: channel = swiz->mask.w; break;
-	 default: assert(!"shouldn't be reached"); channel = 0; break;
-	 }
-      } else {
-	 channel = i;
-      }
-
-      foreach_iter(exec_list_iterator, iter, *this->acp) {
-	 acp_entry *entry = (acp_entry *)iter.get();
-	 if (entry->var == deref->var && entry->write_mask & (1 << channel)) {
-	    found = entry;
-	    break;
-	 }
-      }
-
-      if (!found)
-	 return;
-
-      int rhs_channel = 0;
-      for (int j = 0; j < 4; j++) {
-	 if (j == channel)
-	    break;
-	 if (found->write_mask & (1 << j))
-	    rhs_channel++;
-      }
-
-      switch (type->base_type) {
-      case GLSL_TYPE_FLOAT:
-	 data.f[i] = found->constant->value.f[rhs_channel];
-	 break;
-      case GLSL_TYPE_INT:
-	 data.i[i] = found->constant->value.i[rhs_channel];
-	 break;
-      case GLSL_TYPE_UINT:
-	 data.u[i] = found->constant->value.u[rhs_channel];
-	 break;
-      case GLSL_TYPE_BOOL:
-	 data.b[i] = found->constant->value.b[rhs_channel];
-	 break;
-      default:
-	 assert(!"not reached");
-	 break;
-      }
-   }
-
-   *rvalue = new(ralloc_parent(deref)) ir_constant(type, &data);
-   this->progress = true;
-}
-
-ir_visitor_status
-ir_constant_propagation_visitor::visit_enter(ir_function_signature *ir)
-{
-   /* Treat entry into a function signature as a completely separate
-    * block.  Any instructions at global scope will be shuffled into
-    * main() at link time, so they're irrelevant to us.
-    */
-   exec_list *orig_acp = this->acp;
-   exec_list *orig_kills = this->kills;
-   bool orig_killed_all = this->killed_all;
-
-   this->acp = new(mem_ctx) exec_list;
-   this->kills = new(mem_ctx) exec_list;
-   this->killed_all = false;
-
-   visit_list_elements(this, &ir->body);
-
-   this->kills = orig_kills;
-   this->acp = orig_acp;
-   this->killed_all = orig_killed_all;
-
-   return visit_continue_with_parent;
-}
-
-ir_visitor_status
-ir_constant_propagation_visitor::visit_leave(ir_assignment *ir)
-{
-   if (this->in_assignee)
-      return visit_continue;
-
-   kill(ir->lhs->variable_referenced(), ir->write_mask);
-
-   add_constant(ir);
-
-   return visit_continue;
-}
-
-ir_visitor_status
-ir_constant_propagation_visitor::visit_enter(ir_function *ir)
-{
-   (void) ir;
-   return visit_continue;
-}
-
-ir_visitor_status
-ir_constant_propagation_visitor::visit_enter(ir_call *ir)
-{
-   /* Do constant propagation on call parameters, but skip any out params */
-   exec_list_iterator sig_param_iter = ir->get_callee()->parameters.iterator();
-   foreach_iter(exec_list_iterator, iter, ir->actual_parameters) {
-      ir_variable *sig_param = (ir_variable *)sig_param_iter.get();
-      ir_rvalue *param = (ir_rvalue *)iter.get();
-      if (sig_param->mode != ir_var_out && sig_param->mode != ir_var_inout) {
-	 ir_rvalue *new_param = param;
-	 handle_rvalue(&new_param);
-         if (new_param != param)
-	    param->replace_with(new_param);
-	 else
-	    param->accept(this);
-      }
-      sig_param_iter.next();
-   }
-
-   /* Since we're unlinked, we don't (necssarily) know the side effects of
-    * this call.  So kill all copies.
-    */
-   acp->make_empty();
-   this->killed_all = true;
-
-   return visit_continue_with_parent;
-}
-
-void
-ir_constant_propagation_visitor::handle_if_block(exec_list *instructions)
-{
-   exec_list *orig_acp = this->acp;
-   exec_list *orig_kills = this->kills;
-   bool orig_killed_all = this->killed_all;
-
-   this->acp = new(mem_ctx) exec_list;
-   this->kills = new(mem_ctx) exec_list;
-   this->killed_all = false;
-
-   /* Populate the initial acp with a constant of the original */
-   foreach_iter(exec_list_iterator, iter, *orig_acp) {
-      acp_entry *a = (acp_entry *)iter.get();
-      this->acp->push_tail(new(this->mem_ctx) acp_entry(a->var, a->write_mask,
-							a->constant));
-   }
-
-   visit_list_elements(this, instructions);
-
-   if (this->killed_all) {
-      orig_acp->make_empty();
-   }
-
-   exec_list *new_kills = this->kills;
-   this->kills = orig_kills;
-   this->acp = orig_acp;
-   this->killed_all = this->killed_all || orig_killed_all;
-
-   foreach_iter(exec_list_iterator, iter, *new_kills) {
-      kill_entry *k = (kill_entry *)iter.get();
-      kill(k->var, k->write_mask);
-   }
-}
-
-ir_visitor_status
-ir_constant_propagation_visitor::visit_enter(ir_if *ir)
-{
-   ir->condition->accept(this);
-   handle_rvalue(&ir->condition);
-
-   handle_if_block(&ir->then_instructions);
-   handle_if_block(&ir->else_instructions);
-
-   /* handle_if_block() already descended into the children. */
-   return visit_continue_with_parent;
-}
-
-ir_visitor_status
-ir_constant_propagation_visitor::visit_enter(ir_loop *ir)
-{
-   exec_list *orig_acp = this->acp;
-   exec_list *orig_kills = this->kills;
-   bool orig_killed_all = this->killed_all;
-
-   /* FINISHME: For now, the initial acp for loops is totally empty.
-    * We could go through once, then go through again with the acp
-    * cloned minus the killed entries after the first run through.
-    */
-   this->acp = new(mem_ctx) exec_list;
-   this->kills = new(mem_ctx) exec_list;
-   this->killed_all = false;
-
-   visit_list_elements(this, &ir->body_instructions);
-
-   if (this->killed_all) {
-      orig_acp->make_empty();
-   }
-
-   exec_list *new_kills = this->kills;
-   this->kills = orig_kills;
-   this->acp = orig_acp;
-   this->killed_all = this->killed_all || orig_killed_all;
-
-   foreach_iter(exec_list_iterator, iter, *new_kills) {
-      kill_entry *k = (kill_entry *)iter.get();
-      kill(k->var, k->write_mask);
-   }
-
-   /* already descended into the children. */
-   return visit_continue_with_parent;
-}
-
-void
-ir_constant_propagation_visitor::kill(ir_variable *var, unsigned write_mask)
-{
-   assert(var != NULL);
-
-   /* We don't track non-vectors. */
-   if (!var->type->is_vector() && !var->type->is_scalar())
-      return;
-
-   /* Remove any entries currently in the ACP for this kill. */
-   foreach_iter(exec_list_iterator, iter, *this->acp) {
-      acp_entry *entry = (acp_entry *)iter.get();
-
-      if (entry->var == var) {
-	 entry->write_mask &= ~write_mask;
-	 if (entry->write_mask == 0)
-	    entry->remove();
-      }
-   }
-
-   /* Add this writemask of the variable to the list of killed
-    * variables in this block.
-    */
-   foreach_iter(exec_list_iterator, iter, *this->kills) {
-      kill_entry *entry = (kill_entry *)iter.get();
-
-      if (entry->var == var) {
-	 entry->write_mask |= write_mask;
-	 return;
-      }
-   }
-   /* Not already in the list.  Make new entry. */
-   this->kills->push_tail(new(this->mem_ctx) kill_entry(var, write_mask));
-}
-
-/**
- * Adds an entry to the available constant list if it's a plain assignment
- * of a variable to a variable.
- */
-void
-ir_constant_propagation_visitor::add_constant(ir_assignment *ir)
-{
-   acp_entry *entry;
-
-   if (ir->condition)
-      return;
-
-   if (!ir->write_mask)
-      return;
-
-   ir_dereference_variable *deref = ir->lhs->as_dereference_variable();
-   ir_constant *constant = ir->rhs->as_constant();
-
-   if (!deref || !constant)
-      return;
-
-   /* Only do constant propagation on vectors.  Constant matrices,
-    * arrays, or structures would require more work elsewhere.
-    */
-   if (!deref->var->type->is_vector() && !deref->var->type->is_scalar())
-      return;
-
-   entry = new(this->mem_ctx) acp_entry(deref->var, ir->write_mask, constant);
-   this->acp->push_tail(entry);
-}
-
-/**
- * Does a constant propagation pass on the code present in the instruction stream.
- */
-bool
-do_constant_propagation(exec_list *instructions)
-{
-   ir_constant_propagation_visitor v;
-
-   visit_list_elements(&v, instructions);
-
-   return v.progress;
-}
+/*

+ * Copyright © 2010 Intel Corporation

+ *

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

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

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

+ * the rights to use, constant, 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 constantright 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 CONSTANTRIGHT 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.

+ */

+

+/**

+ * \file opt_constant_propagation.cpp

+ *

+ * Tracks assignments of constants to channels of variables, and

+ * usage of those constant channels with direct usage of the constants.

+ *

+ * This can lead to constant folding and algebraic optimizations in

+ * those later expressions, while causing no increase in instruction

+ * count (due to constants being generally free to load from a

+ * constant push buffer or as instruction immediate values) and

+ * possibly reducing register pressure.

+ */

+

+#include "ir.h"

+#include "ir_visitor.h"

+#include "ir_rvalue_visitor.h"

+#include "ir_basic_block.h"

+#include "ir_optimization.h"

+#include "glsl_types.h"

+

+class acp_entry : public exec_node

+{

+public:

+   acp_entry(ir_variable *var, unsigned write_mask, ir_constant *constant)

+   {

+      assert(var);

+      assert(constant);

+      this->var = var;

+      this->write_mask = write_mask;

+      this->constant = constant;

+   }

+

+   ir_variable *var;

+   ir_constant *constant;

+   unsigned write_mask;

+};

+

+

+class kill_entry : public exec_node

+{

+public:

+   kill_entry(ir_variable *var, unsigned write_mask)

+   {

+      assert(var);

+      this->var = var;

+      this->write_mask = write_mask;

+   }

+

+   ir_variable *var;

+   unsigned write_mask;

+};

+

+class ir_constant_propagation_visitor : public ir_rvalue_visitor {

+public:

+   ir_constant_propagation_visitor()

+   {

+      progress = false;

+      mem_ctx = ralloc_context(0);

+      this->acp = new(mem_ctx) exec_list;

+      this->kills = new(mem_ctx) exec_list;

+   }

+   ~ir_constant_propagation_visitor()

+   {

+      ralloc_free(mem_ctx);

+   }

+

+   virtual ir_visitor_status visit_enter(class ir_loop *);

+   virtual ir_visitor_status visit_enter(class ir_function_signature *);

+   virtual ir_visitor_status visit_enter(class ir_function *);

+   virtual ir_visitor_status visit_leave(class ir_assignment *);

+   virtual ir_visitor_status visit_enter(class ir_call *);

+   virtual ir_visitor_status visit_enter(class ir_if *);

+

+   void add_constant(ir_assignment *ir);

+   void kill(ir_variable *ir, unsigned write_mask);

+   void handle_if_block(exec_list *instructions);

+   void handle_rvalue(ir_rvalue **rvalue);

+

+   /** List of acp_entry: The available constants to propagate */

+   exec_list *acp;

+

+   /**

+    * List of kill_entry: The masks of variables whose values were

+    * killed in this block.

+    */

+   exec_list *kills;

+

+   bool progress;

+

+   bool killed_all;

+

+   void *mem_ctx;

+};

+

+

+void

+ir_constant_propagation_visitor::handle_rvalue(ir_rvalue **rvalue)

+{

+   if (this->in_assignee || !*rvalue)

+      return;

+

+   const glsl_type *type = (*rvalue)->type;

+   if (!type->is_scalar() && !type->is_vector())

+      return;

+

+   ir_swizzle *swiz = NULL;

+   ir_dereference_variable *deref = (*rvalue)->as_dereference_variable();

+   if (!deref) {

+      swiz = (*rvalue)->as_swizzle();

+      if (!swiz)

+	 return;

+

+      deref = swiz->val->as_dereference_variable();

+      if (!deref)

+	 return;

+   }

+

+   ir_constant_data data;

+   memset(&data, 0, sizeof(data));

+

+   for (unsigned int i = 0; i < type->components(); i++) {

+      int channel;

+      acp_entry *found = NULL;

+

+      if (swiz) {

+	 switch (i) {

+	 case 0: channel = swiz->mask.x; break;

+	 case 1: channel = swiz->mask.y; break;

+	 case 2: channel = swiz->mask.z; break;

+	 case 3: channel = swiz->mask.w; break;

+	 default: assert(!"shouldn't be reached"); channel = 0; break;

+	 }

+      } else {

+	 channel = i;

+      }

+

+      foreach_iter(exec_list_iterator, iter, *this->acp) {

+	 acp_entry *entry = (acp_entry *)iter.get();

+	 if (entry->var == deref->var && entry->write_mask & (1 << channel)) {

+	    found = entry;

+	    break;

+	 }

+      }

+

+      if (!found)

+	 return;

+

+      int rhs_channel = 0;

+      for (int j = 0; j < 4; j++) {

+	 if (j == channel)

+	    break;

+	 if (found->write_mask & (1 << j))

+	    rhs_channel++;

+      }

+

+      switch (type->base_type) {

+      case GLSL_TYPE_FLOAT:

+	 data.f[i] = found->constant->value.f[rhs_channel];

+	 break;

+      case GLSL_TYPE_INT:

+	 data.i[i] = found->constant->value.i[rhs_channel];

+	 break;

+      case GLSL_TYPE_UINT:

+	 data.u[i] = found->constant->value.u[rhs_channel];

+	 break;

+      case GLSL_TYPE_BOOL:

+	 data.b[i] = found->constant->value.b[rhs_channel];

+	 break;

+      default:

+	 assert(!"not reached");

+	 break;

+      }

+   }

+

+   *rvalue = new(ralloc_parent(deref)) ir_constant(type, &data);

+   this->progress = true;

+}

+

+ir_visitor_status

+ir_constant_propagation_visitor::visit_enter(ir_function_signature *ir)

+{

+   /* Treat entry into a function signature as a completely separate

+    * block.  Any instructions at global scope will be shuffled into

+    * main() at link time, so they're irrelevant to us.

+    */

+   exec_list *orig_acp = this->acp;

+   exec_list *orig_kills = this->kills;

+   bool orig_killed_all = this->killed_all;

+

+   this->acp = new(mem_ctx) exec_list;

+   this->kills = new(mem_ctx) exec_list;

+   this->killed_all = false;

+

+   visit_list_elements(this, &ir->body);

+

+   this->kills = orig_kills;

+   this->acp = orig_acp;

+   this->killed_all = orig_killed_all;

+

+   return visit_continue_with_parent;

+}

+

+ir_visitor_status

+ir_constant_propagation_visitor::visit_leave(ir_assignment *ir)

+{

+   if (this->in_assignee)

+      return visit_continue;

+

+   kill(ir->lhs->variable_referenced(), ir->write_mask);

+

+   add_constant(ir);

+

+   return visit_continue;

+}

+

+ir_visitor_status

+ir_constant_propagation_visitor::visit_enter(ir_function *ir)

+{

+   (void) ir;

+   return visit_continue;

+}

+

+ir_visitor_status

+ir_constant_propagation_visitor::visit_enter(ir_call *ir)

+{

+   /* Do constant propagation on call parameters, but skip any out params */

+   exec_list_iterator sig_param_iter = ir->get_callee()->parameters.iterator();

+   foreach_iter(exec_list_iterator, iter, ir->actual_parameters) {

+      ir_variable *sig_param = (ir_variable *)sig_param_iter.get();

+      ir_rvalue *param = (ir_rvalue *)iter.get();

+      if (sig_param->mode != ir_var_out && sig_param->mode != ir_var_inout) {

+	 ir_rvalue *new_param = param;

+	 handle_rvalue(&new_param);

+         if (new_param != param)

+	    param->replace_with(new_param);

+	 else

+	    param->accept(this);

+      }

+      sig_param_iter.next();

+   }

+

+   /* Since we're unlinked, we don't (necssarily) know the side effects of

+    * this call.  So kill all copies.

+    */

+   acp->make_empty();

+   this->killed_all = true;

+

+   return visit_continue_with_parent;

+}

+

+void

+ir_constant_propagation_visitor::handle_if_block(exec_list *instructions)

+{

+   exec_list *orig_acp = this->acp;

+   exec_list *orig_kills = this->kills;

+   bool orig_killed_all = this->killed_all;

+

+   this->acp = new(mem_ctx) exec_list;

+   this->kills = new(mem_ctx) exec_list;

+   this->killed_all = false;

+

+   /* Populate the initial acp with a constant of the original */

+   foreach_iter(exec_list_iterator, iter, *orig_acp) {

+      acp_entry *a = (acp_entry *)iter.get();

+      this->acp->push_tail(new(this->mem_ctx) acp_entry(a->var, a->write_mask,

+							a->constant));

+   }

+

+   visit_list_elements(this, instructions);

+

+   if (this->killed_all) {

+      orig_acp->make_empty();

+   }

+

+   exec_list *new_kills = this->kills;

+   this->kills = orig_kills;

+   this->acp = orig_acp;

+   this->killed_all = this->killed_all || orig_killed_all;

+

+   foreach_iter(exec_list_iterator, iter, *new_kills) {

+      kill_entry *k = (kill_entry *)iter.get();

+      kill(k->var, k->write_mask);

+   }

+}

+

+ir_visitor_status

+ir_constant_propagation_visitor::visit_enter(ir_if *ir)

+{

+   ir->condition->accept(this);

+   handle_rvalue(&ir->condition);

+

+   handle_if_block(&ir->then_instructions);

+   handle_if_block(&ir->else_instructions);

+

+   /* handle_if_block() already descended into the children. */

+   return visit_continue_with_parent;

+}

+

+ir_visitor_status

+ir_constant_propagation_visitor::visit_enter(ir_loop *ir)

+{

+   exec_list *orig_acp = this->acp;

+   exec_list *orig_kills = this->kills;

+   bool orig_killed_all = this->killed_all;

+

+   /* FINISHME: For now, the initial acp for loops is totally empty.

+    * We could go through once, then go through again with the acp

+    * cloned minus the killed entries after the first run through.

+    */

+   this->acp = new(mem_ctx) exec_list;

+   this->kills = new(mem_ctx) exec_list;

+   this->killed_all = false;

+

+   visit_list_elements(this, &ir->body_instructions);

+

+   if (this->killed_all) {

+      orig_acp->make_empty();

+   }

+

+   exec_list *new_kills = this->kills;

+   this->kills = orig_kills;

+   this->acp = orig_acp;

+   this->killed_all = this->killed_all || orig_killed_all;

+

+   foreach_iter(exec_list_iterator, iter, *new_kills) {

+      kill_entry *k = (kill_entry *)iter.get();

+      kill(k->var, k->write_mask);

+   }

+

+   /* already descended into the children. */

+   return visit_continue_with_parent;

+}

+

+void

+ir_constant_propagation_visitor::kill(ir_variable *var, unsigned write_mask)

+{

+   assert(var != NULL);

+

+   /* We don't track non-vectors. */

+   if (!var->type->is_vector() && !var->type->is_scalar())

+      return;

+

+   /* Remove any entries currently in the ACP for this kill. */

+   foreach_iter(exec_list_iterator, iter, *this->acp) {

+      acp_entry *entry = (acp_entry *)iter.get();

+

+      if (entry->var == var) {

+	 entry->write_mask &= ~write_mask;

+	 if (entry->write_mask == 0)

+	    entry->remove();

+      }

+   }

+

+   /* Add this writemask of the variable to the list of killed

+    * variables in this block.

+    */

+   foreach_iter(exec_list_iterator, iter, *this->kills) {

+      kill_entry *entry = (kill_entry *)iter.get();

+

+      if (entry->var == var) {

+	 entry->write_mask |= write_mask;

+	 return;

+      }

+   }

+   /* Not already in the list.  Make new entry. */

+   this->kills->push_tail(new(this->mem_ctx) kill_entry(var, write_mask));

+}

+

+/**

+ * Adds an entry to the available constant list if it's a plain assignment

+ * of a variable to a variable.

+ */

+void

+ir_constant_propagation_visitor::add_constant(ir_assignment *ir)

+{

+   acp_entry *entry;

+

+   if (ir->condition)

+      return;

+

+   if (!ir->write_mask)

+      return;

+

+   ir_dereference_variable *deref = ir->lhs->as_dereference_variable();

+   ir_constant *constant = ir->rhs->as_constant();

+

+   if (!deref || !constant)

+      return;

+

+   /* Only do constant propagation on vectors.  Constant matrices,

+    * arrays, or structures would require more work elsewhere.

+    */

+   if (!deref->var->type->is_vector() && !deref->var->type->is_scalar())

+      return;

+

+   entry = new(this->mem_ctx) acp_entry(deref->var, ir->write_mask, constant);

+   this->acp->push_tail(entry);

+}

+

+/**

+ * Does a constant propagation pass on the code present in the instruction stream.

+ */

+bool

+do_constant_propagation(exec_list *instructions)

+{

+   ir_constant_propagation_visitor v;

+

+   visit_list_elements(&v, instructions);

+

+   return v.progress;

+}

diff --git a/mesalib/src/glsl/opt_constant_variable.cpp b/mesalib/src/glsl/opt_constant_variable.cpp
index 9dca0ff8e..f1aeaa99a 100644
--- a/mesalib/src/glsl/opt_constant_variable.cpp
+++ b/mesalib/src/glsl/opt_constant_variable.cpp
@@ -1,198 +1,195 @@
-/*
- * 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.
- */
-
-/**
- * \file opt_constant_variable.cpp
- *
- * Marks variables assigned a single constant value over the course
- * of the program as constant.
- *
- * The goal here is to trigger further constant folding and then dead
- * code elimination.  This is common with vector/matrix constructors
- * and calls to builtin functions.
- */
-
-#include "ir.h"
-#include "ir_visitor.h"
-#include "ir_optimization.h"
-#include "glsl_types.h"
-
-using std::calloc;
-using std::free;
-
-struct assignment_entry {
-   exec_node link;
-   int assignment_count;
-   ir_variable *var;
-   ir_constant *constval;
-   bool our_scope;
-};
-
-class ir_constant_variable_visitor : public ir_hierarchical_visitor {
-public:
-   virtual ir_visitor_status visit_enter(ir_dereference_variable *);
-   virtual ir_visitor_status visit(ir_variable *);
-   virtual ir_visitor_status visit_enter(ir_assignment *);
-   virtual ir_visitor_status visit_enter(ir_call *);
-
-   exec_list list;
-};
-
-static struct assignment_entry *
-get_assignment_entry(ir_variable *var, exec_list *list)
-{
-   struct assignment_entry *entry;
-
-   foreach_list_typed(struct assignment_entry, entry, link, list) {
-      if (entry->var == var)
-	 return entry;
-   }
-
-   entry = (struct assignment_entry *)calloc(1, sizeof(*entry));
-   entry->var = var;
-   list->push_head(&entry->link);
-   return entry;
-}
-
-ir_visitor_status
-ir_constant_variable_visitor::visit(ir_variable *ir)
-{
-   struct assignment_entry *entry = get_assignment_entry(ir, &this->list);
-   entry->our_scope = true;
-   return visit_continue;
-}
-
-/* Skip derefs of variables so that we can detect declarations. */
-ir_visitor_status
-ir_constant_variable_visitor::visit_enter(ir_dereference_variable *ir)
-{
-   (void)ir;
-   return visit_continue_with_parent;
-}
-
-ir_visitor_status
-ir_constant_variable_visitor::visit_enter(ir_assignment *ir)
-{
-   ir_constant *constval;
-   struct assignment_entry *entry;
-
-   entry = get_assignment_entry(ir->lhs->variable_referenced(), &this->list);
-   assert(entry);
-   entry->assignment_count++;
-
-   /* If it's already constant, don't do the work. */
-   if (entry->var->constant_value)
-      return visit_continue;
-
-   /* OK, now find if we actually have all the right conditions for
-    * this to be a constant value assigned to the var.
-    */
-   if (ir->condition)
-      return visit_continue;
-
-   ir_variable *var = ir->whole_variable_written();
-   if (!var)
-      return visit_continue;
-
-   constval = ir->rhs->constant_expression_value();
-   if (!constval)
-      return visit_continue;
-
-   /* Mark this entry as having a constant assignment (if the
-    * assignment count doesn't go >1).  do_constant_variable will fix
-    * up the variable with the constant value later.
-    */
-   entry->constval = constval;
-
-   return visit_continue;
-}
-
-ir_visitor_status
-ir_constant_variable_visitor::visit_enter(ir_call *ir)
-{
-   exec_list_iterator sig_iter = ir->get_callee()->parameters.iterator();
-   foreach_iter(exec_list_iterator, iter, *ir) {
-      ir_rvalue *param_rval = (ir_rvalue *)iter.get();
-      ir_variable *param = (ir_variable *)sig_iter.get();
-
-      if (param->mode == ir_var_out ||
-	  param->mode == ir_var_inout) {
-	 ir_variable *var = param_rval->variable_referenced();
-	 struct assignment_entry *entry;
-
-	 assert(var);
-	 entry = get_assignment_entry(var, &this->list);
-	 entry->assignment_count++;
-      }
-      sig_iter.next();
-   }
-   return visit_continue;
-}
-
-/**
- * Does a copy propagation pass on the code present in the instruction stream.
- */
-bool
-do_constant_variable(exec_list *instructions)
-{
-   bool progress = false;
-   ir_constant_variable_visitor v;
-
-   v.run(instructions);
-
-   while (!v.list.is_empty()) {
-
-      struct assignment_entry *entry;
-      entry = exec_node_data(struct assignment_entry, v.list.head, link);
-
-      if (entry->assignment_count == 1 && entry->constval && entry->our_scope) {
-	 entry->var->constant_value = entry->constval;
-	 progress = true;
-      }
-      entry->link.remove();
-      free(entry);
-   }
-
-   return progress;
-}
-
-bool
-do_constant_variable_unlinked(exec_list *instructions)
-{
-   bool progress = false;
-
-   foreach_iter(exec_list_iterator, iter, *instructions) {
-      ir_instruction *ir = (ir_instruction *)iter.get();
-      ir_function *f = ir->as_function();
-      if (f) {
-	 foreach_iter(exec_list_iterator, sigiter, *f) {
-	    ir_function_signature *sig =
-	       (ir_function_signature *) sigiter.get();
-	    if (do_constant_variable(&sig->body))
-	       progress = true;
-	 }
-      }
-   }
-
-   return progress;
-}
+/*

+ * 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.

+ */

+

+/**

+ * \file opt_constant_variable.cpp

+ *

+ * Marks variables assigned a single constant value over the course

+ * of the program as constant.

+ *

+ * The goal here is to trigger further constant folding and then dead

+ * code elimination.  This is common with vector/matrix constructors

+ * and calls to builtin functions.

+ */

+

+#include "ir.h"

+#include "ir_visitor.h"

+#include "ir_optimization.h"

+#include "glsl_types.h"

+

+struct assignment_entry {

+   exec_node link;

+   int assignment_count;

+   ir_variable *var;

+   ir_constant *constval;

+   bool our_scope;

+};

+

+class ir_constant_variable_visitor : public ir_hierarchical_visitor {

+public:

+   virtual ir_visitor_status visit_enter(ir_dereference_variable *);

+   virtual ir_visitor_status visit(ir_variable *);

+   virtual ir_visitor_status visit_enter(ir_assignment *);

+   virtual ir_visitor_status visit_enter(ir_call *);

+

+   exec_list list;

+};

+

+static struct assignment_entry *

+get_assignment_entry(ir_variable *var, exec_list *list)

+{

+   struct assignment_entry *entry;

+

+   foreach_list_typed(struct assignment_entry, entry, link, list) {

+      if (entry->var == var)

+	 return entry;

+   }

+

+   entry = (struct assignment_entry *)calloc(1, sizeof(*entry));

+   entry->var = var;

+   list->push_head(&entry->link);

+   return entry;

+}

+

+ir_visitor_status

+ir_constant_variable_visitor::visit(ir_variable *ir)

+{

+   struct assignment_entry *entry = get_assignment_entry(ir, &this->list);

+   entry->our_scope = true;

+   return visit_continue;

+}

+

+/* Skip derefs of variables so that we can detect declarations. */

+ir_visitor_status

+ir_constant_variable_visitor::visit_enter(ir_dereference_variable *ir)

+{

+   (void)ir;

+   return visit_continue_with_parent;

+}

+

+ir_visitor_status

+ir_constant_variable_visitor::visit_enter(ir_assignment *ir)

+{

+   ir_constant *constval;

+   struct assignment_entry *entry;

+

+   entry = get_assignment_entry(ir->lhs->variable_referenced(), &this->list);

+   assert(entry);

+   entry->assignment_count++;

+

+   /* If it's already constant, don't do the work. */

+   if (entry->var->constant_value)

+      return visit_continue;

+

+   /* OK, now find if we actually have all the right conditions for

+    * this to be a constant value assigned to the var.

+    */

+   if (ir->condition)

+      return visit_continue;

+

+   ir_variable *var = ir->whole_variable_written();

+   if (!var)

+      return visit_continue;

+

+   constval = ir->rhs->constant_expression_value();

+   if (!constval)

+      return visit_continue;

+

+   /* Mark this entry as having a constant assignment (if the

+    * assignment count doesn't go >1).  do_constant_variable will fix

+    * up the variable with the constant value later.

+    */

+   entry->constval = constval;

+

+   return visit_continue;

+}

+

+ir_visitor_status

+ir_constant_variable_visitor::visit_enter(ir_call *ir)

+{

+   exec_list_iterator sig_iter = ir->get_callee()->parameters.iterator();

+   foreach_iter(exec_list_iterator, iter, *ir) {

+      ir_rvalue *param_rval = (ir_rvalue *)iter.get();

+      ir_variable *param = (ir_variable *)sig_iter.get();

+

+      if (param->mode == ir_var_out ||

+	  param->mode == ir_var_inout) {

+	 ir_variable *var = param_rval->variable_referenced();

+	 struct assignment_entry *entry;

+

+	 assert(var);

+	 entry = get_assignment_entry(var, &this->list);

+	 entry->assignment_count++;

+      }

+      sig_iter.next();

+   }

+   return visit_continue;

+}

+

+/**

+ * Does a copy propagation pass on the code present in the instruction stream.

+ */

+bool

+do_constant_variable(exec_list *instructions)

+{

+   bool progress = false;

+   ir_constant_variable_visitor v;

+

+   v.run(instructions);

+

+   while (!v.list.is_empty()) {

+

+      struct assignment_entry *entry;

+      entry = exec_node_data(struct assignment_entry, v.list.head, link);

+

+      if (entry->assignment_count == 1 && entry->constval && entry->our_scope) {

+	 entry->var->constant_value = entry->constval;

+	 progress = true;

+      }

+      entry->link.remove();

+      free(entry);

+   }

+

+   return progress;

+}

+

+bool

+do_constant_variable_unlinked(exec_list *instructions)

+{

+   bool progress = false;

+

+   foreach_iter(exec_list_iterator, iter, *instructions) {

+      ir_instruction *ir = (ir_instruction *)iter.get();

+      ir_function *f = ir->as_function();

+      if (f) {

+	 foreach_iter(exec_list_iterator, sigiter, *f) {

+	    ir_function_signature *sig =

+	       (ir_function_signature *) sigiter.get();

+	    if (do_constant_variable(&sig->body))

+	       progress = true;

+	 }

+      }

+   }

+

+   return progress;

+}

diff --git a/mesalib/src/glsl/opt_dead_code.cpp b/mesalib/src/glsl/opt_dead_code.cpp
index f47b9613e..492ba73a1 100644
--- a/mesalib/src/glsl/opt_dead_code.cpp
+++ b/mesalib/src/glsl/opt_dead_code.cpp
@@ -1,144 +1,142 @@
-/*
- * 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.
- */
-
-/**
- * \file opt_dead_code.cpp
- *
- * Eliminates dead assignments and variable declarations from the code.
- */
-
-#include "ir.h"
-#include "ir_visitor.h"
-#include "ir_variable_refcount.h"
-#include "glsl_types.h"
-
-using std::printf;
-
-static bool debug = false;
-
-/**
- * Do a dead code pass over instructions and everything that instructions
- * references.
- *
- * Note that this will remove assignments to globals, so it is not suitable
- * for usage on an unlinked instruction stream.
- */
-bool
-do_dead_code(exec_list *instructions)
-{
-   ir_variable_refcount_visitor v;
-   bool progress = false;
-
-   v.run(instructions);
-
-   foreach_iter(exec_list_iterator, iter, v.variable_list) {
-      variable_entry *entry = (variable_entry *)iter.get();
-
-      /* Since each assignment is a reference, the refereneced count must be
-       * greater than or equal to the assignment count.  If they are equal,
-       * then all of the references are assignments, and the variable is
-       * dead.
-       *
-       * Note that if the variable is neither assigned nor referenced, both
-       * counts will be zero and will be caught by the equality test.
-       */
-      assert(entry->referenced_count >= entry->assigned_count);
-
-      if (debug) {
-	 printf("%s@%p: %d refs, %d assigns, %sdeclared in our scope\n",
-		entry->var->name, (void *) entry->var,
-		entry->referenced_count, entry->assigned_count,
-		entry->declaration ? "" : "not ");
-      }
-
-      if ((entry->referenced_count > entry->assigned_count)
-	  || !entry->declaration)
-	 continue;
-
-      if (entry->assign) {
-	 /* Remove a single dead assignment to the variable we found.
-	  * Don't do so if it's a shader output, though.
-	  */
-	 if (entry->var->mode != ir_var_out &&
-	     entry->var->mode != ir_var_inout &&
-	     !ir_has_call(entry->assign)) {
-	    entry->assign->remove();
-	    progress = true;
-
-	    if (debug) {
-	       printf("Removed assignment to %s@%p\n",
-		      entry->var->name, (void *) entry->var);
-	    }
-	 }
-      } else {
-	 /* If there are no assignments or references to the variable left,
-	  * then we can remove its declaration.
-	  */
-
-	 /* uniform initializers are precious, and could get used by another
-	  * stage.
-	  */
-	 if (entry->var->mode == ir_var_uniform &&
-	     entry->var->constant_value)
-	    continue;
-
-	 entry->var->remove();
-	 progress = true;
-
-	 if (debug) {
-	    printf("Removed declaration of %s@%p\n",
-		   entry->var->name, (void *) entry->var);
-	 }
-      }
-   }
-
-   return progress;
-}
-
-/**
- * Does a dead code pass on the functions present in the instruction stream.
- *
- * This is suitable for use while the program is not linked, as it will
- * ignore variable declarations (and the assignments to them) for variables
- * with global scope.
- */
-bool
-do_dead_code_unlinked(exec_list *instructions)
-{
-   bool progress = false;
-
-   foreach_iter(exec_list_iterator, iter, *instructions) {
-      ir_instruction *ir = (ir_instruction *)iter.get();
-      ir_function *f = ir->as_function();
-      if (f) {
-	 foreach_iter(exec_list_iterator, sigiter, *f) {
-	    ir_function_signature *sig =
-	       (ir_function_signature *) sigiter.get();
-	    if (do_dead_code(&sig->body))
-	       progress = true;
-	 }
-      }
-   }
-
-   return progress;
-}
+/*

+ * 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.

+ */

+

+/**

+ * \file opt_dead_code.cpp

+ *

+ * Eliminates dead assignments and variable declarations from the code.

+ */

+

+#include "ir.h"

+#include "ir_visitor.h"

+#include "ir_variable_refcount.h"

+#include "glsl_types.h"

+

+static bool debug = false;

+

+/**

+ * Do a dead code pass over instructions and everything that instructions

+ * references.

+ *

+ * Note that this will remove assignments to globals, so it is not suitable

+ * for usage on an unlinked instruction stream.

+ */

+bool

+do_dead_code(exec_list *instructions)

+{

+   ir_variable_refcount_visitor v;

+   bool progress = false;

+

+   v.run(instructions);

+

+   foreach_iter(exec_list_iterator, iter, v.variable_list) {

+      variable_entry *entry = (variable_entry *)iter.get();

+

+      /* Since each assignment is a reference, the refereneced count must be

+       * greater than or equal to the assignment count.  If they are equal,

+       * then all of the references are assignments, and the variable is

+       * dead.

+       *

+       * Note that if the variable is neither assigned nor referenced, both

+       * counts will be zero and will be caught by the equality test.

+       */

+      assert(entry->referenced_count >= entry->assigned_count);

+

+      if (debug) {

+	 printf("%s@%p: %d refs, %d assigns, %sdeclared in our scope\n",

+		entry->var->name, (void *) entry->var,

+		entry->referenced_count, entry->assigned_count,

+		entry->declaration ? "" : "not ");

+      }

+

+      if ((entry->referenced_count > entry->assigned_count)

+	  || !entry->declaration)

+	 continue;

+

+      if (entry->assign) {

+	 /* Remove a single dead assignment to the variable we found.

+	  * Don't do so if it's a shader output, though.

+	  */

+	 if (entry->var->mode != ir_var_out &&

+	     entry->var->mode != ir_var_inout &&

+	     !ir_has_call(entry->assign)) {

+	    entry->assign->remove();

+	    progress = true;

+

+	    if (debug) {

+	       printf("Removed assignment to %s@%p\n",

+		      entry->var->name, (void *) entry->var);

+	    }

+	 }

+      } else {

+	 /* If there are no assignments or references to the variable left,

+	  * then we can remove its declaration.

+	  */

+

+	 /* uniform initializers are precious, and could get used by another

+	  * stage.

+	  */

+	 if (entry->var->mode == ir_var_uniform &&

+	     entry->var->constant_value)

+	    continue;

+

+	 entry->var->remove();

+	 progress = true;

+

+	 if (debug) {

+	    printf("Removed declaration of %s@%p\n",

+		   entry->var->name, (void *) entry->var);

+	 }

+      }

+   }

+

+   return progress;

+}

+

+/**

+ * Does a dead code pass on the functions present in the instruction stream.

+ *

+ * This is suitable for use while the program is not linked, as it will

+ * ignore variable declarations (and the assignments to them) for variables

+ * with global scope.

+ */

+bool

+do_dead_code_unlinked(exec_list *instructions)

+{

+   bool progress = false;

+

+   foreach_iter(exec_list_iterator, iter, *instructions) {

+      ir_instruction *ir = (ir_instruction *)iter.get();

+      ir_function *f = ir->as_function();

+      if (f) {

+	 foreach_iter(exec_list_iterator, sigiter, *f) {

+	    ir_function_signature *sig =

+	       (ir_function_signature *) sigiter.get();

+	    if (do_dead_code(&sig->body))

+	       progress = true;

+	 }

+      }

+   }

+

+   return progress;

+}

diff --git a/mesalib/src/glsl/opt_dead_code_local.cpp b/mesalib/src/glsl/opt_dead_code_local.cpp
index f67b46337..42e5e94c8 100644
--- a/mesalib/src/glsl/opt_dead_code_local.cpp
+++ b/mesalib/src/glsl/opt_dead_code_local.cpp
@@ -1,224 +1,222 @@
-/*
- * 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.
- */
-
-/**
- * \file opt_dead_code_local.cpp
- *
- * Eliminates local dead assignments from the code.
- *
- * This operates on basic blocks, tracking assignments and finding if
- * they're used before the variable is completely reassigned.
- *
- * Compare this to ir_dead_code.cpp, which operates globally looking
- * for assignments to variables that are never read.
- */
-
-#include "ir.h"
-#include "ir_basic_block.h"
-#include "ir_optimization.h"
-#include "glsl_types.h"
-
-using std::printf;
-
-static bool debug = false;
-
-class assignment_entry : public exec_node
-{
-public:
-   assignment_entry(ir_variable *lhs, ir_instruction *ir)
-   {
-      assert(lhs);
-      assert(ir);
-      this->lhs = lhs;
-      this->ir = ir;
-   }
-
-   ir_variable *lhs;
-   ir_instruction *ir;
-};
-
-class kill_for_derefs_visitor : public ir_hierarchical_visitor {
-public:
-   kill_for_derefs_visitor(exec_list *assignments)
-   {
-      this->assignments = assignments;
-   }
-
-   virtual ir_visitor_status visit(ir_dereference_variable *ir)
-   {
-      ir_variable *const var = ir->variable_referenced();
-
-      foreach_iter(exec_list_iterator, iter, *this->assignments) {
-	 assignment_entry *entry = (assignment_entry *)iter.get();
-
-	 if (entry->lhs == var) {
-	    if (debug)
-	       printf("kill %s\n", entry->lhs->name);
-	    entry->remove();
-	 }
-      }
-
-      return visit_continue;
-   }
-
-private:
-   exec_list *assignments;
-};
-
-class array_index_visit : public ir_hierarchical_visitor {
-public:
-   array_index_visit(ir_hierarchical_visitor *v)
-   {
-      this->visitor = v;
-   }
-
-   virtual ir_visitor_status visit_enter(class ir_dereference_array *ir)
-   {
-      ir->array_index->accept(visitor);
-      return visit_continue;
-   }
-
-   static void run(ir_instruction *ir, ir_hierarchical_visitor *v)
-   {
-      array_index_visit top_visit(v);
-      ir->accept(& top_visit);
-   }
-
-   ir_hierarchical_visitor *visitor;
-};
-
-
-/**
- * Adds an entry to the available copy list if it's a plain assignment
- * of a variable to a variable.
- */
-static bool
-process_assignment(void *ctx, ir_assignment *ir, exec_list *assignments)
-{
-   ir_variable *var = NULL;
-   bool progress = false;
-   kill_for_derefs_visitor v(assignments);
-
-   /* Kill assignment entries for things used to produce this assignment. */
-   ir->rhs->accept(&v);
-   if (ir->condition) {
-      ir->condition->accept(&v);
-   }
-
-   /* Kill assignment enties used as array indices.
-    */
-   array_index_visit::run(ir->lhs, &v);
-   var = ir->lhs->variable_referenced();
-   assert(var);
-
-   /* Now, check if we did a whole-variable assignment. */
-   if (!ir->condition && (ir->whole_variable_written() != NULL)) {
-      /* We did a whole-variable assignment.  So, any instruction in
-       * the assignment list with the same LHS is dead.
-       */
-      if (debug)
-	 printf("looking for %s to remove\n", var->name);
-      foreach_iter(exec_list_iterator, iter, *assignments) {
-	 assignment_entry *entry = (assignment_entry *)iter.get();
-
-	 if (entry->lhs == var) {
-	    if (debug)
-	       printf("removing %s\n", var->name);
-	    entry->ir->remove();
-	    entry->remove();
-	    progress = true;
-	 }
-      }
-   }
-
-   /* Add this instruction to the assignment list available to be removed.
-    * But not if the assignment has other side effects.
-    */
-   if (ir_has_call(ir))
-      return progress;
-
-   assignment_entry *entry = new(ctx) assignment_entry(var, ir);
-   assignments->push_tail(entry);
-
-   if (debug) {
-      printf("add %s\n", var->name);
-
-      printf("current entries\n");
-      foreach_iter(exec_list_iterator, iter, *assignments) {
-	 assignment_entry *entry = (assignment_entry *)iter.get();
-
-	 printf("    %s\n", entry->lhs->name);
-      }
-   }
-
-   return progress;
-}
-
-static void
-dead_code_local_basic_block(ir_instruction *first,
-			     ir_instruction *last,
-			     void *data)
-{
-   ir_instruction *ir, *ir_next;
-   /* List of avaialble_copy */
-   exec_list assignments;
-   bool *out_progress = (bool *)data;
-   bool progress = false;
-
-   void *ctx = ralloc_context(NULL);
-   /* Safe looping, since process_assignment */
-   for (ir = first, ir_next = (ir_instruction *)first->next;;
-	ir = ir_next, ir_next = (ir_instruction *)ir->next) {
-      ir_assignment *ir_assign = ir->as_assignment();
-
-      if (debug) {
-	 ir->print();
-	 printf("\n");
-      }
-
-      if (ir_assign) {
-	 progress = process_assignment(ctx, ir_assign, &assignments) || progress;
-      } else {
-	 kill_for_derefs_visitor kill(&assignments);
-	 ir->accept(&kill);
-      }
-
-      if (ir == last)
-	 break;
-   }
-   *out_progress = progress;
-   ralloc_free(ctx);
-}
-
-/**
- * Does a copy propagation pass on the code present in the instruction stream.
- */
-bool
-do_dead_code_local(exec_list *instructions)
-{
-   bool progress = false;
-
-   call_for_basic_blocks(instructions, dead_code_local_basic_block, &progress);
-
-   return progress;
-}
+/*

+ * 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.

+ */

+

+/**

+ * \file opt_dead_code_local.cpp

+ *

+ * Eliminates local dead assignments from the code.

+ *

+ * This operates on basic blocks, tracking assignments and finding if

+ * they're used before the variable is completely reassigned.

+ *

+ * Compare this to ir_dead_code.cpp, which operates globally looking

+ * for assignments to variables that are never read.

+ */

+

+#include "ir.h"

+#include "ir_basic_block.h"

+#include "ir_optimization.h"

+#include "glsl_types.h"

+

+static bool debug = false;

+

+class assignment_entry : public exec_node

+{

+public:

+   assignment_entry(ir_variable *lhs, ir_instruction *ir)

+   {

+      assert(lhs);

+      assert(ir);

+      this->lhs = lhs;

+      this->ir = ir;

+   }

+

+   ir_variable *lhs;

+   ir_instruction *ir;

+};

+

+class kill_for_derefs_visitor : public ir_hierarchical_visitor {

+public:

+   kill_for_derefs_visitor(exec_list *assignments)

+   {

+      this->assignments = assignments;

+   }

+

+   virtual ir_visitor_status visit(ir_dereference_variable *ir)

+   {

+      ir_variable *const var = ir->variable_referenced();

+

+      foreach_iter(exec_list_iterator, iter, *this->assignments) {

+	 assignment_entry *entry = (assignment_entry *)iter.get();

+

+	 if (entry->lhs == var) {

+	    if (debug)

+	       printf("kill %s\n", entry->lhs->name);

+	    entry->remove();

+	 }

+      }

+

+      return visit_continue;

+   }

+

+private:

+   exec_list *assignments;

+};

+

+class array_index_visit : public ir_hierarchical_visitor {

+public:

+   array_index_visit(ir_hierarchical_visitor *v)

+   {

+      this->visitor = v;

+   }

+

+   virtual ir_visitor_status visit_enter(class ir_dereference_array *ir)

+   {

+      ir->array_index->accept(visitor);

+      return visit_continue;

+   }

+

+   static void run(ir_instruction *ir, ir_hierarchical_visitor *v)

+   {

+      array_index_visit top_visit(v);

+      ir->accept(& top_visit);

+   }

+

+   ir_hierarchical_visitor *visitor;

+};

+

+

+/**

+ * Adds an entry to the available copy list if it's a plain assignment

+ * of a variable to a variable.

+ */

+static bool

+process_assignment(void *ctx, ir_assignment *ir, exec_list *assignments)

+{

+   ir_variable *var = NULL;

+   bool progress = false;

+   kill_for_derefs_visitor v(assignments);

+

+   /* Kill assignment entries for things used to produce this assignment. */

+   ir->rhs->accept(&v);

+   if (ir->condition) {

+      ir->condition->accept(&v);

+   }

+

+   /* Kill assignment enties used as array indices.

+    */

+   array_index_visit::run(ir->lhs, &v);

+   var = ir->lhs->variable_referenced();

+   assert(var);

+

+   /* Now, check if we did a whole-variable assignment. */

+   if (!ir->condition && (ir->whole_variable_written() != NULL)) {

+      /* We did a whole-variable assignment.  So, any instruction in

+       * the assignment list with the same LHS is dead.

+       */

+      if (debug)

+	 printf("looking for %s to remove\n", var->name);

+      foreach_iter(exec_list_iterator, iter, *assignments) {

+	 assignment_entry *entry = (assignment_entry *)iter.get();

+

+	 if (entry->lhs == var) {

+	    if (debug)

+	       printf("removing %s\n", var->name);

+	    entry->ir->remove();

+	    entry->remove();

+	    progress = true;

+	 }

+      }

+   }

+

+   /* Add this instruction to the assignment list available to be removed.

+    * But not if the assignment has other side effects.

+    */

+   if (ir_has_call(ir))

+      return progress;

+

+   assignment_entry *entry = new(ctx) assignment_entry(var, ir);

+   assignments->push_tail(entry);

+

+   if (debug) {

+      printf("add %s\n", var->name);

+

+      printf("current entries\n");

+      foreach_iter(exec_list_iterator, iter, *assignments) {

+	 assignment_entry *entry = (assignment_entry *)iter.get();

+

+	 printf("    %s\n", entry->lhs->name);

+      }

+   }

+

+   return progress;

+}

+

+static void

+dead_code_local_basic_block(ir_instruction *first,

+			     ir_instruction *last,

+			     void *data)

+{

+   ir_instruction *ir, *ir_next;

+   /* List of avaialble_copy */

+   exec_list assignments;

+   bool *out_progress = (bool *)data;

+   bool progress = false;

+

+   void *ctx = ralloc_context(NULL);

+   /* Safe looping, since process_assignment */

+   for (ir = first, ir_next = (ir_instruction *)first->next;;

+	ir = ir_next, ir_next = (ir_instruction *)ir->next) {

+      ir_assignment *ir_assign = ir->as_assignment();

+

+      if (debug) {

+	 ir->print();

+	 printf("\n");

+      }

+

+      if (ir_assign) {

+	 progress = process_assignment(ctx, ir_assign, &assignments) || progress;

+      } else {

+	 kill_for_derefs_visitor kill(&assignments);

+	 ir->accept(&kill);

+      }

+

+      if (ir == last)

+	 break;

+   }

+   *out_progress = progress;

+   ralloc_free(ctx);

+}

+

+/**

+ * Does a copy propagation pass on the code present in the instruction stream.

+ */

+bool

+do_dead_code_local(exec_list *instructions)

+{

+   bool progress = false;

+

+   call_for_basic_blocks(instructions, dead_code_local_basic_block, &progress);

+

+   return progress;

+}

diff --git a/mesalib/src/glsl/opt_dead_functions.cpp b/mesalib/src/glsl/opt_dead_functions.cpp
index d72eb6115..6d41af5c5 100644
--- a/mesalib/src/glsl/opt_dead_functions.cpp
+++ b/mesalib/src/glsl/opt_dead_functions.cpp
@@ -1,155 +1,153 @@
- /*
-  * 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.
-  */
-
- /**
-  * \file opt_dead_functions.cpp
-  *
-  * Eliminates unused functions from the linked program.
-  */
-
- #include "ir.h"
- #include "ir_visitor.h"
- #include "ir_expression_flattening.h"
- #include "glsl_types.h"
-
- using std::strcmp;
-
- class signature_entry : public exec_node
- {
- public:
-    signature_entry(ir_function_signature *sig)
-    {
-       this->signature = sig;
-       this->used = false;
-    }
-
-    ir_function_signature *signature;
-    bool used;
- };
-
- class ir_dead_functions_visitor : public ir_hierarchical_visitor {
- public:
-    ir_dead_functions_visitor()
-    {
-       this->mem_ctx = ralloc_context(NULL);
-    }
-
-    ~ir_dead_functions_visitor()
-    {
-       ralloc_free(this->mem_ctx);
-    }
-
-    virtual ir_visitor_status visit_enter(ir_function_signature *);
-    virtual ir_visitor_status visit_enter(ir_call *);
-
-    signature_entry *get_signature_entry(ir_function_signature *var);
-
-    bool (*predicate)(ir_instruction *ir);
-
-    /* List of signature_entry */
-    exec_list signature_list;
-    void *mem_ctx;
- };
-
-
- signature_entry *
- ir_dead_functions_visitor::get_signature_entry(ir_function_signature *sig)
- {
-    foreach_iter(exec_list_iterator, iter, this->signature_list) {
-       signature_entry *entry = (signature_entry *)iter.get();
-       if (entry->signature == sig)
-	  return entry;
-    }
-
-    signature_entry *entry = new(mem_ctx) signature_entry(sig);
-    this->signature_list.push_tail(entry);
-    return entry;
- }
-
-
- ir_visitor_status
- ir_dead_functions_visitor::visit_enter(ir_function_signature *ir)
- {
-    signature_entry *entry = this->get_signature_entry(ir);
-
-    if (strcmp(ir->function_name(), "main") == 0) {
-       entry->used = true;
-    }
-
-    return visit_continue;
- }
-
-
- ir_visitor_status
- ir_dead_functions_visitor::visit_enter(ir_call *ir)
- {
-    signature_entry *entry = this->get_signature_entry(ir->get_callee());
-
-    entry->used = true;
-
-   return visit_continue;
-}
-
-bool
-do_dead_functions(exec_list *instructions)
-{
-   ir_dead_functions_visitor v;
-   bool progress = false;
-
-   visit_list_elements(&v, instructions);
-
-   /* Now that we've figured out which function signatures are used, remove
-    * the unused ones, and remove function definitions that have no more
-    * signatures.
-    */
-    foreach_iter(exec_list_iterator, iter, v.signature_list) {
-      signature_entry *entry = (signature_entry *)iter.get();
-
-      if (!entry->used) {
-	 entry->signature->remove();
-	 delete entry->signature;
-	 progress = true;
-      }
-      delete(entry);
-   }
-
-   /* We don't just do this above when we nuked a signature because of
-    * const pointers.
-    */
-   foreach_iter(exec_list_iterator, iter, *instructions) {
-      ir_instruction *ir = (ir_instruction *)iter.get();
-      ir_function *func = ir->as_function();
-
-      if (func && func->signatures.is_empty()) {
-	 /* At this point (post-linking), the symbol table is no
-	  * longer in use, so not removing the function from the
-	  * symbol table should be OK.
-	  */
-	 func->remove();
-	 delete func;
-	 progress = true;
-      }
-   }
-
-   return progress;
-}
+ /*

+  * 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.

+  */

+

+ /**

+  * \file opt_dead_functions.cpp

+  *

+  * Eliminates unused functions from the linked program.

+  */

+

+ #include "ir.h"

+ #include "ir_visitor.h"

+ #include "ir_expression_flattening.h"

+ #include "glsl_types.h"

+

+ class signature_entry : public exec_node

+ {

+ public:

+    signature_entry(ir_function_signature *sig)

+    {

+       this->signature = sig;

+       this->used = false;

+    }

+

+    ir_function_signature *signature;

+    bool used;

+ };

+

+ class ir_dead_functions_visitor : public ir_hierarchical_visitor {

+ public:

+    ir_dead_functions_visitor()

+    {

+       this->mem_ctx = ralloc_context(NULL);

+    }

+

+    ~ir_dead_functions_visitor()

+    {

+       ralloc_free(this->mem_ctx);

+    }

+

+    virtual ir_visitor_status visit_enter(ir_function_signature *);

+    virtual ir_visitor_status visit_enter(ir_call *);

+

+    signature_entry *get_signature_entry(ir_function_signature *var);

+

+    bool (*predicate)(ir_instruction *ir);

+

+    /* List of signature_entry */

+    exec_list signature_list;

+    void *mem_ctx;

+ };

+

+

+ signature_entry *

+ ir_dead_functions_visitor::get_signature_entry(ir_function_signature *sig)

+ {

+    foreach_iter(exec_list_iterator, iter, this->signature_list) {

+       signature_entry *entry = (signature_entry *)iter.get();

+       if (entry->signature == sig)

+	  return entry;

+    }

+

+    signature_entry *entry = new(mem_ctx) signature_entry(sig);

+    this->signature_list.push_tail(entry);

+    return entry;

+ }

+

+

+ ir_visitor_status

+ ir_dead_functions_visitor::visit_enter(ir_function_signature *ir)

+ {

+    signature_entry *entry = this->get_signature_entry(ir);

+

+    if (strcmp(ir->function_name(), "main") == 0) {

+       entry->used = true;

+    }

+

+    return visit_continue;

+ }

+

+

+ ir_visitor_status

+ ir_dead_functions_visitor::visit_enter(ir_call *ir)

+ {

+    signature_entry *entry = this->get_signature_entry(ir->get_callee());

+

+    entry->used = true;

+

+   return visit_continue;

+}

+

+bool

+do_dead_functions(exec_list *instructions)

+{

+   ir_dead_functions_visitor v;

+   bool progress = false;

+

+   visit_list_elements(&v, instructions);

+

+   /* Now that we've figured out which function signatures are used, remove

+    * the unused ones, and remove function definitions that have no more

+    * signatures.

+    */

+    foreach_iter(exec_list_iterator, iter, v.signature_list) {

+      signature_entry *entry = (signature_entry *)iter.get();

+

+      if (!entry->used) {

+	 entry->signature->remove();

+	 delete entry->signature;

+	 progress = true;

+      }

+      delete(entry);

+   }

+

+   /* We don't just do this above when we nuked a signature because of

+    * const pointers.

+    */

+   foreach_iter(exec_list_iterator, iter, *instructions) {

+      ir_instruction *ir = (ir_instruction *)iter.get();

+      ir_function *func = ir->as_function();

+

+      if (func && func->signatures.is_empty()) {

+	 /* At this point (post-linking), the symbol table is no

+	  * longer in use, so not removing the function from the

+	  * symbol table should be OK.

+	  */

+	 func->remove();

+	 delete func;

+	 progress = true;

+      }

+   }

+

+   return progress;

+}

diff --git a/mesalib/src/glsl/opt_structure_splitting.cpp b/mesalib/src/glsl/opt_structure_splitting.cpp
index 8686da06a..ec2315499 100644
--- a/mesalib/src/glsl/opt_structure_splitting.cpp
+++ b/mesalib/src/glsl/opt_structure_splitting.cpp
@@ -1,364 +1,361 @@
-/*
- * 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.
- */
-
-/**
- * \file opt_structure_splitting.cpp
- *
- * If a structure is only ever referenced by its components, then
- * split those components out to individual variables so they can be
- * handled normally by other optimization passes.
- *
- * This skips structures like uniforms, which need to be accessible as
- * structures for their access by the GL.
- */
-
-#include "ir.h"
-#include "ir_visitor.h"
-#include "ir_print_visitor.h"
-#include "ir_rvalue_visitor.h"
-#include "glsl_types.h"
-
-using std::printf;
-using std::strcmp;
-
-static bool debug = false;
-
-// XXX using variable_entry2 here to avoid collision (MSVC multiply-defined
-// function) with the variable_entry class seen in ir_variable_refcount.h
-// Perhaps we can use the one in ir_variable_refcount.h and make this class
-// here go away?
-class variable_entry2 : public exec_node
-{
-public:
-   variable_entry2(ir_variable *var)
-   {
-      this->var = var;
-      this->whole_structure_access = 0;
-      this->declaration = false;
-      this->components = NULL;
-      this->mem_ctx = NULL;
-   }
-
-   ir_variable *var; /* The key: the variable's pointer. */
-
-   /** Number of times the variable is referenced, including assignments. */
-   unsigned whole_structure_access;
-
-   bool declaration; /* If the variable had a decl in the instruction stream */
-
-   ir_variable **components;
-
-   /** ralloc_parent(this->var) -- the shader's ralloc context. */
-   void *mem_ctx;
-};
-
-
-class ir_structure_reference_visitor : public ir_hierarchical_visitor {
-public:
-   ir_structure_reference_visitor(void)
-   {
-      this->mem_ctx = ralloc_context(NULL);
-      this->variable_list.make_empty();
-   }
-
-   ~ir_structure_reference_visitor(void)
-   {
-      ralloc_free(mem_ctx);
-   }
-
-   virtual ir_visitor_status visit(ir_variable *);
-   virtual ir_visitor_status visit(ir_dereference_variable *);
-   virtual ir_visitor_status visit_enter(ir_dereference_record *);
-   virtual ir_visitor_status visit_enter(ir_assignment *);
-   virtual ir_visitor_status visit_enter(ir_function_signature *);
-
-   variable_entry2 *get_variable_entry2(ir_variable *var);
-
-   /* List of variable_entry */
-   exec_list variable_list;
-
-   void *mem_ctx;
-};
-
-variable_entry2 *
-ir_structure_reference_visitor::get_variable_entry2(ir_variable *var)
-{
-   assert(var);
-
-   if (!var->type->is_record() || var->mode == ir_var_uniform)
-      return NULL;
-
-   foreach_iter(exec_list_iterator, iter, this->variable_list) {
-      variable_entry2 *entry = (variable_entry2 *)iter.get();
-      if (entry->var == var)
-	 return entry;
-   }
-
-   variable_entry2 *entry = new(mem_ctx) variable_entry2(var);
-   this->variable_list.push_tail(entry);
-   return entry;
-}
-
-
-ir_visitor_status
-ir_structure_reference_visitor::visit(ir_variable *ir)
-{
-   variable_entry2 *entry = this->get_variable_entry2(ir);
-
-   if (entry)
-      entry->declaration = true;
-
-   return visit_continue;
-}
-
-ir_visitor_status
-ir_structure_reference_visitor::visit(ir_dereference_variable *ir)
-{
-   ir_variable *const var = ir->variable_referenced();
-   variable_entry2 *entry = this->get_variable_entry2(var);
-
-   if (entry)
-      entry->whole_structure_access++;
-
-   return visit_continue;
-}
-
-ir_visitor_status
-ir_structure_reference_visitor::visit_enter(ir_dereference_record *ir)
-{
-   (void) ir;
-   /* Don't descend into the ir_dereference_variable below. */
-   return visit_continue_with_parent;
-}
-
-ir_visitor_status
-ir_structure_reference_visitor::visit_enter(ir_assignment *ir)
-{
-   if (ir->lhs->as_dereference_variable() &&
-       ir->rhs->as_dereference_variable() &&
-       !ir->condition) {
-      /* We'll split copies of a structure to copies of components, so don't
-       * descend to the ir_dereference_variables.
-       */
-      return visit_continue_with_parent;
-   }
-   return visit_continue;
-}
-
-ir_visitor_status
-ir_structure_reference_visitor::visit_enter(ir_function_signature *ir)
-{
-   /* We don't want to descend into the function parameters and
-    * dead-code eliminate them, so just accept the body here.
-    */
-   visit_list_elements(this, &ir->body);
-   return visit_continue_with_parent;
-}
-
-class ir_structure_splitting_visitor : public ir_rvalue_visitor {
-public:
-   ir_structure_splitting_visitor(exec_list *vars)
-   {
-      this->variable_list = vars;
-   }
-
-   virtual ~ir_structure_splitting_visitor()
-   {
-   }
-
-   virtual ir_visitor_status visit_leave(ir_assignment *);
-
-   void split_deref(ir_dereference **deref);
-   void handle_rvalue(ir_rvalue **rvalue);
-   variable_entry2 *get_splitting_entry(ir_variable *var);
-
-   exec_list *variable_list;
-   void *mem_ctx;
-};
-
-variable_entry2 *
-ir_structure_splitting_visitor::get_splitting_entry(ir_variable *var)
-{
-   assert(var);
-
-   if (!var->type->is_record())
-      return NULL;
-
-   foreach_iter(exec_list_iterator, iter, *this->variable_list) {
-      variable_entry2 *entry = (variable_entry2 *)iter.get();
-      if (entry->var == var) {
-	 return entry;
-      }
-   }
-
-   return NULL;
-}
-
-void
-ir_structure_splitting_visitor::split_deref(ir_dereference **deref)
-{
-   if ((*deref)->ir_type != ir_type_dereference_record)
-      return;
-
-   ir_dereference_record *deref_record = (ir_dereference_record *)*deref;
-   ir_dereference_variable *deref_var = deref_record->record->as_dereference_variable();
-   if (!deref_var)
-      return;
-
-   variable_entry2 *entry = get_splitting_entry(deref_var->var);
-   if (!entry)
-      return;
-
-   unsigned int i;
-   for (i = 0; i < entry->var->type->length; i++) {
-      if (strcmp(deref_record->field,
-		 entry->var->type->fields.structure[i].name) == 0)
-	 break;
-   }
-   assert(i != entry->var->type->length);
-
-   *deref = new(entry->mem_ctx) ir_dereference_variable(entry->components[i]);
-}
-
-void
-ir_structure_splitting_visitor::handle_rvalue(ir_rvalue **rvalue)
-{
-   if (!*rvalue)
-      return;
-
-   ir_dereference *deref = (*rvalue)->as_dereference();
-
-   if (!deref)
-      return;
-
-   split_deref(&deref);
-   *rvalue = deref;
-}
-
-ir_visitor_status
-ir_structure_splitting_visitor::visit_leave(ir_assignment *ir)
-{
-   ir_dereference_variable *lhs_deref = ir->lhs->as_dereference_variable();
-   ir_dereference_variable *rhs_deref = ir->rhs->as_dereference_variable();
-   variable_entry2 *lhs_entry = lhs_deref ? get_splitting_entry(lhs_deref->var) : NULL;
-   variable_entry2 *rhs_entry = rhs_deref ? get_splitting_entry(rhs_deref->var) : NULL;
-   const glsl_type *type = ir->rhs->type;
-
-   if ((lhs_entry || rhs_entry) && !ir->condition) {
-      for (unsigned int i = 0; i < type->length; i++) {
-	 ir_dereference *new_lhs, *new_rhs;
-	 void *mem_ctx = lhs_entry ? lhs_entry->mem_ctx : rhs_entry->mem_ctx;
-
-	 if (lhs_entry) {
-	    new_lhs = new(mem_ctx) ir_dereference_variable(lhs_entry->components[i]);
-	 } else {
-	    new_lhs = new(mem_ctx)
-	       ir_dereference_record(ir->lhs->clone(mem_ctx, NULL),
-				     type->fields.structure[i].name);
-	 }
-
-	 if (rhs_entry) {
-	    new_rhs = new(mem_ctx) ir_dereference_variable(rhs_entry->components[i]);
-	 } else {
-	    new_rhs = new(mem_ctx)
-	       ir_dereference_record(ir->rhs->clone(mem_ctx, NULL),
-				     type->fields.structure[i].name);
-	 }
-
-	 ir->insert_before(new(mem_ctx) ir_assignment(new_lhs,
-						      new_rhs,
-						      NULL));
-      }
-      ir->remove();
-   } else {
-      handle_rvalue(&ir->rhs);
-      split_deref(&ir->lhs);
-   }
-
-   handle_rvalue(&ir->condition);
-
-   return visit_continue;
-}
-
-bool
-do_structure_splitting(exec_list *instructions)
-{
-   ir_structure_reference_visitor refs;
-
-   visit_list_elements(&refs, instructions);
-
-   /* Trim out variables we can't split. */
-   foreach_iter(exec_list_iterator, iter, refs.variable_list) {
-      variable_entry2 *entry = (variable_entry2 *)iter.get();
-
-      if (debug) {
-	 printf("structure %s@%p: decl %d, whole_access %d\n",
-		entry->var->name, (void *) entry->var, entry->declaration,
-		entry->whole_structure_access);
-      }
-
-      if (!entry->declaration || entry->whole_structure_access) {
-	 entry->remove();
-      }
-   }
-
-   if (refs.variable_list.is_empty())
-      return false;
-
-   void *mem_ctx = ralloc_context(NULL);
-
-   /* Replace the decls of the structures to be split with their split
-    * components.
-    */
-   foreach_iter(exec_list_iterator, iter, refs.variable_list) {
-      variable_entry2 *entry = (variable_entry2 *)iter.get();
-      const struct glsl_type *type = entry->var->type;
-
-      entry->mem_ctx = ralloc_parent(entry->var);
-
-      entry->components = ralloc_array(mem_ctx,
-				       ir_variable *,
-				       type->length);
-
-      for (unsigned int i = 0; i < entry->var->type->length; i++) {
-	 const char *name = ralloc_asprintf(mem_ctx, "%s_%s",
-					    entry->var->name,
-					    type->fields.structure[i].name);
-
-	 entry->components[i] =
-	    new(entry->mem_ctx) ir_variable(type->fields.structure[i].type,
-					    name,
-					    ir_var_temporary);
-	 entry->var->insert_before(entry->components[i]);
-      }
-
-      entry->var->remove();
-   }
-
-   ir_structure_splitting_visitor split(&refs.variable_list);
-   visit_list_elements(&split, instructions);
-
-   ralloc_free(mem_ctx);
-
-   return true;
-}
+/*

+ * 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.

+ */

+

+/**

+ * \file opt_structure_splitting.cpp

+ *

+ * If a structure is only ever referenced by its components, then

+ * split those components out to individual variables so they can be

+ * handled normally by other optimization passes.

+ *

+ * This skips structures like uniforms, which need to be accessible as

+ * structures for their access by the GL.

+ */

+

+#include "ir.h"

+#include "ir_visitor.h"

+#include "ir_print_visitor.h"

+#include "ir_rvalue_visitor.h"

+#include "glsl_types.h"

+

+static bool debug = false;

+

+// XXX using variable_entry2 here to avoid collision (MSVC multiply-defined

+// function) with the variable_entry class seen in ir_variable_refcount.h

+// Perhaps we can use the one in ir_variable_refcount.h and make this class

+// here go away?

+class variable_entry2 : public exec_node

+{

+public:

+   variable_entry2(ir_variable *var)

+   {

+      this->var = var;

+      this->whole_structure_access = 0;

+      this->declaration = false;

+      this->components = NULL;

+      this->mem_ctx = NULL;

+   }

+

+   ir_variable *var; /* The key: the variable's pointer. */

+

+   /** Number of times the variable is referenced, including assignments. */

+   unsigned whole_structure_access;

+

+   bool declaration; /* If the variable had a decl in the instruction stream */

+

+   ir_variable **components;

+

+   /** ralloc_parent(this->var) -- the shader's ralloc context. */

+   void *mem_ctx;

+};

+

+

+class ir_structure_reference_visitor : public ir_hierarchical_visitor {

+public:

+   ir_structure_reference_visitor(void)

+   {

+      this->mem_ctx = ralloc_context(NULL);

+      this->variable_list.make_empty();

+   }

+

+   ~ir_structure_reference_visitor(void)

+   {

+      ralloc_free(mem_ctx);

+   }

+

+   virtual ir_visitor_status visit(ir_variable *);

+   virtual ir_visitor_status visit(ir_dereference_variable *);

+   virtual ir_visitor_status visit_enter(ir_dereference_record *);

+   virtual ir_visitor_status visit_enter(ir_assignment *);

+   virtual ir_visitor_status visit_enter(ir_function_signature *);

+

+   variable_entry2 *get_variable_entry2(ir_variable *var);

+

+   /* List of variable_entry */

+   exec_list variable_list;

+

+   void *mem_ctx;

+};

+

+variable_entry2 *

+ir_structure_reference_visitor::get_variable_entry2(ir_variable *var)

+{

+   assert(var);

+

+   if (!var->type->is_record() || var->mode == ir_var_uniform)

+      return NULL;

+

+   foreach_iter(exec_list_iterator, iter, this->variable_list) {

+      variable_entry2 *entry = (variable_entry2 *)iter.get();

+      if (entry->var == var)

+	 return entry;

+   }

+

+   variable_entry2 *entry = new(mem_ctx) variable_entry2(var);

+   this->variable_list.push_tail(entry);

+   return entry;

+}

+

+

+ir_visitor_status

+ir_structure_reference_visitor::visit(ir_variable *ir)

+{

+   variable_entry2 *entry = this->get_variable_entry2(ir);

+

+   if (entry)

+      entry->declaration = true;

+

+   return visit_continue;

+}

+

+ir_visitor_status

+ir_structure_reference_visitor::visit(ir_dereference_variable *ir)

+{

+   ir_variable *const var = ir->variable_referenced();

+   variable_entry2 *entry = this->get_variable_entry2(var);

+

+   if (entry)

+      entry->whole_structure_access++;

+

+   return visit_continue;

+}

+

+ir_visitor_status

+ir_structure_reference_visitor::visit_enter(ir_dereference_record *ir)

+{

+   (void) ir;

+   /* Don't descend into the ir_dereference_variable below. */

+   return visit_continue_with_parent;

+}

+

+ir_visitor_status

+ir_structure_reference_visitor::visit_enter(ir_assignment *ir)

+{

+   if (ir->lhs->as_dereference_variable() &&

+       ir->rhs->as_dereference_variable() &&

+       !ir->condition) {

+      /* We'll split copies of a structure to copies of components, so don't

+       * descend to the ir_dereference_variables.

+       */

+      return visit_continue_with_parent;

+   }

+   return visit_continue;

+}

+

+ir_visitor_status

+ir_structure_reference_visitor::visit_enter(ir_function_signature *ir)

+{

+   /* We don't want to descend into the function parameters and

+    * dead-code eliminate them, so just accept the body here.

+    */

+   visit_list_elements(this, &ir->body);

+   return visit_continue_with_parent;

+}

+

+class ir_structure_splitting_visitor : public ir_rvalue_visitor {

+public:

+   ir_structure_splitting_visitor(exec_list *vars)

+   {

+      this->variable_list = vars;

+   }

+

+   virtual ~ir_structure_splitting_visitor()

+   {

+   }

+

+   virtual ir_visitor_status visit_leave(ir_assignment *);

+

+   void split_deref(ir_dereference **deref);

+   void handle_rvalue(ir_rvalue **rvalue);

+   variable_entry2 *get_splitting_entry(ir_variable *var);

+

+   exec_list *variable_list;

+   void *mem_ctx;

+};

+

+variable_entry2 *

+ir_structure_splitting_visitor::get_splitting_entry(ir_variable *var)

+{

+   assert(var);

+

+   if (!var->type->is_record())

+      return NULL;

+

+   foreach_iter(exec_list_iterator, iter, *this->variable_list) {

+      variable_entry2 *entry = (variable_entry2 *)iter.get();

+      if (entry->var == var) {

+	 return entry;

+      }

+   }

+

+   return NULL;

+}

+

+void

+ir_structure_splitting_visitor::split_deref(ir_dereference **deref)

+{

+   if ((*deref)->ir_type != ir_type_dereference_record)

+      return;

+

+   ir_dereference_record *deref_record = (ir_dereference_record *)*deref;

+   ir_dereference_variable *deref_var = deref_record->record->as_dereference_variable();

+   if (!deref_var)

+      return;

+

+   variable_entry2 *entry = get_splitting_entry(deref_var->var);

+   if (!entry)

+      return;

+

+   unsigned int i;

+   for (i = 0; i < entry->var->type->length; i++) {

+      if (strcmp(deref_record->field,

+		 entry->var->type->fields.structure[i].name) == 0)

+	 break;

+   }

+   assert(i != entry->var->type->length);

+

+   *deref = new(entry->mem_ctx) ir_dereference_variable(entry->components[i]);

+}

+

+void

+ir_structure_splitting_visitor::handle_rvalue(ir_rvalue **rvalue)

+{

+   if (!*rvalue)

+      return;

+

+   ir_dereference *deref = (*rvalue)->as_dereference();

+

+   if (!deref)

+      return;

+

+   split_deref(&deref);

+   *rvalue = deref;

+}

+

+ir_visitor_status

+ir_structure_splitting_visitor::visit_leave(ir_assignment *ir)

+{

+   ir_dereference_variable *lhs_deref = ir->lhs->as_dereference_variable();

+   ir_dereference_variable *rhs_deref = ir->rhs->as_dereference_variable();

+   variable_entry2 *lhs_entry = lhs_deref ? get_splitting_entry(lhs_deref->var) : NULL;

+   variable_entry2 *rhs_entry = rhs_deref ? get_splitting_entry(rhs_deref->var) : NULL;

+   const glsl_type *type = ir->rhs->type;

+

+   if ((lhs_entry || rhs_entry) && !ir->condition) {

+      for (unsigned int i = 0; i < type->length; i++) {

+	 ir_dereference *new_lhs, *new_rhs;

+	 void *mem_ctx = lhs_entry ? lhs_entry->mem_ctx : rhs_entry->mem_ctx;

+

+	 if (lhs_entry) {

+	    new_lhs = new(mem_ctx) ir_dereference_variable(lhs_entry->components[i]);

+	 } else {

+	    new_lhs = new(mem_ctx)

+	       ir_dereference_record(ir->lhs->clone(mem_ctx, NULL),

+				     type->fields.structure[i].name);

+	 }

+

+	 if (rhs_entry) {

+	    new_rhs = new(mem_ctx) ir_dereference_variable(rhs_entry->components[i]);

+	 } else {

+	    new_rhs = new(mem_ctx)

+	       ir_dereference_record(ir->rhs->clone(mem_ctx, NULL),

+				     type->fields.structure[i].name);

+	 }

+

+	 ir->insert_before(new(mem_ctx) ir_assignment(new_lhs,

+						      new_rhs,

+						      NULL));

+      }

+      ir->remove();

+   } else {

+      handle_rvalue(&ir->rhs);

+      split_deref(&ir->lhs);

+   }

+

+   handle_rvalue(&ir->condition);

+

+   return visit_continue;

+}

+

+bool

+do_structure_splitting(exec_list *instructions)

+{

+   ir_structure_reference_visitor refs;

+

+   visit_list_elements(&refs, instructions);

+

+   /* Trim out variables we can't split. */

+   foreach_iter(exec_list_iterator, iter, refs.variable_list) {

+      variable_entry2 *entry = (variable_entry2 *)iter.get();

+

+      if (debug) {

+	 printf("structure %s@%p: decl %d, whole_access %d\n",

+		entry->var->name, (void *) entry->var, entry->declaration,

+		entry->whole_structure_access);

+      }

+

+      if (!entry->declaration || entry->whole_structure_access) {

+	 entry->remove();

+      }

+   }

+

+   if (refs.variable_list.is_empty())

+      return false;

+

+   void *mem_ctx = ralloc_context(NULL);

+

+   /* Replace the decls of the structures to be split with their split

+    * components.

+    */

+   foreach_iter(exec_list_iterator, iter, refs.variable_list) {

+      variable_entry2 *entry = (variable_entry2 *)iter.get();

+      const struct glsl_type *type = entry->var->type;

+

+      entry->mem_ctx = ralloc_parent(entry->var);

+

+      entry->components = ralloc_array(mem_ctx,

+				       ir_variable *,

+				       type->length);

+

+      for (unsigned int i = 0; i < entry->var->type->length; i++) {

+	 const char *name = ralloc_asprintf(mem_ctx, "%s_%s",

+					    entry->var->name,

+					    type->fields.structure[i].name);

+

+	 entry->components[i] =

+	    new(entry->mem_ctx) ir_variable(type->fields.structure[i].type,

+					    name,

+					    ir_var_temporary);

+	 entry->var->insert_before(entry->components[i]);

+      }

+

+      entry->var->remove();

+   }

+

+   ir_structure_splitting_visitor split(&refs.variable_list);

+   visit_list_elements(&split, instructions);

+

+   ralloc_free(mem_ctx);

+

+   return true;

+}

diff --git a/mesalib/src/glsl/opt_swizzle_swizzle.cpp b/mesalib/src/glsl/opt_swizzle_swizzle.cpp
index 8d0e1051d..e23655240 100644
--- a/mesalib/src/glsl/opt_swizzle_swizzle.cpp
+++ b/mesalib/src/glsl/opt_swizzle_swizzle.cpp
@@ -1,95 +1,93 @@
-/*
- * 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.
- */
-
-/**
- * \file opt_swizzle_swizzle.cpp
- *
- * Eliminates the second swizzle in a swizzle chain.
- */
-
-#include "ir.h"
-#include "ir_visitor.h"
-#include "ir_optimization.h"
-#include "glsl_types.h"
-
-using std::memset;
-
-class ir_swizzle_swizzle_visitor : public ir_hierarchical_visitor {
-public:
-   ir_swizzle_swizzle_visitor()
-   {
-      progress = false;
-   }
-
-   virtual ir_visitor_status visit_enter(ir_swizzle *);
-
-   bool progress;
-};
-
-ir_visitor_status
-ir_swizzle_swizzle_visitor::visit_enter(ir_swizzle *ir)
-{
-   int mask2[4];
-
-   ir_swizzle *swiz2 = ir->val->as_swizzle();
-   if (!swiz2)
-      return visit_continue;
-
-   memset(&mask2, 0, sizeof(mask2));
-   if (swiz2->mask.num_components >= 1)
-      mask2[0] = swiz2->mask.x;
-   if (swiz2->mask.num_components >= 2)
-      mask2[1] = swiz2->mask.y;
-   if (swiz2->mask.num_components >= 3)
-      mask2[2] = swiz2->mask.z;
-   if (swiz2->mask.num_components >= 4)
-      mask2[3] = swiz2->mask.w;
-
-   if (ir->mask.num_components >= 1)
-      ir->mask.x = mask2[ir->mask.x];
-   if (ir->mask.num_components >= 2)
-      ir->mask.y = mask2[ir->mask.y];
-   if (ir->mask.num_components >= 3)
-      ir->mask.z = mask2[ir->mask.z];
-   if (ir->mask.num_components >= 4)
-      ir->mask.w = mask2[ir->mask.w];
-
-   ir->val = swiz2->val;
-
-   this->progress = true;
-
-   return visit_continue;
-}
-
-/**
- * Does a copy propagation pass on the code present in the instruction stream.
- */
-bool
-do_swizzle_swizzle(exec_list *instructions)
-{
-   ir_swizzle_swizzle_visitor v;
-
-   v.run(instructions);
-
-   return v.progress;
-}
+/*

+ * 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.

+ */

+

+/**

+ * \file opt_swizzle_swizzle.cpp

+ *

+ * Eliminates the second swizzle in a swizzle chain.

+ */

+

+#include "ir.h"

+#include "ir_visitor.h"

+#include "ir_optimization.h"

+#include "glsl_types.h"

+

+class ir_swizzle_swizzle_visitor : public ir_hierarchical_visitor {

+public:

+   ir_swizzle_swizzle_visitor()

+   {

+      progress = false;

+   }

+

+   virtual ir_visitor_status visit_enter(ir_swizzle *);

+

+   bool progress;

+};

+

+ir_visitor_status

+ir_swizzle_swizzle_visitor::visit_enter(ir_swizzle *ir)

+{

+   int mask2[4];

+

+   ir_swizzle *swiz2 = ir->val->as_swizzle();

+   if (!swiz2)

+      return visit_continue;

+

+   memset(&mask2, 0, sizeof(mask2));

+   if (swiz2->mask.num_components >= 1)

+      mask2[0] = swiz2->mask.x;

+   if (swiz2->mask.num_components >= 2)

+      mask2[1] = swiz2->mask.y;

+   if (swiz2->mask.num_components >= 3)

+      mask2[2] = swiz2->mask.z;

+   if (swiz2->mask.num_components >= 4)

+      mask2[3] = swiz2->mask.w;

+

+   if (ir->mask.num_components >= 1)

+      ir->mask.x = mask2[ir->mask.x];

+   if (ir->mask.num_components >= 2)

+      ir->mask.y = mask2[ir->mask.y];

+   if (ir->mask.num_components >= 3)

+      ir->mask.z = mask2[ir->mask.z];

+   if (ir->mask.num_components >= 4)

+      ir->mask.w = mask2[ir->mask.w];

+

+   ir->val = swiz2->val;

+

+   this->progress = true;

+

+   return visit_continue;

+}

+

+/**

+ * Does a copy propagation pass on the code present in the instruction stream.

+ */

+bool

+do_swizzle_swizzle(exec_list *instructions)

+{

+   ir_swizzle_swizzle_visitor v;

+

+   v.run(instructions);

+

+   return v.progress;

+}

diff --git a/mesalib/src/glsl/opt_tree_grafting.cpp b/mesalib/src/glsl/opt_tree_grafting.cpp
index a85ba8234..75bd11c09 100644
--- a/mesalib/src/glsl/opt_tree_grafting.cpp
+++ b/mesalib/src/glsl/opt_tree_grafting.cpp
@@ -1,370 +1,368 @@
-/*
- * 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.
- */
-
-/**
- * \file opt_tree_grafting.cpp
- *
- * Takes assignments to variables that are dereferenced only once and
- * pastes the RHS expression into where the variable is dereferenced.
- *
- * In the process of various operations like function inlining and
- * tertiary op handling, we'll end up with our expression trees having
- * been chopped up into a series of assignments of short expressions
- * to temps.  Other passes like ir_algebraic.cpp would prefer to see
- * the deepest expression trees they can to try to optimize them.
- *
- * This is a lot like copy propagaton.  In comparison, copy
- * propagation only acts on plain copies, not arbitrary expressions on
- * the RHS.  Generally, we wouldn't want to go pasting some
- * complicated expression everywhere it got used, though, so we don't
- * handle expressions in that pass.
- *
- * The hard part is making sure we don't move an expression across
- * some other assignments that would change the value of the
- * expression.  So we split this into two passes: First, find the
- * variables in our scope which are written to once and read once, and
- * then go through basic blocks seeing if we find an opportunity to
- * move those expressions safely.
- */
-
-#include "ir.h"
-#include "ir_visitor.h"
-#include "ir_variable_refcount.h"
-#include "ir_basic_block.h"
-#include "ir_optimization.h"
-#include "glsl_types.h"
-
-using std::printf;
-
-static bool debug = false;
-
-class ir_tree_grafting_visitor : public ir_hierarchical_visitor {
-public:
-   ir_tree_grafting_visitor(ir_assignment *graft_assign,
-			    ir_variable *graft_var)
-   {
-      this->progress = false;
-      this->graft_assign = graft_assign;
-      this->graft_var = graft_var;
-   }
-
-   virtual ir_visitor_status visit_leave(class ir_assignment *);
-   virtual ir_visitor_status visit_enter(class ir_call *);
-   virtual ir_visitor_status visit_enter(class ir_expression *);
-   virtual ir_visitor_status visit_enter(class ir_function *);
-   virtual ir_visitor_status visit_enter(class ir_function_signature *);
-   virtual ir_visitor_status visit_enter(class ir_if *);
-   virtual ir_visitor_status visit_enter(class ir_loop *);
-   virtual ir_visitor_status visit_enter(class ir_swizzle *);
-   virtual ir_visitor_status visit_enter(class ir_texture *);
-
-   bool do_graft(ir_rvalue **rvalue);
-
-   bool progress;
-   ir_variable *graft_var;
-   ir_assignment *graft_assign;
-};
-
-struct find_deref_info {
-   ir_variable *var;
-   bool found;
-};
-
-void
-dereferences_variable_callback(ir_instruction *ir, void *data)
-{
-   struct find_deref_info *info = (struct find_deref_info *)data;
-   ir_dereference_variable *deref = ir->as_dereference_variable();
-
-   if (deref && deref->var == info->var)
-      info->found = true;
-}
-
-static bool
-dereferences_variable(ir_instruction *ir, ir_variable *var)
-{
-   struct find_deref_info info;
-
-   info.var = var;
-   info.found = false;
-
-   visit_tree(ir, dereferences_variable_callback, &info);
-
-   return info.found;
-}
-
-bool
-ir_tree_grafting_visitor::do_graft(ir_rvalue **rvalue)
-{
-   if (!*rvalue)
-      return false;
-
-   ir_dereference_variable *deref = (*rvalue)->as_dereference_variable();
-
-   if (!deref || deref->var != this->graft_var)
-      return false;
-
-   if (debug) {
-      printf("GRAFTING:\n");
-      this->graft_assign->print();
-      printf("\n");
-      printf("TO:\n");
-      (*rvalue)->print();
-      printf("\n");
-   }
-
-   this->graft_assign->remove();
-   *rvalue = this->graft_assign->rhs;
-
-   this->progress = true;
-   return true;
-}
-
-ir_visitor_status
-ir_tree_grafting_visitor::visit_enter(ir_loop *ir)
-{
-   (void)ir;
-   /* Do not traverse into the body of the loop since that is a
-    * different basic block.
-    */
-   return visit_stop;
-}
-
-ir_visitor_status
-ir_tree_grafting_visitor::visit_leave(ir_assignment *ir)
-{
-   if (do_graft(&ir->rhs) ||
-       do_graft(&ir->condition))
-      return visit_stop;
-
-   /* If this assignment updates a variable used in the assignment
-    * we're trying to graft, then we're done.
-    */
-   if (dereferences_variable(this->graft_assign->rhs,
-			     ir->lhs->variable_referenced())) {
-      if (debug) {
-	 printf("graft killed by: ");
-	 ir->print();
-	 printf("\n");
-      }
-      return visit_stop;
-   }
-
-   return visit_continue;
-}
-
-ir_visitor_status
-ir_tree_grafting_visitor::visit_enter(ir_function *ir)
-{
-   (void) ir;
-   return visit_continue_with_parent;
-}
-
-ir_visitor_status
-ir_tree_grafting_visitor::visit_enter(ir_function_signature *ir)
-{
-   (void)ir;
-   return visit_continue_with_parent;
-}
-
-ir_visitor_status
-ir_tree_grafting_visitor::visit_enter(ir_call *ir)
-{
-   exec_list_iterator sig_iter = ir->get_callee()->parameters.iterator();
-   /* Reminder: iterating ir_call iterates its parameters. */
-   foreach_iter(exec_list_iterator, iter, *ir) {
-      ir_variable *sig_param = (ir_variable *)sig_iter.get();
-      ir_rvalue *ir = (ir_rvalue *)iter.get();
-      ir_rvalue *new_ir = ir;
-
-      if (sig_param->mode != ir_var_in && sig_param->mode != ir_var_const_in)
-	 continue;
-
-      if (do_graft(&new_ir)) {
-	 ir->replace_with(new_ir);
-	 return visit_stop;
-      }
-      sig_iter.next();
-   }
-
-   return visit_continue;
-}
-
-ir_visitor_status
-ir_tree_grafting_visitor::visit_enter(ir_expression *ir)
-{
-   for (unsigned int i = 0; i < ir->get_num_operands(); i++) {
-      if (do_graft(&ir->operands[i]))
-	 return visit_stop;
-   }
-
-   return visit_continue;
-}
-
-ir_visitor_status
-ir_tree_grafting_visitor::visit_enter(ir_if *ir)
-{
-   if (do_graft(&ir->condition))
-      return visit_stop;
-
-   /* Do not traverse into the body of the if-statement since that is a
-    * different basic block.
-    */
-   return visit_continue_with_parent;
-}
-
-ir_visitor_status
-ir_tree_grafting_visitor::visit_enter(ir_swizzle *ir)
-{
-   if (do_graft(&ir->val))
-      return visit_stop;
-
-   return visit_continue;
-}
-
-ir_visitor_status
-ir_tree_grafting_visitor::visit_enter(ir_texture *ir)
-{
-   if (do_graft(&ir->coordinate) ||
-       do_graft(&ir->projector) ||
-       do_graft(&ir->offset) ||
-       do_graft(&ir->shadow_comparitor))
-	 return visit_stop;
-
-   switch (ir->op) {
-   case ir_tex:
-      break;
-   case ir_txb:
-      if (do_graft(&ir->lod_info.bias))
-	 return visit_stop;
-      break;
-   case ir_txf:
-   case ir_txl:
-      if (do_graft(&ir->lod_info.lod))
-	 return visit_stop;
-      break;
-   case ir_txd:
-      if (do_graft(&ir->lod_info.grad.dPdx) ||
-	  do_graft(&ir->lod_info.grad.dPdy))
-	 return visit_stop;
-      break;
-   }
-
-   return visit_continue;
-}
-
-struct tree_grafting_info {
-   ir_variable_refcount_visitor *refs;
-   bool progress;
-};
-
-static bool
-try_tree_grafting(ir_assignment *start,
-		  ir_variable *lhs_var,
-		  ir_instruction *bb_last)
-{
-   ir_tree_grafting_visitor v(start, lhs_var);
-
-   if (debug) {
-      printf("trying to graft: ");
-      lhs_var->print();
-      printf("\n");
-   }
-
-   for (ir_instruction *ir = (ir_instruction *)start->next;
-	ir != bb_last->next;
-	ir = (ir_instruction *)ir->next) {
-
-      if (debug) {
-	 printf("- ");
-	 ir->print();
-	 printf("\n");
-      }
-
-      ir_visitor_status s = ir->accept(&v);
-      if (s == visit_stop)
-	 return v.progress;
-   }
-
-   return false;
-}
-
-static void
-tree_grafting_basic_block(ir_instruction *bb_first,
-			  ir_instruction *bb_last,
-			  void *data)
-{
-   struct tree_grafting_info *info = (struct tree_grafting_info *)data;
-   ir_instruction *ir, *next;
-
-   for (ir = bb_first, next = (ir_instruction *)ir->next;
-	ir != bb_last->next;
-	ir = next, next = (ir_instruction *)ir->next) {
-      ir_assignment *assign = ir->as_assignment();
-
-      if (!assign)
-	 continue;
-
-      ir_variable *lhs_var = assign->whole_variable_written();
-      if (!lhs_var)
-	 continue;
-
-      if (lhs_var->mode == ir_var_out ||
-	  lhs_var->mode == ir_var_inout)
-	 continue;
-
-      variable_entry *entry = info->refs->get_variable_entry(lhs_var);
-
-      if (!entry->declaration ||
-	  entry->assigned_count != 1 ||
-	  entry->referenced_count != 2)
-	 continue;
-
-      assert(assign == entry->assign);
-
-      /* Found a possibly graftable assignment.  Now, walk through the
-       * rest of the BB seeing if the deref is here, and if nothing interfered with
-       * pasting its expression's values in between.
-       */
-      info->progress |= try_tree_grafting(assign, lhs_var, bb_last);
-   }
-}
-
-/**
- * Does a copy propagation pass on the code present in the instruction stream.
- */
-bool
-do_tree_grafting(exec_list *instructions)
-{
-   ir_variable_refcount_visitor refs;
-   struct tree_grafting_info info;
-
-   info.progress = false;
-   info.refs = &refs;
-
-   visit_list_elements(info.refs, instructions);
-
-   call_for_basic_blocks(instructions, tree_grafting_basic_block, &info);
-
-   return info.progress;
-}
+/*

+ * 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.

+ */

+

+/**

+ * \file opt_tree_grafting.cpp

+ *

+ * Takes assignments to variables that are dereferenced only once and

+ * pastes the RHS expression into where the variable is dereferenced.

+ *

+ * In the process of various operations like function inlining and

+ * tertiary op handling, we'll end up with our expression trees having

+ * been chopped up into a series of assignments of short expressions

+ * to temps.  Other passes like ir_algebraic.cpp would prefer to see

+ * the deepest expression trees they can to try to optimize them.

+ *

+ * This is a lot like copy propagaton.  In comparison, copy

+ * propagation only acts on plain copies, not arbitrary expressions on

+ * the RHS.  Generally, we wouldn't want to go pasting some

+ * complicated expression everywhere it got used, though, so we don't

+ * handle expressions in that pass.

+ *

+ * The hard part is making sure we don't move an expression across

+ * some other assignments that would change the value of the

+ * expression.  So we split this into two passes: First, find the

+ * variables in our scope which are written to once and read once, and

+ * then go through basic blocks seeing if we find an opportunity to

+ * move those expressions safely.

+ */

+

+#include "ir.h"

+#include "ir_visitor.h"

+#include "ir_variable_refcount.h"

+#include "ir_basic_block.h"

+#include "ir_optimization.h"

+#include "glsl_types.h"

+

+static bool debug = false;

+

+class ir_tree_grafting_visitor : public ir_hierarchical_visitor {

+public:

+   ir_tree_grafting_visitor(ir_assignment *graft_assign,

+			    ir_variable *graft_var)

+   {

+      this->progress = false;

+      this->graft_assign = graft_assign;

+      this->graft_var = graft_var;

+   }

+

+   virtual ir_visitor_status visit_leave(class ir_assignment *);

+   virtual ir_visitor_status visit_enter(class ir_call *);

+   virtual ir_visitor_status visit_enter(class ir_expression *);

+   virtual ir_visitor_status visit_enter(class ir_function *);

+   virtual ir_visitor_status visit_enter(class ir_function_signature *);

+   virtual ir_visitor_status visit_enter(class ir_if *);

+   virtual ir_visitor_status visit_enter(class ir_loop *);

+   virtual ir_visitor_status visit_enter(class ir_swizzle *);

+   virtual ir_visitor_status visit_enter(class ir_texture *);

+

+   bool do_graft(ir_rvalue **rvalue);

+

+   bool progress;

+   ir_variable *graft_var;

+   ir_assignment *graft_assign;

+};

+

+struct find_deref_info {

+   ir_variable *var;

+   bool found;

+};

+

+void

+dereferences_variable_callback(ir_instruction *ir, void *data)

+{

+   struct find_deref_info *info = (struct find_deref_info *)data;

+   ir_dereference_variable *deref = ir->as_dereference_variable();

+

+   if (deref && deref->var == info->var)

+      info->found = true;

+}

+

+static bool

+dereferences_variable(ir_instruction *ir, ir_variable *var)

+{

+   struct find_deref_info info;

+

+   info.var = var;

+   info.found = false;

+

+   visit_tree(ir, dereferences_variable_callback, &info);

+

+   return info.found;

+}

+

+bool

+ir_tree_grafting_visitor::do_graft(ir_rvalue **rvalue)

+{

+   if (!*rvalue)

+      return false;

+

+   ir_dereference_variable *deref = (*rvalue)->as_dereference_variable();

+

+   if (!deref || deref->var != this->graft_var)

+      return false;

+

+   if (debug) {

+      printf("GRAFTING:\n");

+      this->graft_assign->print();

+      printf("\n");

+      printf("TO:\n");

+      (*rvalue)->print();

+      printf("\n");

+   }

+

+   this->graft_assign->remove();

+   *rvalue = this->graft_assign->rhs;

+

+   this->progress = true;

+   return true;

+}

+

+ir_visitor_status

+ir_tree_grafting_visitor::visit_enter(ir_loop *ir)

+{

+   (void)ir;

+   /* Do not traverse into the body of the loop since that is a

+    * different basic block.

+    */

+   return visit_stop;

+}

+

+ir_visitor_status

+ir_tree_grafting_visitor::visit_leave(ir_assignment *ir)

+{

+   if (do_graft(&ir->rhs) ||

+       do_graft(&ir->condition))

+      return visit_stop;

+

+   /* If this assignment updates a variable used in the assignment

+    * we're trying to graft, then we're done.

+    */

+   if (dereferences_variable(this->graft_assign->rhs,

+			     ir->lhs->variable_referenced())) {

+      if (debug) {

+	 printf("graft killed by: ");

+	 ir->print();

+	 printf("\n");

+      }

+      return visit_stop;

+   }

+

+   return visit_continue;

+}

+

+ir_visitor_status

+ir_tree_grafting_visitor::visit_enter(ir_function *ir)

+{

+   (void) ir;

+   return visit_continue_with_parent;

+}

+

+ir_visitor_status

+ir_tree_grafting_visitor::visit_enter(ir_function_signature *ir)

+{

+   (void)ir;

+   return visit_continue_with_parent;

+}

+

+ir_visitor_status

+ir_tree_grafting_visitor::visit_enter(ir_call *ir)

+{

+   exec_list_iterator sig_iter = ir->get_callee()->parameters.iterator();

+   /* Reminder: iterating ir_call iterates its parameters. */

+   foreach_iter(exec_list_iterator, iter, *ir) {

+      ir_variable *sig_param = (ir_variable *)sig_iter.get();

+      ir_rvalue *ir = (ir_rvalue *)iter.get();

+      ir_rvalue *new_ir = ir;

+

+      if (sig_param->mode != ir_var_in && sig_param->mode != ir_var_const_in)

+	 continue;

+

+      if (do_graft(&new_ir)) {

+	 ir->replace_with(new_ir);

+	 return visit_stop;

+      }

+      sig_iter.next();

+   }

+

+   return visit_continue;

+}

+

+ir_visitor_status

+ir_tree_grafting_visitor::visit_enter(ir_expression *ir)

+{

+   for (unsigned int i = 0; i < ir->get_num_operands(); i++) {

+      if (do_graft(&ir->operands[i]))

+	 return visit_stop;

+   }

+

+   return visit_continue;

+}

+

+ir_visitor_status

+ir_tree_grafting_visitor::visit_enter(ir_if *ir)

+{

+   if (do_graft(&ir->condition))

+      return visit_stop;

+

+   /* Do not traverse into the body of the if-statement since that is a

+    * different basic block.

+    */

+   return visit_continue_with_parent;

+}

+

+ir_visitor_status

+ir_tree_grafting_visitor::visit_enter(ir_swizzle *ir)

+{

+   if (do_graft(&ir->val))

+      return visit_stop;

+

+   return visit_continue;

+}

+

+ir_visitor_status

+ir_tree_grafting_visitor::visit_enter(ir_texture *ir)

+{

+   if (do_graft(&ir->coordinate) ||

+       do_graft(&ir->projector) ||

+       do_graft(&ir->offset) ||

+       do_graft(&ir->shadow_comparitor))

+	 return visit_stop;

+

+   switch (ir->op) {

+   case ir_tex:

+      break;

+   case ir_txb:

+      if (do_graft(&ir->lod_info.bias))

+	 return visit_stop;

+      break;

+   case ir_txf:

+   case ir_txl:

+      if (do_graft(&ir->lod_info.lod))

+	 return visit_stop;

+      break;

+   case ir_txd:

+      if (do_graft(&ir->lod_info.grad.dPdx) ||

+	  do_graft(&ir->lod_info.grad.dPdy))

+	 return visit_stop;

+      break;

+   }

+

+   return visit_continue;

+}

+

+struct tree_grafting_info {

+   ir_variable_refcount_visitor *refs;

+   bool progress;

+};

+

+static bool

+try_tree_grafting(ir_assignment *start,

+		  ir_variable *lhs_var,

+		  ir_instruction *bb_last)

+{

+   ir_tree_grafting_visitor v(start, lhs_var);

+

+   if (debug) {

+      printf("trying to graft: ");

+      lhs_var->print();

+      printf("\n");

+   }

+

+   for (ir_instruction *ir = (ir_instruction *)start->next;

+	ir != bb_last->next;

+	ir = (ir_instruction *)ir->next) {

+

+      if (debug) {

+	 printf("- ");

+	 ir->print();

+	 printf("\n");

+      }

+

+      ir_visitor_status s = ir->accept(&v);

+      if (s == visit_stop)

+	 return v.progress;

+   }

+

+   return false;

+}

+

+static void

+tree_grafting_basic_block(ir_instruction *bb_first,

+			  ir_instruction *bb_last,

+			  void *data)

+{

+   struct tree_grafting_info *info = (struct tree_grafting_info *)data;

+   ir_instruction *ir, *next;

+

+   for (ir = bb_first, next = (ir_instruction *)ir->next;

+	ir != bb_last->next;

+	ir = next, next = (ir_instruction *)ir->next) {

+      ir_assignment *assign = ir->as_assignment();

+

+      if (!assign)

+	 continue;

+

+      ir_variable *lhs_var = assign->whole_variable_written();

+      if (!lhs_var)

+	 continue;

+

+      if (lhs_var->mode == ir_var_out ||

+	  lhs_var->mode == ir_var_inout)

+	 continue;

+

+      variable_entry *entry = info->refs->get_variable_entry(lhs_var);

+

+      if (!entry->declaration ||

+	  entry->assigned_count != 1 ||

+	  entry->referenced_count != 2)

+	 continue;

+

+      assert(assign == entry->assign);

+

+      /* Found a possibly graftable assignment.  Now, walk through the

+       * rest of the BB seeing if the deref is here, and if nothing interfered with

+       * pasting its expression's values in between.

+       */

+      info->progress |= try_tree_grafting(assign, lhs_var, bb_last);

+   }

+}

+

+/**

+ * Does a copy propagation pass on the code present in the instruction stream.

+ */

+bool

+do_tree_grafting(exec_list *instructions)

+{

+   ir_variable_refcount_visitor refs;

+   struct tree_grafting_info info;

+

+   info.progress = false;

+   info.refs = &refs;

+

+   visit_list_elements(info.refs, instructions);

+

+   call_for_basic_blocks(instructions, tree_grafting_basic_block, &info);

+

+   return info.progress;

+}

diff --git a/mesalib/src/glsl/s_expression.cpp b/mesalib/src/glsl/s_expression.cpp
index 77ac08ac7..b47b014c6 100644
--- a/mesalib/src/glsl/s_expression.cpp
+++ b/mesalib/src/glsl/s_expression.cpp
@@ -1,186 +1,183 @@
-/* -*- 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.
- */
-
-#include <cstdio>
-#include <cstdlib>
-#include <cstring>
-#include <assert.h>
-#include "s_expression.h"
-
-s_symbol::s_symbol(const char *tmp, size_t n)
-{
-   this->str = ralloc_strndup (this, tmp, n);
-   assert(this->str != NULL);
-}
-
-s_list::s_list()
-{
-}
-
-static void
-skip_whitespace(const char *& src)
-{
-   src += strspn(src, " \v\t\r\n");
-   /* Also skip Scheme-style comments: semi-colon 'til end of line */
-   if (src[0] == ';') {
-      src += strcspn(src, "\n");
-      skip_whitespace(src);
-   }
-}
-
-static s_expression *
-read_atom(void *ctx, const char *& src)
-{
-   s_expression *expr = NULL;
-
-   skip_whitespace(src);
-
-   size_t n = strcspn(src, "( \v\t\r\n);");
-   if (n == 0)
-      return NULL; // no atom
-
-   // Check if the atom is a number.
-   char *float_end = NULL;
-   double f = glsl_strtod(src, &float_end);
-   if (float_end != src) {
-      char *int_end = NULL;
-      int i = strtol(src, &int_end, 10);
-      // If strtod matched more characters, it must have a decimal part
-      if (float_end > int_end)
-	 expr = new(ctx) s_float(f);
-      else
-	 expr = new(ctx) s_int(i);
-   } else {
-      // Not a number; return a symbol.
-      expr = new(ctx) s_symbol(src, n);
-   }
-
-   src += n;
-
-   return expr;
-}
-
-s_expression *
-s_expression::read_expression(void *ctx, const char *&src)
-{
-   assert(src != NULL);
-
-   s_expression *atom = read_atom(ctx, src);
-   if (atom != NULL)
-      return atom;
-
-   skip_whitespace(src);
-   if (src[0] == '(') {
-      ++src;
-
-      s_list *list = new(ctx) s_list;
-      s_expression *expr;
-
-      while ((expr = read_expression(ctx, src)) != NULL) {
-	 list->subexpressions.push_tail(expr);
-      }
-      skip_whitespace(src);
-      if (src[0] != ')') {
-	 printf("Unclosed expression (check your parenthesis).\n");
-	 return NULL;
-      }
-      ++src;
-      return list;
-   }
-   return NULL;
-}
-
-void s_int::print()
-{
-   printf("%d", this->val);
-}
-
-void s_float::print()
-{
-   printf("%f", this->val);
-}
-
-void s_symbol::print()
-{
-   printf("%s", this->str);
-}
-
-void s_list::print()
-{
-   printf("(");
-   foreach_iter(exec_list_iterator, it, this->subexpressions) {
-      s_expression *expr = (s_expression*) it.get();
-      expr->print();
-      if (!expr->next->is_tail_sentinel())
-	 printf(" ");
-   }
-   printf(")");
-}
-
-// --------------------------------------------------
-
-bool
-s_pattern::match(s_expression *expr)
-{
-   switch (type)
-   {
-   case EXPR:   *p_expr = expr; break;
-   case LIST:   if (expr->is_list())   *p_list   = (s_list *)   expr; break;
-   case SYMBOL: if (expr->is_symbol()) *p_symbol = (s_symbol *) expr; break;
-   case NUMBER: if (expr->is_number()) *p_number = (s_number *) expr; break;
-   case INT:    if (expr->is_int())    *p_int    = (s_int *)    expr; break;
-   case STRING:
-      s_symbol *sym = SX_AS_SYMBOL(expr);
-      if (sym != NULL && strcmp(sym->value(), literal) == 0)
-	 return true;
-      return false;
-   };
-
-   return *p_expr == expr;
-}
-
-bool
-s_match(s_expression *top, unsigned n, s_pattern *pattern, bool partial)
-{
-   s_list *list = SX_AS_LIST(top);
-   if (list == NULL)
-      return false;
-
-   unsigned i = 0;
-   foreach_iter(exec_list_iterator, it, list->subexpressions) {
-      if (i >= n)
-	 return partial; /* More actual items than the pattern expected */
-
-      s_expression *expr = (s_expression *) it.get();
-      if (expr == NULL || !pattern[i].match(expr))
-	 return false;
-
-      i++;
-   }
-
-   if (i < n)
-      return false; /* Less actual items than the pattern expected */
-
-   return true;
-}
+/* -*- 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.

+ */

+

+#include <assert.h>

+#include "s_expression.h"

+

+s_symbol::s_symbol(const char *tmp, size_t n)

+{

+   this->str = ralloc_strndup (this, tmp, n);

+   assert(this->str != NULL);

+}

+

+s_list::s_list()

+{

+}

+

+static void

+skip_whitespace(const char *& src)

+{

+   src += strspn(src, " \v\t\r\n");

+   /* Also skip Scheme-style comments: semi-colon 'til end of line */

+   if (src[0] == ';') {

+      src += strcspn(src, "\n");

+      skip_whitespace(src);

+   }

+}

+

+static s_expression *

+read_atom(void *ctx, const char *& src)

+{

+   s_expression *expr = NULL;

+

+   skip_whitespace(src);

+

+   size_t n = strcspn(src, "( \v\t\r\n);");

+   if (n == 0)

+      return NULL; // no atom

+

+   // Check if the atom is a number.

+   char *float_end = NULL;

+   double f = glsl_strtod(src, &float_end);

+   if (float_end != src) {

+      char *int_end = NULL;

+      int i = strtol(src, &int_end, 10);

+      // If strtod matched more characters, it must have a decimal part

+      if (float_end > int_end)

+	 expr = new(ctx) s_float(f);

+      else

+	 expr = new(ctx) s_int(i);

+   } else {

+      // Not a number; return a symbol.

+      expr = new(ctx) s_symbol(src, n);

+   }

+

+   src += n;

+

+   return expr;

+}

+

+s_expression *

+s_expression::read_expression(void *ctx, const char *&src)

+{

+   assert(src != NULL);

+

+   s_expression *atom = read_atom(ctx, src);

+   if (atom != NULL)

+      return atom;

+

+   skip_whitespace(src);

+   if (src[0] == '(') {

+      ++src;

+

+      s_list *list = new(ctx) s_list;

+      s_expression *expr;

+

+      while ((expr = read_expression(ctx, src)) != NULL) {

+	 list->subexpressions.push_tail(expr);

+      }

+      skip_whitespace(src);

+      if (src[0] != ')') {

+	 printf("Unclosed expression (check your parenthesis).\n");

+	 return NULL;

+      }

+      ++src;

+      return list;

+   }

+   return NULL;

+}

+

+void s_int::print()

+{

+   printf("%d", this->val);

+}

+

+void s_float::print()

+{

+   printf("%f", this->val);

+}

+

+void s_symbol::print()

+{

+   printf("%s", this->str);

+}

+

+void s_list::print()

+{

+   printf("(");

+   foreach_iter(exec_list_iterator, it, this->subexpressions) {

+      s_expression *expr = (s_expression*) it.get();

+      expr->print();

+      if (!expr->next->is_tail_sentinel())

+	 printf(" ");

+   }

+   printf(")");

+}

+

+// --------------------------------------------------

+

+bool

+s_pattern::match(s_expression *expr)

+{

+   switch (type)

+   {

+   case EXPR:   *p_expr = expr; break;

+   case LIST:   if (expr->is_list())   *p_list   = (s_list *)   expr; break;

+   case SYMBOL: if (expr->is_symbol()) *p_symbol = (s_symbol *) expr; break;

+   case NUMBER: if (expr->is_number()) *p_number = (s_number *) expr; break;

+   case INT:    if (expr->is_int())    *p_int    = (s_int *)    expr; break;

+   case STRING:

+      s_symbol *sym = SX_AS_SYMBOL(expr);

+      if (sym != NULL && strcmp(sym->value(), literal) == 0)

+	 return true;

+      return false;

+   };

+

+   return *p_expr == expr;

+}

+

+bool

+s_match(s_expression *top, unsigned n, s_pattern *pattern, bool partial)

+{

+   s_list *list = SX_AS_LIST(top);

+   if (list == NULL)

+      return false;

+

+   unsigned i = 0;

+   foreach_iter(exec_list_iterator, it, list->subexpressions) {

+      if (i >= n)

+	 return partial; /* More actual items than the pattern expected */

+

+      s_expression *expr = (s_expression *) it.get();

+      if (expr == NULL || !pattern[i].match(expr))

+	 return false;

+

+      i++;

+   }

+

+   if (i < n)

+      return false; /* Less actual items than the pattern expected */

+

+   return true;

+}