xserver libxcb mesa git update 5 Mar 2011

7 files changed, 6433 insertions, 6383 deletions

diff --git a/mesalib/src/glsl/SConscript b/mesalib/src/glsl/SConscript
index bb02a87c7..d7c3459f2 100644
--- a/mesalib/src/glsl/SConscript
+++ b/mesalib/src/glsl/SConscript
@@ -1,170 +1,176 @@
-import common
-
-Import('*')
-
-from sys import executable as python_cmd
-
-env = env.Clone()
-
-env.Prepend(CPPPATH = [
-    '#include',
-    '#src/mapi',
-    '#src/mesa',
-    '#src/glsl',
-    '#src/glsl/glcpp',
-])
-
-# Make glcpp/glcpp-parse.h and glsl_parser.h reacheable from the include path
-env.Append(CPPPATH = [Dir('.').abspath])
-
-env.Append(YACCFLAGS = '-d')
-
-parser_env = env.Clone()
-parser_env.Append(YACCFLAGS = [
-    '--defines=%s' % File('glsl_parser.h').abspath,
-    '-p', '_mesa_glsl_',
-])
-
-glcpp_lexer = env.CFile('glcpp/glcpp-lex.c', 'glcpp/glcpp-lex.l')
-glcpp_parser = env.CFile('glcpp/glcpp-parse.c', 'glcpp/glcpp-parse.y')
-glsl_lexer = parser_env.CXXFile('glsl_lexer.cpp', 'glsl_lexer.ll')
-glsl_parser = parser_env.CXXFile('glsl_parser.cpp', 'glsl_parser.yy')
-
-sources = [
-    glcpp_lexer,
-    glcpp_parser[0],
-    'glcpp/pp.c',
-    'ast_expr.cpp',
-    'ast_function.cpp',
-    'ast_to_hir.cpp',
-    'ast_type.cpp',
-    glsl_lexer,
-    glsl_parser[0],
-    'glsl_parser_extras.cpp',
-    'glsl_types.cpp',
-    'glsl_symbol_table.cpp',
-    'hir_field_selection.cpp',
-    'ir_basic_block.cpp',
-    'ir_clone.cpp',
-    'ir_constant_expression.cpp',
-    'ir.cpp',
-    'ir_expression_flattening.cpp',
-    'ir_function_can_inline.cpp',
-    'ir_function.cpp',
-    'ir_hierarchical_visitor.cpp',
-    'ir_hv_accept.cpp',
-    'ir_import_prototypes.cpp',
-    'ir_print_visitor.cpp',
-    'ir_reader.cpp',
-    'ir_rvalue_visitor.cpp',
-    'ir_set_program_inouts.cpp',
-    'ir_validate.cpp',
-    'ir_variable.cpp',
-    'ir_variable_refcount.cpp',
-    'linker.cpp',
-    'link_functions.cpp',
-    'loop_analysis.cpp',
-    'loop_controls.cpp',
-    'loop_unroll.cpp',
-    'lower_discard.cpp',
-    'lower_if_to_cond_assign.cpp',
-    'lower_instructions.cpp',
-    'lower_jumps.cpp',
-    'lower_mat_op_to_vec.cpp',
-    'lower_noise.cpp',
-    'lower_variable_index_to_cond_assign.cpp',
-    'lower_vec_index_to_cond_assign.cpp',
-    'lower_vec_index_to_swizzle.cpp',
-    'lower_vector.cpp',
-    'opt_algebraic.cpp',
-    'opt_constant_folding.cpp',
-    'opt_constant_propagation.cpp',
-    'opt_constant_variable.cpp',
-    'opt_copy_propagation.cpp',
-    'opt_copy_propagation_elements.cpp',
-    'opt_dead_code.cpp',
-    'opt_dead_code_local.cpp',
-    'opt_dead_functions.cpp',
-    'opt_discard_simplification.cpp',
-    'opt_function_inlining.cpp',
-    'opt_if_simplification.cpp',
-    'opt_noop_swizzle.cpp',
-    'opt_redundant_jumps.cpp',
-    'opt_structure_splitting.cpp',
-    'opt_swizzle_swizzle.cpp',
-    'opt_tree_grafting.cpp',
-    'ralloc.c',
-    's_expression.cpp',
-    'strtod.c',
-] 
-
-
-if env['crosscompile'] and env['platform'] != 'embedded':
-    Import('builtin_glsl_function')
-else:
-    if env['msvc']:
-        env.Prepend(CPPPATH = ['#/src/getopt'])
-        env.PrependUnique(LIBS = [getopt])
-
-    builtin_compiler = env.Program(
-        target = 'builtin_compiler',
-        source = sources + ['main.cpp', 'builtin_stubs.cpp',
-                            '#src/mesa/program/hash_table.c',
-                            '#src/mesa/program/symbol_table.c'],
-    )
-
-    # SCons builtin dependency scanner doesn't detect that glsl_lexer.ll
-    # depends on glsl_parser.h
-    env.Depends(builtin_compiler, glsl_parser)
-
-    builtin_glsl_function = env.CodeGenerate(
-        target = 'builtin_function.cpp',
-        script = 'builtins/tools/generate_builtins.py',
-        source = builtin_compiler,
-        command = python_cmd + ' $SCRIPT $SOURCE > $TARGET'
-    )
-
-    env.Depends(builtin_glsl_function, ['builtins/tools/generate_builtins.py', 'builtins/tools/texture_builtins.py'] + Glob('builtins/ir/*'))
-
-    Export('builtin_glsl_function')
-
-    if env['hostonly']:
-        Return()
-
-
-sources += builtin_glsl_function
-
-glsl = env.ConvenienceLibrary(
-    target = 'glsl',
-    source = sources,
-)
-
-# SCons builtin dependency scanner doesn't detect that glsl_lexer.ll depends on
-# glsl_parser.h
-env.Depends(glsl, glsl_parser)
-
-Export('glsl')
-
-# FIXME: We can't build the programs because there's a cyclic dependency between tis directory and src/mesa
-Return()
-
-env = env.Clone()
-
-if env['platform'] == 'windows':
-    env.PrependUnique(LIBS = [
-        'user32',
-    ])
-
-env.Prepend(LIBS = [glsl])
-
-env.Program(
-    target = 'glsl2',
-    source = [
-        'main.cpp',
-    ]
-)
-
-env.Program(
-    target = 'glcpp',
-    source = ['glcpp/glcpp.c'],
-)
+import common

+

+Import('*')

+

+from sys import executable as python_cmd

+

+env = env.Clone()

+

+env.Prepend(CPPPATH = [

+    '#include',

+    '#src/mapi',

+    '#src/mesa',

+    '#src/glsl',

+    '#src/glsl/glcpp',

+])

+

+# Make glcpp/glcpp-parse.h and glsl_parser.h reacheable from the include path

+env.Append(CPPPATH = [Dir('.').abspath])

+

+env.Append(YACCFLAGS = '-d')

+

+parser_env = env.Clone()

+parser_env.Append(YACCFLAGS = [

+    '--defines=%s' % File('glsl_parser.h').abspath,

+    '-p', '_mesa_glsl_',

+])

+

+glcpp_lexer = env.CFile('glcpp/glcpp-lex.c', 'glcpp/glcpp-lex.l')

+glcpp_parser = env.CFile('glcpp/glcpp-parse.c', 'glcpp/glcpp-parse.y')

+glsl_lexer = parser_env.CXXFile('glsl_lexer.cpp', 'glsl_lexer.ll')

+glsl_parser = parser_env.CXXFile('glsl_parser.cpp', 'glsl_parser.yy')

+

+glsl_sources = [

+    glcpp_lexer,

+    glcpp_parser[0],

+    'glcpp/pp.c',

+    'ast_expr.cpp',

+    'ast_function.cpp',

+    'ast_to_hir.cpp',

+    'ast_type.cpp',

+    glsl_lexer,

+    glsl_parser[0],

+    'glsl_parser_extras.cpp',

+    'glsl_types.cpp',

+    'glsl_symbol_table.cpp',

+    'hir_field_selection.cpp',

+    'ir_basic_block.cpp',

+    'ir_clone.cpp',

+    'ir_constant_expression.cpp',

+    'ir.cpp',

+    'ir_expression_flattening.cpp',

+    'ir_function_can_inline.cpp',

+    'ir_function.cpp',

+    'ir_hierarchical_visitor.cpp',

+    'ir_hv_accept.cpp',

+    'ir_import_prototypes.cpp',

+    'ir_print_visitor.cpp',

+    'ir_reader.cpp',

+    'ir_rvalue_visitor.cpp',

+    'ir_set_program_inouts.cpp',

+    'ir_validate.cpp',

+    'ir_variable.cpp',

+    'ir_variable_refcount.cpp',

+    'linker.cpp',

+    'link_functions.cpp',

+    'loop_analysis.cpp',

+    'loop_controls.cpp',

+    'loop_unroll.cpp',

+    'lower_discard.cpp',

+    'lower_if_to_cond_assign.cpp',

+    'lower_instructions.cpp',

+    'lower_jumps.cpp',

+    'lower_mat_op_to_vec.cpp',

+    'lower_noise.cpp',

+    'lower_variable_index_to_cond_assign.cpp',

+    'lower_vec_index_to_cond_assign.cpp',

+    'lower_vec_index_to_swizzle.cpp',

+    'lower_vector.cpp',

+    'opt_algebraic.cpp',

+    'opt_constant_folding.cpp',

+    'opt_constant_propagation.cpp',

+    'opt_constant_variable.cpp',

+    'opt_copy_propagation.cpp',

+    'opt_copy_propagation_elements.cpp',

+    'opt_dead_code.cpp',

+    'opt_dead_code_local.cpp',

+    'opt_dead_functions.cpp',

+    'opt_discard_simplification.cpp',

+    'opt_function_inlining.cpp',

+    'opt_if_simplification.cpp',

+    'opt_noop_swizzle.cpp',

+    'opt_redundant_jumps.cpp',

+    'opt_structure_splitting.cpp',

+    'opt_swizzle_swizzle.cpp',

+    'opt_tree_grafting.cpp',

+    'ralloc.c',

+    's_expression.cpp',

+    'strtod.c',

+] 

+

+if env['msvc']:

+    env.Prepend(CPPPATH = ['#/src/getopt'])

+    env.PrependUnique(LIBS = [getopt])

+

+if env['crosscompile'] and env['platform'] != 'embedded':

+    Import('builtin_glsl_function')

+else:

+    main_obj = env.StaticObject('main.cpp')

+

+    mesa_objs = env.StaticObject([

+        '#src/mesa/program/hash_table.c',

+        '#src/mesa/program/symbol_table.c',

+    ])

+

+    builtin_compiler = env.Program(

+        target = 'builtin_compiler',

+        source = main_obj + glsl_sources + ['builtin_stubs.cpp'] + mesa_objs,

+    )

+

+    # SCons builtin dependency scanner doesn't detect that glsl_lexer.ll

+    # depends on glsl_parser.h

+    env.Depends(builtin_compiler, glsl_parser)

+

+    builtin_glsl_function = env.CodeGenerate(

+        target = 'builtin_function.cpp',

+        script = 'builtins/tools/generate_builtins.py',

+        source = builtin_compiler,

+        command = python_cmd + ' $SCRIPT $SOURCE > $TARGET'

+    )

+

+    env.Depends(builtin_glsl_function, ['builtins/tools/generate_builtins.py', 'builtins/tools/texture_builtins.py'] + Glob('builtins/ir/*'))

+

+    Export('builtin_glsl_function')

+

+    if env['hostonly']:

+        Return()

+

+

+glsl_sources += builtin_glsl_function

+

+glsl = env.ConvenienceLibrary(

+    target = 'glsl',

+    source = glsl_sources,

+)

+

+# SCons builtin dependency scanner doesn't detect that glsl_lexer.ll depends on

+# glsl_parser.h

+env.Depends(glsl, glsl_parser)

+

+Export('glsl')

+

+# Skip building these programs as they will cause SCons error "Two environments

+# with different actions were specified for the same target"

+if env['crosscompile'] or env['platform'] == 'embedded':

+    Return()

+

+env = env.Clone()

+

+if env['platform'] == 'windows':

+    env.PrependUnique(LIBS = [

+        'user32',

+    ])

+

+env.Prepend(LIBS = [glsl])

+

+glsl2 = env.Program(

+    target = 'glsl2',

+    source = main_obj + mesa_objs,

+)

+env.Alias('glsl2', glsl2)

+

+glcpp = env.Program(

+    target = 'glcpp/glcpp',

+    source = ['glcpp/glcpp.c'] + mesa_objs,

+)

+env.Alias('glcpp', glcpp)

diff --git a/mesalib/src/glsl/ast_to_hir.cpp b/mesalib/src/glsl/ast_to_hir.cpp
index fd1f0b49f..b8a812d94 100644
--- a/mesalib/src/glsl/ast_to_hir.cpp
+++ b/mesalib/src/glsl/ast_to_hir.cpp
@@ -1,3461 +1,3499 @@
-/*
- * 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 ast_to_hir.c
- * Convert abstract syntax to to high-level intermediate reprensentation (HIR).
- *
- * During the conversion to HIR, the majority of the symantic checking is
- * preformed on the program.  This includes:
- *
- *    * Symbol table management
- *    * Type checking
- *    * Function binding
- *
- * The majority of this work could be done during parsing, and the parser could
- * probably generate HIR directly.  However, this results in frequent changes
- * to the parser code.  Since we do not assume that every system this complier
- * is built on will have Flex and Bison installed, we have to store the code
- * generated by these tools in our version control system.  In other parts of
- * the system we've seen problems where a parser was changed but the generated
- * code was not committed, merge conflicts where created because two developers
- * had slightly different versions of Bison installed, etc.
- *
- * I have also noticed that running Bison generated parsers in GDB is very
- * irritating.  When you get a segfault on '$$ = $1->foo', you can't very
- * well 'print $1' in GDB.
- *
- * As a result, my preference is to put as little C code as possible in the
- * parser (and lexer) sources.
- */
-
-#include "main/core.h" /* for struct gl_extensions */
-#include "glsl_symbol_table.h"
-#include "glsl_parser_extras.h"
-#include "ast.h"
-#include "glsl_types.h"
-#include "ir.h"
-
-void
-_mesa_ast_to_hir(exec_list *instructions, struct _mesa_glsl_parse_state *state)
-{
-   _mesa_glsl_initialize_variables(instructions, state);
-   _mesa_glsl_initialize_functions(state);
-
-   state->symbols->language_version = state->language_version;
-
-   state->current_function = NULL;
-
-   /* Section 4.2 of the GLSL 1.20 specification states:
-    * "The built-in functions are scoped in a scope outside the global scope
-    *  users declare global variables in.  That is, a shader's global scope,
-    *  available for user-defined functions and global variables, is nested
-    *  inside the scope containing the built-in functions."
-    *
-    * Since built-in functions like ftransform() access built-in variables,
-    * it follows that those must be in the outer scope as well.
-    *
-    * We push scope here to create this nesting effect...but don't pop.
-    * This way, a shader's globals are still in the symbol table for use
-    * by the linker.
-    */
-   state->symbols->push_scope();
-
-   foreach_list_typed (ast_node, ast, link, & state->translation_unit)
-      ast->hir(instructions, state);
-}
-
-
-/**
- * If a conversion is available, convert one operand to a different type
- *
- * The \c from \c ir_rvalue is converted "in place".
- *
- * \param to     Type that the operand it to be converted to
- * \param from   Operand that is being converted
- * \param state  GLSL compiler state
- *
- * \return
- * If a conversion is possible (or unnecessary), \c true is returned.
- * Otherwise \c false is returned.
- */
-bool
-apply_implicit_conversion(const glsl_type *to, ir_rvalue * &from,
-			  struct _mesa_glsl_parse_state *state)
-{
-   void *ctx = state;
-   if (to->base_type == from->type->base_type)
-      return true;
-
-   /* This conversion was added in GLSL 1.20.  If the compilation mode is
-    * GLSL 1.10, the conversion is skipped.
-    */
-   if (state->language_version < 120)
-      return false;
-
-   /* From page 27 (page 33 of the PDF) of the GLSL 1.50 spec:
-    *
-    *    "There are no implicit array or structure conversions. For
-    *    example, an array of int cannot be implicitly converted to an
-    *    array of float. There are no implicit conversions between
-    *    signed and unsigned integers."
-    */
-   /* FINISHME: The above comment is partially a lie.  There is int/uint
-    * FINISHME: conversion for immediate constants.
-    */
-   if (!to->is_float() || !from->type->is_numeric())
-      return false;
-
-   /* Convert to a floating point type with the same number of components
-    * as the original type - i.e. int to float, not int to vec4.
-    */
-   to = glsl_type::get_instance(GLSL_TYPE_FLOAT, from->type->vector_elements,
-			        from->type->matrix_columns);
-
-   switch (from->type->base_type) {
-   case GLSL_TYPE_INT:
-      from = new(ctx) ir_expression(ir_unop_i2f, to, from, NULL);
-      break;
-   case GLSL_TYPE_UINT:
-      from = new(ctx) ir_expression(ir_unop_u2f, to, from, NULL);
-      break;
-   case GLSL_TYPE_BOOL:
-      from = new(ctx) ir_expression(ir_unop_b2f, to, from, NULL);
-      break;
-   default:
-      assert(0);
-   }
-
-   return true;
-}
-
-
-static const struct glsl_type *
-arithmetic_result_type(ir_rvalue * &value_a, ir_rvalue * &value_b,
-		       bool multiply,
-		       struct _mesa_glsl_parse_state *state, YYLTYPE *loc)
-{
-   const glsl_type *type_a = value_a->type;
-   const glsl_type *type_b = value_b->type;
-
-   /* From GLSL 1.50 spec, page 56:
-    *
-    *    "The arithmetic binary operators add (+), subtract (-),
-    *    multiply (*), and divide (/) operate on integer and
-    *    floating-point scalars, vectors, and matrices."
-    */
-   if (!type_a->is_numeric() || !type_b->is_numeric()) {
-      _mesa_glsl_error(loc, state,
-		       "Operands to arithmetic operators must be numeric");
-      return glsl_type::error_type;
-   }
-
-
-   /*    "If one operand is floating-point based and the other is
-    *    not, then the conversions from Section 4.1.10 "Implicit
-    *    Conversions" are applied to the non-floating-point-based operand."
-    */
-   if (!apply_implicit_conversion(type_a, value_b, state)
-       && !apply_implicit_conversion(type_b, value_a, state)) {
-      _mesa_glsl_error(loc, state,
-		       "Could not implicitly convert operands to "
-		       "arithmetic operator");
-      return glsl_type::error_type;
-   }
-   type_a = value_a->type;
-   type_b = value_b->type;
-
-   /*    "If the operands are integer types, they must both be signed or
-    *    both be unsigned."
-    *
-    * From this rule and the preceeding conversion it can be inferred that
-    * both types must be GLSL_TYPE_FLOAT, or GLSL_TYPE_UINT, or GLSL_TYPE_INT.
-    * The is_numeric check above already filtered out the case where either
-    * type is not one of these, so now the base types need only be tested for
-    * equality.
-    */
-   if (type_a->base_type != type_b->base_type) {
-      _mesa_glsl_error(loc, state,
-		       "base type mismatch for arithmetic operator");
-      return glsl_type::error_type;
-   }
-
-   /*    "All arithmetic binary operators result in the same fundamental type
-    *    (signed integer, unsigned integer, or floating-point) as the
-    *    operands they operate on, after operand type conversion. After
-    *    conversion, the following cases are valid
-    *
-    *    * The two operands are scalars. In this case the operation is
-    *      applied, resulting in a scalar."
-    */
-   if (type_a->is_scalar() && type_b->is_scalar())
-      return type_a;
-
-   /*   "* One operand is a scalar, and the other is a vector or matrix.
-    *      In this case, the scalar operation is applied independently to each
-    *      component of the vector or matrix, resulting in the same size
-    *      vector or matrix."
-    */
-   if (type_a->is_scalar()) {
-      if (!type_b->is_scalar())
-	 return type_b;
-   } else if (type_b->is_scalar()) {
-      return type_a;
-   }
-
-   /* All of the combinations of <scalar, scalar>, <vector, scalar>,
-    * <scalar, vector>, <scalar, matrix>, and <matrix, scalar> have been
-    * handled.
-    */
-   assert(!type_a->is_scalar());
-   assert(!type_b->is_scalar());
-
-   /*   "* The two operands are vectors of the same size. In this case, the
-    *      operation is done component-wise resulting in the same size
-    *      vector."
-    */
-   if (type_a->is_vector() && type_b->is_vector()) {
-      if (type_a == type_b) {
-	 return type_a;
-      } else {
-	 _mesa_glsl_error(loc, state,
-			  "vector size mismatch for arithmetic operator");
-	 return glsl_type::error_type;
-      }
-   }
-
-   /* All of the combinations of <scalar, scalar>, <vector, scalar>,
-    * <scalar, vector>, <scalar, matrix>, <matrix, scalar>, and
-    * <vector, vector> have been handled.  At least one of the operands must
-    * be matrix.  Further, since there are no integer matrix types, the base
-    * type of both operands must be float.
-    */
-   assert(type_a->is_matrix() || type_b->is_matrix());
-   assert(type_a->base_type == GLSL_TYPE_FLOAT);
-   assert(type_b->base_type == GLSL_TYPE_FLOAT);
-
-   /*   "* The operator is add (+), subtract (-), or divide (/), and the
-    *      operands are matrices with the same number of rows and the same
-    *      number of columns. In this case, the operation is done component-
-    *      wise resulting in the same size matrix."
-    *    * The operator is multiply (*), where both operands are matrices or
-    *      one operand is a vector and the other a matrix. A right vector
-    *      operand is treated as a column vector and a left vector operand as a
-    *      row vector. In all these cases, it is required that the number of
-    *      columns of the left operand is equal to the number of rows of the
-    *      right operand. Then, the multiply (*) operation does a linear
-    *      algebraic multiply, yielding an object that has the same number of
-    *      rows as the left operand and the same number of columns as the right
-    *      operand. Section 5.10 "Vector and Matrix Operations" explains in
-    *      more detail how vectors and matrices are operated on."
-    */
-   if (! multiply) {
-      if (type_a == type_b)
-	 return type_a;
-   } else {
-      if (type_a->is_matrix() && type_b->is_matrix()) {
-	 /* Matrix multiply.  The columns of A must match the rows of B.  Given
-	  * the other previously tested constraints, this means the vector type
-	  * of a row from A must be the same as the vector type of a column from
-	  * B.
-	  */
-	 if (type_a->row_type() == type_b->column_type()) {
-	    /* The resulting matrix has the number of columns of matrix B and
-	     * the number of rows of matrix A.  We get the row count of A by
-	     * looking at the size of a vector that makes up a column.  The
-	     * transpose (size of a row) is done for B.
-	     */
-	    const glsl_type *const type =
-	       glsl_type::get_instance(type_a->base_type,
-				       type_a->column_type()->vector_elements,
-				       type_b->row_type()->vector_elements);
-	    assert(type != glsl_type::error_type);
-
-	    return type;
-	 }
-      } else if (type_a->is_matrix()) {
-	 /* A is a matrix and B is a column vector.  Columns of A must match
-	  * rows of B.  Given the other previously tested constraints, this
-	  * means the vector type of a row from A must be the same as the
-	  * vector the type of B.
-	  */
-	 if (type_a->row_type() == type_b) {
-	    /* The resulting vector has a number of elements equal to
-	     * the number of rows of matrix A. */
-	    const glsl_type *const type =
-	       glsl_type::get_instance(type_a->base_type,
-				       type_a->column_type()->vector_elements,
-				       1);
-	    assert(type != glsl_type::error_type);
-
-	    return type;
-	 }
-      } else {
-	 assert(type_b->is_matrix());
-
-	 /* A is a row vector and B is a matrix.  Columns of A must match rows
-	  * of B.  Given the other previously tested constraints, this means
-	  * the type of A must be the same as the vector type of a column from
-	  * B.
-	  */
-	 if (type_a == type_b->column_type()) {
-	    /* The resulting vector has a number of elements equal to
-	     * the number of columns of matrix B. */
-	    const glsl_type *const type =
-	       glsl_type::get_instance(type_a->base_type,
-				       type_b->row_type()->vector_elements,
-				       1);
-	    assert(type != glsl_type::error_type);
-
-	    return type;
-	 }
-      }
-
-      _mesa_glsl_error(loc, state, "size mismatch for matrix multiplication");
-      return glsl_type::error_type;
-   }
-
-
-   /*    "All other cases are illegal."
-    */
-   _mesa_glsl_error(loc, state, "type mismatch");
-   return glsl_type::error_type;
-}
-
-
-static const struct glsl_type *
-unary_arithmetic_result_type(const struct glsl_type *type,
-			     struct _mesa_glsl_parse_state *state, YYLTYPE *loc)
-{
-   /* From GLSL 1.50 spec, page 57:
-    *
-    *    "The arithmetic unary operators negate (-), post- and pre-increment
-    *     and decrement (-- and ++) operate on integer or floating-point
-    *     values (including vectors and matrices). All unary operators work
-    *     component-wise on their operands. These result with the same type
-    *     they operated on."
-    */
-   if (!type->is_numeric()) {
-      _mesa_glsl_error(loc, state,
-		       "Operands to arithmetic operators must be numeric");
-      return glsl_type::error_type;
-   }
-
-   return type;
-}
-
-/**
- * \brief Return the result type of a bit-logic operation.
- *
- * If the given types to the bit-logic operator are invalid, return
- * glsl_type::error_type.
- *
- * \param type_a Type of LHS of bit-logic op
- * \param type_b Type of RHS of bit-logic op
- */
-static const struct glsl_type *
-bit_logic_result_type(const struct glsl_type *type_a,
-                      const struct glsl_type *type_b,
-                      ast_operators op,
-                      struct _mesa_glsl_parse_state *state, YYLTYPE *loc)
-{
-    if (state->language_version < 130) {
-       _mesa_glsl_error(loc, state, "bit operations require GLSL 1.30");
-       return glsl_type::error_type;
-    }
-
-    /* From page 50 (page 56 of PDF) of GLSL 1.30 spec:
-     *
-     *     "The bitwise operators and (&), exclusive-or (^), and inclusive-or
-     *     (|). The operands must be of type signed or unsigned integers or
-     *     integer vectors."
-     */
-    if (!type_a->is_integer()) {
-       _mesa_glsl_error(loc, state, "LHS of `%s' must be an integer",
-                         ast_expression::operator_string(op));
-       return glsl_type::error_type;
-    }
-    if (!type_b->is_integer()) {
-       _mesa_glsl_error(loc, state, "RHS of `%s' must be an integer",
-                        ast_expression::operator_string(op));
-       return glsl_type::error_type;
-    }
-
-    /*     "The fundamental types of the operands (signed or unsigned) must
-     *     match,"
-     */
-    if (type_a->base_type != type_b->base_type) {
-       _mesa_glsl_error(loc, state, "operands of `%s' must have the same "
-                        "base type", ast_expression::operator_string(op));
-       return glsl_type::error_type;
-    }
-
-    /*     "The operands cannot be vectors of differing size." */
-    if (type_a->is_vector() &&
-        type_b->is_vector() &&
-        type_a->vector_elements != type_b->vector_elements) {
-       _mesa_glsl_error(loc, state, "operands of `%s' cannot be vectors of "
-                        "different sizes", ast_expression::operator_string(op));
-       return glsl_type::error_type;
-    }
-
-    /*     "If one operand is a scalar and the other a vector, the scalar is
-     *     applied component-wise to the vector, resulting in the same type as
-     *     the vector. The fundamental types of the operands [...] will be the
-     *     resulting fundamental type."
-     */
-    if (type_a->is_scalar())
-        return type_b;
-    else
-        return type_a;
-}
-
-static const struct glsl_type *
-modulus_result_type(const struct glsl_type *type_a,
-		    const struct glsl_type *type_b,
-		    struct _mesa_glsl_parse_state *state, YYLTYPE *loc)
-{
-   if (state->language_version < 130) {
-      _mesa_glsl_error(loc, state,
-                       "operator '%%' is reserved in %s",
-                       state->version_string);
-      return glsl_type::error_type;
-   }
-
-   /* From GLSL 1.50 spec, page 56:
-    *    "The operator modulus (%) operates on signed or unsigned integers or
-    *    integer vectors. The operand types must both be signed or both be
-    *    unsigned."
-    */
-   if (!type_a->is_integer() || !type_b->is_integer()
-       || (type_a->base_type != type_b->base_type)) {
-      _mesa_glsl_error(loc, state, "type mismatch");
-      return glsl_type::error_type;
-   }
-
-   /*    "The operands cannot be vectors of differing size. If one operand is
-    *    a scalar and the other vector, then the scalar is applied component-
-    *    wise to the vector, resulting in the same type as the vector. If both
-    *    are vectors of the same size, the result is computed component-wise."
-    */
-   if (type_a->is_vector()) {
-      if (!type_b->is_vector()
-	  || (type_a->vector_elements == type_b->vector_elements))
-	 return type_a;
-   } else
-      return type_b;
-
-   /*    "The operator modulus (%) is not defined for any other data types
-    *    (non-integer types)."
-    */
-   _mesa_glsl_error(loc, state, "type mismatch");
-   return glsl_type::error_type;
-}
-
-
-static const struct glsl_type *
-relational_result_type(ir_rvalue * &value_a, ir_rvalue * &value_b,
-		       struct _mesa_glsl_parse_state *state, YYLTYPE *loc)
-{
-   const glsl_type *type_a = value_a->type;
-   const glsl_type *type_b = value_b->type;
-
-   /* From GLSL 1.50 spec, page 56:
-    *    "The relational operators greater than (>), less than (<), greater
-    *    than or equal (>=), and less than or equal (<=) operate only on
-    *    scalar integer and scalar floating-point expressions."
-    */
-   if (!type_a->is_numeric()
-       || !type_b->is_numeric()
-       || !type_a->is_scalar()
-       || !type_b->is_scalar()) {
-      _mesa_glsl_error(loc, state,
-		       "Operands to relational operators must be scalar and "
-		       "numeric");
-      return glsl_type::error_type;
-   }
-
-   /*    "Either the operands' types must match, or the conversions from
-    *    Section 4.1.10 "Implicit Conversions" will be applied to the integer
-    *    operand, after which the types must match."
-    */
-   if (!apply_implicit_conversion(type_a, value_b, state)
-       && !apply_implicit_conversion(type_b, value_a, state)) {
-      _mesa_glsl_error(loc, state,
-		       "Could not implicitly convert operands to "
-		       "relational operator");
-      return glsl_type::error_type;
-   }
-   type_a = value_a->type;
-   type_b = value_b->type;
-
-   if (type_a->base_type != type_b->base_type) {
-      _mesa_glsl_error(loc, state, "base type mismatch");
-      return glsl_type::error_type;
-   }
-
-   /*    "The result is scalar Boolean."
-    */
-   return glsl_type::bool_type;
-}
-
-/**
- * \brief Return the result type of a bit-shift operation.
- *
- * If the given types to the bit-shift operator are invalid, return
- * glsl_type::error_type.
- *
- * \param type_a Type of LHS of bit-shift op
- * \param type_b Type of RHS of bit-shift op
- */
-static const struct glsl_type *
-shift_result_type(const struct glsl_type *type_a,
-                  const struct glsl_type *type_b,
-                  ast_operators op,
-                  struct _mesa_glsl_parse_state *state, YYLTYPE *loc)
-{
-   if (state->language_version < 130) {
-      _mesa_glsl_error(loc, state, "bit operations require GLSL 1.30");
-      return glsl_type::error_type;
-   }
-
-   /* From page 50 (page 56 of the PDF) of the GLSL 1.30 spec:
-    *
-    *     "The shift operators (<<) and (>>). For both operators, the operands
-    *     must be signed or unsigned integers or integer vectors. One operand
-    *     can be signed while the other is unsigned."
-    */
-   if (!type_a->is_integer()) {
-      _mesa_glsl_error(loc, state, "LHS of operator %s must be an integer or "
-              "integer vector", ast_expression::operator_string(op));
-     return glsl_type::error_type;
-
-   }
-   if (!type_b->is_integer()) {
-      _mesa_glsl_error(loc, state, "RHS of operator %s must be an integer or "
-              "integer vector", ast_expression::operator_string(op));
-     return glsl_type::error_type;
-   }
-
-   /*     "If the first operand is a scalar, the second operand has to be
-    *     a scalar as well."
-    */
-   if (type_a->is_scalar() && !type_b->is_scalar()) {
-      _mesa_glsl_error(loc, state, "If the first operand of %s is scalar, the "
-              "second must be scalar as well",
-              ast_expression::operator_string(op));
-     return glsl_type::error_type;
-   }
-
-   /* If both operands are vectors, check that they have same number of
-    * elements.
-    */
-   if (type_a->is_vector() &&
-      type_b->is_vector() &&
-      type_a->vector_elements != type_b->vector_elements) {
-      _mesa_glsl_error(loc, state, "Vector operands to operator %s must "
-              "have same number of elements",
-              ast_expression::operator_string(op));
-     return glsl_type::error_type;
-   }
-
-   /*     "In all cases, the resulting type will be the same type as the left
-    *     operand."
-    */
-   return type_a;
-}
-
-/**
- * Validates that a value can be assigned to a location with a specified type
- *
- * Validates that \c rhs can be assigned to some location.  If the types are
- * not an exact match but an automatic conversion is possible, \c rhs will be
- * converted.
- *
- * \return
- * \c NULL if \c rhs cannot be assigned to a location with type \c lhs_type.
- * Otherwise the actual RHS to be assigned will be returned.  This may be
- * \c rhs, or it may be \c rhs after some type conversion.
- *
- * \note
- * In addition to being used for assignments, this function is used to
- * type-check return values.
- */
-ir_rvalue *
-validate_assignment(struct _mesa_glsl_parse_state *state,
-		    const glsl_type *lhs_type, ir_rvalue *rhs)
-{
-   /* If there is already some error in the RHS, just return it.  Anything
-    * else will lead to an avalanche of error message back to the user.
-    */
-   if (rhs->type->is_error())
-      return rhs;
-
-   /* If the types are identical, the assignment can trivially proceed.
-    */
-   if (rhs->type == lhs_type)
-      return rhs;
-
-   /* If the array element types are the same and the size of the LHS is zero,
-    * the assignment is okay.
-    *
-    * Note: Whole-array assignments are not permitted in GLSL 1.10, but this
-    * is handled by ir_dereference::is_lvalue.
-    */
-   if (lhs_type->is_array() && rhs->type->is_array()
-       && (lhs_type->element_type() == rhs->type->element_type())
-       && (lhs_type->array_size() == 0)) {
-      return rhs;
-   }
-
-   /* Check for implicit conversion in GLSL 1.20 */
-   if (apply_implicit_conversion(lhs_type, rhs, state)) {
-      if (rhs->type == lhs_type)
-	 return rhs;
-   }
-
-   return NULL;
-}
-
-ir_rvalue *
-do_assignment(exec_list *instructions, struct _mesa_glsl_parse_state *state,
-	      ir_rvalue *lhs, ir_rvalue *rhs,
-	      YYLTYPE lhs_loc)
-{
-   void *ctx = state;
-   bool error_emitted = (lhs->type->is_error() || rhs->type->is_error());
-
-   if (!error_emitted) {
-      if (lhs->variable_referenced() != NULL
-          && lhs->variable_referenced()->read_only) {
-         _mesa_glsl_error(&lhs_loc, state,
-                          "assignment to read-only variable '%s'",
-                          lhs->variable_referenced()->name);
-         error_emitted = true;
-
-      } else if (!lhs->is_lvalue()) {
-	 _mesa_glsl_error(& lhs_loc, state, "non-lvalue in assignment");
-	 error_emitted = true;
-      }
-
-      if (state->es_shader && lhs->type->is_array()) {
-	 _mesa_glsl_error(&lhs_loc, state, "whole array assignment is not "
-			  "allowed in GLSL ES 1.00.");
-	 error_emitted = true;
-      }
-   }
-
-   ir_rvalue *new_rhs = validate_assignment(state, lhs->type, rhs);
-   if (new_rhs == NULL) {
-      _mesa_glsl_error(& lhs_loc, state, "type mismatch");
-   } else {
-      rhs = new_rhs;
-
-      /* If the LHS array was not declared with a size, it takes it size from
-       * the RHS.  If the LHS is an l-value and a whole array, it must be a
-       * dereference of a variable.  Any other case would require that the LHS
-       * is either not an l-value or not a whole array.
-       */
-      if (lhs->type->array_size() == 0) {
-	 ir_dereference *const d = lhs->as_dereference();
-
-	 assert(d != NULL);
-
-	 ir_variable *const var = d->variable_referenced();
-
-	 assert(var != NULL);
-
-	 if (var->max_array_access >= unsigned(rhs->type->array_size())) {
-	    /* FINISHME: This should actually log the location of the RHS. */
-	    _mesa_glsl_error(& lhs_loc, state, "array size must be > %u due to "
-			     "previous access",
-			     var->max_array_access);
-	 }
-
-	 var->type = glsl_type::get_array_instance(lhs->type->element_type(),
-						   rhs->type->array_size());
-	 d->type = var->type;
-      }
-   }
-
-   /* Most callers of do_assignment (assign, add_assign, pre_inc/dec,
-    * but not post_inc) need the converted assigned value as an rvalue
-    * to handle things like:
-    *
-    * i = j += 1;
-    *
-    * So we always just store the computed value being assigned to a
-    * temporary and return a deref of that temporary.  If the rvalue
-    * ends up not being used, the temp will get copy-propagated out.
-    */
-   ir_variable *var = new(ctx) ir_variable(rhs->type, "assignment_tmp",
-					   ir_var_temporary);
-   ir_dereference_variable *deref_var = new(ctx) ir_dereference_variable(var);
-   instructions->push_tail(var);
-   instructions->push_tail(new(ctx) ir_assignment(deref_var,
-						  rhs,
-						  NULL));
-   deref_var = new(ctx) ir_dereference_variable(var);
-
-   if (!error_emitted)
-      instructions->push_tail(new(ctx) ir_assignment(lhs, deref_var, NULL));
-
-   return new(ctx) ir_dereference_variable(var);
-}
-
-static ir_rvalue *
-get_lvalue_copy(exec_list *instructions, ir_rvalue *lvalue)
-{
-   void *ctx = ralloc_parent(lvalue);
-   ir_variable *var;
-
-   var = new(ctx) ir_variable(lvalue->type, "_post_incdec_tmp",
-			      ir_var_temporary);
-   instructions->push_tail(var);
-   var->mode = ir_var_auto;
-
-   instructions->push_tail(new(ctx) ir_assignment(new(ctx) ir_dereference_variable(var),
-						  lvalue, NULL));
-
-   /* Once we've created this temporary, mark it read only so it's no
-    * longer considered an lvalue.
-    */
-   var->read_only = true;
-
-   return new(ctx) ir_dereference_variable(var);
-}
-
-
-ir_rvalue *
-ast_node::hir(exec_list *instructions,
-	      struct _mesa_glsl_parse_state *state)
-{
-   (void) instructions;
-   (void) state;
-
-   return NULL;
-}
-
-static void
-mark_whole_array_access(ir_rvalue *access)
-{
-   ir_dereference_variable *deref = access->as_dereference_variable();
-
-   if (deref) {
-      deref->var->max_array_access = deref->type->length - 1;
-   }
-}
-
-static ir_rvalue *
-do_comparison(void *mem_ctx, int operation, ir_rvalue *op0, ir_rvalue *op1)
-{
-   int join_op;
-   ir_rvalue *cmp = NULL;
-
-   if (operation == ir_binop_all_equal)
-      join_op = ir_binop_logic_and;
-   else
-      join_op = ir_binop_logic_or;
-
-   switch (op0->type->base_type) {
-   case GLSL_TYPE_FLOAT:
-   case GLSL_TYPE_UINT:
-   case GLSL_TYPE_INT:
-   case GLSL_TYPE_BOOL:
-      return new(mem_ctx) ir_expression(operation, op0, op1);
-
-   case GLSL_TYPE_ARRAY: {
-      for (unsigned int i = 0; i < op0->type->length; i++) {
-	 ir_rvalue *e0, *e1, *result;
-
-	 e0 = new(mem_ctx) ir_dereference_array(op0->clone(mem_ctx, NULL),
-						new(mem_ctx) ir_constant(i));
-	 e1 = new(mem_ctx) ir_dereference_array(op1->clone(mem_ctx, NULL),
-						new(mem_ctx) ir_constant(i));
-	 result = do_comparison(mem_ctx, operation, e0, e1);
-
-	 if (cmp) {
-	    cmp = new(mem_ctx) ir_expression(join_op, cmp, result);
-	 } else {
-	    cmp = result;
-	 }
-      }
-
-      mark_whole_array_access(op0);
-      mark_whole_array_access(op1);
-      break;
-   }
-
-   case GLSL_TYPE_STRUCT: {
-      for (unsigned int i = 0; i < op0->type->length; i++) {
-	 ir_rvalue *e0, *e1, *result;
-	 const char *field_name = op0->type->fields.structure[i].name;
-
-	 e0 = new(mem_ctx) ir_dereference_record(op0->clone(mem_ctx, NULL),
-						 field_name);
-	 e1 = new(mem_ctx) ir_dereference_record(op1->clone(mem_ctx, NULL),
-						 field_name);
-	 result = do_comparison(mem_ctx, operation, e0, e1);
-
-	 if (cmp) {
-	    cmp = new(mem_ctx) ir_expression(join_op, cmp, result);
-	 } else {
-	    cmp = result;
-	 }
-      }
-      break;
-   }
-
-   case GLSL_TYPE_ERROR:
-   case GLSL_TYPE_VOID:
-   case GLSL_TYPE_SAMPLER:
-      /* I assume a comparison of a struct containing a sampler just
-       * ignores the sampler present in the type.
-       */
-      break;
-
-   default:
-      assert(!"Should not get here.");
-      break;
-   }
-
-   if (cmp == NULL)
-      cmp = new(mem_ctx) ir_constant(true);
-
-   return cmp;
-}
-
-ir_rvalue *
-ast_expression::hir(exec_list *instructions,
-		    struct _mesa_glsl_parse_state *state)
-{
-   void *ctx = state;
-   static const int operations[AST_NUM_OPERATORS] = {
-      -1,               /* ast_assign doesn't convert to ir_expression. */
-      -1,               /* ast_plus doesn't convert to ir_expression. */
-      ir_unop_neg,
-      ir_binop_add,
-      ir_binop_sub,
-      ir_binop_mul,
-      ir_binop_div,
-      ir_binop_mod,
-      ir_binop_lshift,
-      ir_binop_rshift,
-      ir_binop_less,
-      ir_binop_greater,
-      ir_binop_lequal,
-      ir_binop_gequal,
-      ir_binop_all_equal,
-      ir_binop_any_nequal,
-      ir_binop_bit_and,
-      ir_binop_bit_xor,
-      ir_binop_bit_or,
-      ir_unop_bit_not,
-      ir_binop_logic_and,
-      ir_binop_logic_xor,
-      ir_binop_logic_or,
-      ir_unop_logic_not,
-
-      /* Note: The following block of expression types actually convert
-       * to multiple IR instructions.
-       */
-      ir_binop_mul,     /* ast_mul_assign */
-      ir_binop_div,     /* ast_div_assign */
-      ir_binop_mod,     /* ast_mod_assign */
-      ir_binop_add,     /* ast_add_assign */
-      ir_binop_sub,     /* ast_sub_assign */
-      ir_binop_lshift,  /* ast_ls_assign */
-      ir_binop_rshift,  /* ast_rs_assign */
-      ir_binop_bit_and, /* ast_and_assign */
-      ir_binop_bit_xor, /* ast_xor_assign */
-      ir_binop_bit_or,  /* ast_or_assign */
-
-      -1,               /* ast_conditional doesn't convert to ir_expression. */
-      ir_binop_add,     /* ast_pre_inc. */
-      ir_binop_sub,     /* ast_pre_dec. */
-      ir_binop_add,     /* ast_post_inc. */
-      ir_binop_sub,     /* ast_post_dec. */
-      -1,               /* ast_field_selection doesn't conv to ir_expression. */
-      -1,               /* ast_array_index doesn't convert to ir_expression. */
-      -1,               /* ast_function_call doesn't conv to ir_expression. */
-      -1,               /* ast_identifier doesn't convert to ir_expression. */
-      -1,               /* ast_int_constant doesn't convert to ir_expression. */
-      -1,               /* ast_uint_constant doesn't conv to ir_expression. */
-      -1,               /* ast_float_constant doesn't conv to ir_expression. */
-      -1,               /* ast_bool_constant doesn't conv to ir_expression. */
-      -1,               /* ast_sequence doesn't convert to ir_expression. */
-   };
-   ir_rvalue *result = NULL;
-   ir_rvalue *op[3];
-   const struct glsl_type *type = glsl_type::error_type;
-   bool error_emitted = false;
-   YYLTYPE loc;
-
-   loc = this->get_location();
-
-   switch (this->oper) {
-   case ast_assign: {
-      op[0] = this->subexpressions[0]->hir(instructions, state);
-      op[1] = this->subexpressions[1]->hir(instructions, state);
-
-      result = do_assignment(instructions, state, op[0], op[1],
-			     this->subexpressions[0]->get_location());
-      error_emitted = result->type->is_error();
-      type = result->type;
-      break;
-   }
-
-   case ast_plus:
-      op[0] = this->subexpressions[0]->hir(instructions, state);
-
-      type = unary_arithmetic_result_type(op[0]->type, state, & loc);
-
-      error_emitted = type->is_error();
-
-      result = op[0];
-      break;
-
-   case ast_neg:
-      op[0] = this->subexpressions[0]->hir(instructions, state);
-
-      type = unary_arithmetic_result_type(op[0]->type, state, & loc);
-
-      error_emitted = type->is_error();
-
-      result = new(ctx) ir_expression(operations[this->oper], type,
-				      op[0], NULL);
-      break;
-
-   case ast_add:
-   case ast_sub:
-   case ast_mul:
-   case ast_div:
-      op[0] = this->subexpressions[0]->hir(instructions, state);
-      op[1] = this->subexpressions[1]->hir(instructions, state);
-
-      type = arithmetic_result_type(op[0], op[1],
-				    (this->oper == ast_mul),
-				    state, & loc);
-      error_emitted = type->is_error();
-
-      result = new(ctx) ir_expression(operations[this->oper], type,
-				      op[0], op[1]);
-      break;
-
-   case ast_mod:
-      op[0] = this->subexpressions[0]->hir(instructions, state);
-      op[1] = this->subexpressions[1]->hir(instructions, state);
-
-      type = modulus_result_type(op[0]->type, op[1]->type, state, & loc);
-
-      assert(operations[this->oper] == ir_binop_mod);
-
-      result = new(ctx) ir_expression(operations[this->oper], type,
-				      op[0], op[1]);
-      error_emitted = type->is_error();
-      break;
-
-   case ast_lshift:
-   case ast_rshift:
-       if (state->language_version < 130) {
-          _mesa_glsl_error(&loc, state, "operator %s requires GLSL 1.30",
-              operator_string(this->oper));
-          error_emitted = true;
-       }
-
-       op[0] = this->subexpressions[0]->hir(instructions, state);
-       op[1] = this->subexpressions[1]->hir(instructions, state);
-       type = shift_result_type(op[0]->type, op[1]->type, this->oper, state,
-                                &loc);
-       result = new(ctx) ir_expression(operations[this->oper], type,
-                                       op[0], op[1]);
-       error_emitted = op[0]->type->is_error() || op[1]->type->is_error();
-       break;
-
-   case ast_less:
-   case ast_greater:
-   case ast_lequal:
-   case ast_gequal:
-      op[0] = this->subexpressions[0]->hir(instructions, state);
-      op[1] = this->subexpressions[1]->hir(instructions, state);
-
-      type = relational_result_type(op[0], op[1], state, & loc);
-
-      /* The relational operators must either generate an error or result
-       * in a scalar boolean.  See page 57 of the GLSL 1.50 spec.
-       */
-      assert(type->is_error()
-	     || ((type->base_type == GLSL_TYPE_BOOL)
-		 && type->is_scalar()));
-
-      result = new(ctx) ir_expression(operations[this->oper], type,
-				      op[0], op[1]);
-      error_emitted = type->is_error();
-      break;
-
-   case ast_nequal:
-   case ast_equal:
-      op[0] = this->subexpressions[0]->hir(instructions, state);
-      op[1] = this->subexpressions[1]->hir(instructions, state);
-
-      /* From page 58 (page 64 of the PDF) of the GLSL 1.50 spec:
-       *
-       *    "The equality operators equal (==), and not equal (!=)
-       *    operate on all types. They result in a scalar Boolean. If
-       *    the operand types do not match, then there must be a
-       *    conversion from Section 4.1.10 "Implicit Conversions"
-       *    applied to one operand that can make them match, in which
-       *    case this conversion is done."
-       */
-      if ((!apply_implicit_conversion(op[0]->type, op[1], state)
-	   && !apply_implicit_conversion(op[1]->type, op[0], state))
-	  || (op[0]->type != op[1]->type)) {
-	 _mesa_glsl_error(& loc, state, "operands of `%s' must have the same "
-			  "type", (this->oper == ast_equal) ? "==" : "!=");
-	 error_emitted = true;
-      } else if ((state->language_version <= 110)
-		 && (op[0]->type->is_array() || op[1]->type->is_array())) {
-	 _mesa_glsl_error(& loc, state, "array comparisons forbidden in "
-			  "GLSL 1.10");
-	 error_emitted = true;
-      }
-
-      result = do_comparison(ctx, operations[this->oper], op[0], op[1]);
-      type = glsl_type::bool_type;
-
-      assert(error_emitted || (result->type == glsl_type::bool_type));
-      break;
-
-   case ast_bit_and:
-   case ast_bit_xor:
-   case ast_bit_or:
-      op[0] = this->subexpressions[0]->hir(instructions, state);
-      op[1] = this->subexpressions[1]->hir(instructions, state);
-      type = bit_logic_result_type(op[0]->type, op[1]->type, this->oper,
-                                   state, &loc);
-      result = new(ctx) ir_expression(operations[this->oper], type,
-				      op[0], op[1]);
-      error_emitted = op[0]->type->is_error() || op[1]->type->is_error();
-      break;
-
-   case ast_bit_not:
-      op[0] = this->subexpressions[0]->hir(instructions, state);
-
-      if (state->language_version < 130) {
-	 _mesa_glsl_error(&loc, state, "bit-wise operations require GLSL 1.30");
-	 error_emitted = true;
-      }
-
-      if (!op[0]->type->is_integer()) {
-	 _mesa_glsl_error(&loc, state, "operand of `~' must be an integer");
-	 error_emitted = true;
-      }
-
-      type = op[0]->type;
-      result = new(ctx) ir_expression(ir_unop_bit_not, type, op[0], NULL);
-      break;
-
-   case ast_logic_and: {
-      op[0] = this->subexpressions[0]->hir(instructions, state);
-
-      if (!op[0]->type->is_boolean() || !op[0]->type->is_scalar()) {
-	 YYLTYPE loc = this->subexpressions[0]->get_location();
-
-	 _mesa_glsl_error(& loc, state, "LHS of `%s' must be scalar boolean",
-			  operator_string(this->oper));
-	 error_emitted = true;
-      }
-
-      ir_constant *op0_const = op[0]->constant_expression_value();
-      if (op0_const) {
-	 if (op0_const->value.b[0]) {
-	    op[1] = this->subexpressions[1]->hir(instructions, state);
-
-	    if (!op[1]->type->is_boolean() || !op[1]->type->is_scalar()) {
-	       YYLTYPE loc = this->subexpressions[1]->get_location();
-
-	       _mesa_glsl_error(& loc, state,
-				"RHS of `%s' must be scalar boolean",
-				operator_string(this->oper));
-	       error_emitted = true;
-	    }
-	    result = op[1];
-	 } else {
-	    result = op0_const;
-	 }
-	 type = glsl_type::bool_type;
-      } else {
-	 ir_variable *const tmp = new(ctx) ir_variable(glsl_type::bool_type,
-						       "and_tmp",
-						       ir_var_temporary);
-	 instructions->push_tail(tmp);
-
-	 ir_if *const stmt = new(ctx) ir_if(op[0]);
-	 instructions->push_tail(stmt);
-
-	 op[1] = this->subexpressions[1]->hir(&stmt->then_instructions, state);
-
-	 if (!op[1]->type->is_boolean() || !op[1]->type->is_scalar()) {
-	    YYLTYPE loc = this->subexpressions[1]->get_location();
-
-	    _mesa_glsl_error(& loc, state,
-			     "RHS of `%s' must be scalar boolean",
-			     operator_string(this->oper));
-	    error_emitted = true;
-	 }
-
-	 ir_dereference *const then_deref = new(ctx) ir_dereference_variable(tmp);
-	 ir_assignment *const then_assign =
-	    new(ctx) ir_assignment(then_deref, op[1], NULL);
-	 stmt->then_instructions.push_tail(then_assign);
-
-	 ir_dereference *const else_deref = new(ctx) ir_dereference_variable(tmp);
-	 ir_assignment *const else_assign =
-	    new(ctx) ir_assignment(else_deref, new(ctx) ir_constant(false), NULL);
-	 stmt->else_instructions.push_tail(else_assign);
-
-	 result = new(ctx) ir_dereference_variable(tmp);
-	 type = tmp->type;
-      }
-      break;
-   }
-
-   case ast_logic_or: {
-      op[0] = this->subexpressions[0]->hir(instructions, state);
-
-      if (!op[0]->type->is_boolean() || !op[0]->type->is_scalar()) {
-	 YYLTYPE loc = this->subexpressions[0]->get_location();
-
-	 _mesa_glsl_error(& loc, state, "LHS of `%s' must be scalar boolean",
-			  operator_string(this->oper));
-	 error_emitted = true;
-      }
-
-      ir_constant *op0_const = op[0]->constant_expression_value();
-      if (op0_const) {
-	 if (op0_const->value.b[0]) {
-	    result = op0_const;
-	 } else {
-	    op[1] = this->subexpressions[1]->hir(instructions, state);
-
-	    if (!op[1]->type->is_boolean() || !op[1]->type->is_scalar()) {
-	       YYLTYPE loc = this->subexpressions[1]->get_location();
-
-	       _mesa_glsl_error(& loc, state,
-				"RHS of `%s' must be scalar boolean",
-				operator_string(this->oper));
-	       error_emitted = true;
-	    }
-	    result = op[1];
-	 }
-	 type = glsl_type::bool_type;
-      } else {
-	 ir_variable *const tmp = new(ctx) ir_variable(glsl_type::bool_type,
-						       "or_tmp",
-						       ir_var_temporary);
-	 instructions->push_tail(tmp);
-
-	 ir_if *const stmt = new(ctx) ir_if(op[0]);
-	 instructions->push_tail(stmt);
-
-	 op[1] = this->subexpressions[1]->hir(&stmt->else_instructions, state);
-
-	 if (!op[1]->type->is_boolean() || !op[1]->type->is_scalar()) {
-	    YYLTYPE loc = this->subexpressions[1]->get_location();
-
-	    _mesa_glsl_error(& loc, state, "RHS of `%s' must be scalar boolean",
-			     operator_string(this->oper));
-	    error_emitted = true;
-	 }
-
-	 ir_dereference *const then_deref = new(ctx) ir_dereference_variable(tmp);
-	 ir_assignment *const then_assign =
-	    new(ctx) ir_assignment(then_deref, new(ctx) ir_constant(true), NULL);
-	 stmt->then_instructions.push_tail(then_assign);
-
-	 ir_dereference *const else_deref = new(ctx) ir_dereference_variable(tmp);
-	 ir_assignment *const else_assign =
-	    new(ctx) ir_assignment(else_deref, op[1], NULL);
-	 stmt->else_instructions.push_tail(else_assign);
-
-	 result = new(ctx) ir_dereference_variable(tmp);
-	 type = tmp->type;
-      }
-      break;
-   }
-
-   case ast_logic_xor:
-      op[0] = this->subexpressions[0]->hir(instructions, state);
-      op[1] = this->subexpressions[1]->hir(instructions, state);
-
-
-      result = new(ctx) ir_expression(operations[this->oper], glsl_type::bool_type,
-				      op[0], op[1]);
-      type = glsl_type::bool_type;
-      break;
-
-   case ast_logic_not:
-      op[0] = this->subexpressions[0]->hir(instructions, state);
-
-      if (!op[0]->type->is_boolean() || !op[0]->type->is_scalar()) {
-	 YYLTYPE loc = this->subexpressions[0]->get_location();
-
-	 _mesa_glsl_error(& loc, state,
-			  "operand of `!' must be scalar boolean");
-	 error_emitted = true;
-      }
-
-      result = new(ctx) ir_expression(operations[this->oper], glsl_type::bool_type,
-				      op[0], NULL);
-      type = glsl_type::bool_type;
-      break;
-
-   case ast_mul_assign:
-   case ast_div_assign:
-   case ast_add_assign:
-   case ast_sub_assign: {
-      op[0] = this->subexpressions[0]->hir(instructions, state);
-      op[1] = this->subexpressions[1]->hir(instructions, state);
-
-      type = arithmetic_result_type(op[0], op[1],
-				    (this->oper == ast_mul_assign),
-				    state, & loc);
-
-      ir_rvalue *temp_rhs = new(ctx) ir_expression(operations[this->oper], type,
-						   op[0], op[1]);
-
-      result = do_assignment(instructions, state,
-			     op[0]->clone(ctx, NULL), temp_rhs,
-			     this->subexpressions[0]->get_location());
-      type = result->type;
-      error_emitted = (op[0]->type->is_error());
-
-      /* GLSL 1.10 does not allow array assignment.  However, we don't have to
-       * explicitly test for this because none of the binary expression
-       * operators allow array operands either.
-       */
-
-      break;
-   }
-
-   case ast_mod_assign: {
-      op[0] = this->subexpressions[0]->hir(instructions, state);
-      op[1] = this->subexpressions[1]->hir(instructions, state);
-
-      type = modulus_result_type(op[0]->type, op[1]->type, state, & loc);
-
-      assert(operations[this->oper] == ir_binop_mod);
-
-      ir_rvalue *temp_rhs;
-      temp_rhs = new(ctx) ir_expression(operations[this->oper], type,
-					op[0], op[1]);
-
-      result = do_assignment(instructions, state,
-			     op[0]->clone(ctx, NULL), temp_rhs,
-			     this->subexpressions[0]->get_location());
-      type = result->type;
-      error_emitted = type->is_error();
-      break;
-   }
-
-   case ast_ls_assign:
-   case ast_rs_assign: {
-      op[0] = this->subexpressions[0]->hir(instructions, state);
-      op[1] = this->subexpressions[1]->hir(instructions, state);
-      type = shift_result_type(op[0]->type, op[1]->type, this->oper, state,
-                               &loc);
-      ir_rvalue *temp_rhs = new(ctx) ir_expression(operations[this->oper],
-                                                   type, op[0], op[1]);
-      result = do_assignment(instructions, state, op[0]->clone(ctx, NULL),
-                             temp_rhs,
-                             this->subexpressions[0]->get_location());
-      error_emitted = op[0]->type->is_error() || op[1]->type->is_error();
-      break;
-   }
-
-   case ast_and_assign:
-   case ast_xor_assign:
-   case ast_or_assign: {
-      op[0] = this->subexpressions[0]->hir(instructions, state);
-      op[1] = this->subexpressions[1]->hir(instructions, state);
-      type = bit_logic_result_type(op[0]->type, op[1]->type, this->oper,
-                                   state, &loc);
-      ir_rvalue *temp_rhs = new(ctx) ir_expression(operations[this->oper],
-                                                   type, op[0], op[1]);
-      result = do_assignment(instructions, state, op[0]->clone(ctx, NULL),
-                             temp_rhs,
-                             this->subexpressions[0]->get_location());
-      error_emitted = op[0]->type->is_error() || op[1]->type->is_error();
-      break;
-   }
-
-   case ast_conditional: {
-      op[0] = this->subexpressions[0]->hir(instructions, state);
-
-      /* From page 59 (page 65 of the PDF) of the GLSL 1.50 spec:
-       *
-       *    "The ternary selection operator (?:). It operates on three
-       *    expressions (exp1 ? exp2 : exp3). This operator evaluates the
-       *    first expression, which must result in a scalar Boolean."
-       */
-      if (!op[0]->type->is_boolean() || !op[0]->type->is_scalar()) {
-	 YYLTYPE loc = this->subexpressions[0]->get_location();
-
-	 _mesa_glsl_error(& loc, state, "?: condition must be scalar boolean");
-	 error_emitted = true;
-      }
-
-      /* The :? operator is implemented by generating an anonymous temporary
-       * followed by an if-statement.  The last instruction in each branch of
-       * the if-statement assigns a value to the anonymous temporary.  This
-       * temporary is the r-value of the expression.
-       */
-      exec_list then_instructions;
-      exec_list else_instructions;
-
-      op[1] = this->subexpressions[1]->hir(&then_instructions, state);
-      op[2] = this->subexpressions[2]->hir(&else_instructions, state);
-
-      /* From page 59 (page 65 of the PDF) of the GLSL 1.50 spec:
-       *
-       *     "The second and third expressions can be any type, as
-       *     long their types match, or there is a conversion in
-       *     Section 4.1.10 "Implicit Conversions" that can be applied
-       *     to one of the expressions to make their types match. This
-       *     resulting matching type is the type of the entire
-       *     expression."
-       */
-      if ((!apply_implicit_conversion(op[1]->type, op[2], state)
-	   && !apply_implicit_conversion(op[2]->type, op[1], state))
-	  || (op[1]->type != op[2]->type)) {
-	 YYLTYPE loc = this->subexpressions[1]->get_location();
-
-	 _mesa_glsl_error(& loc, state, "Second and third operands of ?: "
-			  "operator must have matching types.");
-	 error_emitted = true;
-	 type = glsl_type::error_type;
-      } else {
-	 type = op[1]->type;
-      }
-
-      /* From page 33 (page 39 of the PDF) of the GLSL 1.10 spec:
-       *
-       *    "The second and third expressions must be the same type, but can
-       *    be of any type other than an array."
-       */
-      if ((state->language_version <= 110) && type->is_array()) {
-	 _mesa_glsl_error(& loc, state, "Second and third operands of ?: "
-			  "operator must not be arrays.");
-	 error_emitted = true;
-      }
-
-      ir_constant *cond_val = op[0]->constant_expression_value();
-      ir_constant *then_val = op[1]->constant_expression_value();
-      ir_constant *else_val = op[2]->constant_expression_value();
-
-      if (then_instructions.is_empty()
-	  && else_instructions.is_empty()
-	  && (cond_val != NULL) && (then_val != NULL) && (else_val != NULL)) {
-	 result = (cond_val->value.b[0]) ? then_val : else_val;
-      } else {
-	 ir_variable *const tmp =
-	    new(ctx) ir_variable(type, "conditional_tmp", ir_var_temporary);
-	 instructions->push_tail(tmp);
-
-	 ir_if *const stmt = new(ctx) ir_if(op[0]);
-	 instructions->push_tail(stmt);
-
-	 then_instructions.move_nodes_to(& stmt->then_instructions);
-	 ir_dereference *const then_deref =
-	    new(ctx) ir_dereference_variable(tmp);
-	 ir_assignment *const then_assign =
-	    new(ctx) ir_assignment(then_deref, op[1], NULL);
-	 stmt->then_instructions.push_tail(then_assign);
-
-	 else_instructions.move_nodes_to(& stmt->else_instructions);
-	 ir_dereference *const else_deref =
-	    new(ctx) ir_dereference_variable(tmp);
-	 ir_assignment *const else_assign =
-	    new(ctx) ir_assignment(else_deref, op[2], NULL);
-	 stmt->else_instructions.push_tail(else_assign);
-
-	 result = new(ctx) ir_dereference_variable(tmp);
-      }
-      break;
-   }
-
-   case ast_pre_inc:
-   case ast_pre_dec: {
-      op[0] = this->subexpressions[0]->hir(instructions, state);
-      if (op[0]->type->base_type == GLSL_TYPE_FLOAT)
-	 op[1] = new(ctx) ir_constant(1.0f);
-      else
-	 op[1] = new(ctx) ir_constant(1);
-
-      type = arithmetic_result_type(op[0], op[1], false, state, & loc);
-
-      ir_rvalue *temp_rhs;
-      temp_rhs = new(ctx) ir_expression(operations[this->oper], type,
-					op[0], op[1]);
-
-      result = do_assignment(instructions, state,
-			     op[0]->clone(ctx, NULL), temp_rhs,
-			     this->subexpressions[0]->get_location());
-      type = result->type;
-      error_emitted = op[0]->type->is_error();
-      break;
-   }
-
-   case ast_post_inc:
-   case ast_post_dec: {
-      op[0] = this->subexpressions[0]->hir(instructions, state);
-      if (op[0]->type->base_type == GLSL_TYPE_FLOAT)
-	 op[1] = new(ctx) ir_constant(1.0f);
-      else
-	 op[1] = new(ctx) ir_constant(1);
-
-      error_emitted = op[0]->type->is_error() || op[1]->type->is_error();
-
-      type = arithmetic_result_type(op[0], op[1], false, state, & loc);
-
-      ir_rvalue *temp_rhs;
-      temp_rhs = new(ctx) ir_expression(operations[this->oper], type,
-					op[0], op[1]);
-
-      /* Get a temporary of a copy of the lvalue before it's modified.
-       * This may get thrown away later.
-       */
-      result = get_lvalue_copy(instructions, op[0]->clone(ctx, NULL));
-
-      (void)do_assignment(instructions, state,
-			  op[0]->clone(ctx, NULL), temp_rhs,
-			  this->subexpressions[0]->get_location());
-
-      type = result->type;
-      error_emitted = op[0]->type->is_error();
-      break;
-   }
-
-   case ast_field_selection:
-      result = _mesa_ast_field_selection_to_hir(this, instructions, state);
-      type = result->type;
-      break;
-
-   case ast_array_index: {
-      YYLTYPE index_loc = subexpressions[1]->get_location();
-
-      op[0] = subexpressions[0]->hir(instructions, state);
-      op[1] = subexpressions[1]->hir(instructions, state);
-
-      error_emitted = op[0]->type->is_error() || op[1]->type->is_error();
-
-      ir_rvalue *const array = op[0];
-
-      result = new(ctx) ir_dereference_array(op[0], op[1]);
-
-      /* Do not use op[0] after this point.  Use array.
-       */
-      op[0] = NULL;
-
-
-      if (error_emitted)
-	 break;
-
-      if (!array->type->is_array()
-	  && !array->type->is_matrix()
-	  && !array->type->is_vector()) {
-	 _mesa_glsl_error(& index_loc, state,
-			  "cannot dereference non-array / non-matrix / "
-			  "non-vector");
-	 error_emitted = true;
-      }
-
-      if (!op[1]->type->is_integer()) {
-	 _mesa_glsl_error(& index_loc, state,
-			  "array index must be integer type");
-	 error_emitted = true;
-      } else if (!op[1]->type->is_scalar()) {
-	 _mesa_glsl_error(& index_loc, state,
-			  "array index must be scalar");
-	 error_emitted = true;
-      }
-
-      /* If the array index is a constant expression and the array has a
-       * declared size, ensure that the access is in-bounds.  If the array
-       * index is not a constant expression, ensure that the array has a
-       * declared size.
-       */
-      ir_constant *const const_index = op[1]->constant_expression_value();
-      if (const_index != NULL) {
-	 const int idx = const_index->value.i[0];
-	 const char *type_name;
-	 unsigned bound = 0;
-
-	 if (array->type->is_matrix()) {
-	    type_name = "matrix";
-	 } else if (array->type->is_vector()) {
-	    type_name = "vector";
-	 } else {
-	    type_name = "array";
-	 }
-
-	 /* From page 24 (page 30 of the PDF) of the GLSL 1.50 spec:
-	  *
-	  *    "It is illegal to declare an array with a size, and then
-	  *    later (in the same shader) index the same array with an
-	  *    integral constant expression greater than or equal to the
-	  *    declared size. It is also illegal to index an array with a
-	  *    negative constant expression."
-	  */
-	 if (array->type->is_matrix()) {
-	    if (array->type->row_type()->vector_elements <= idx) {
-	       bound = array->type->row_type()->vector_elements;
-	    }
-	 } else if (array->type->is_vector()) {
-	    if (array->type->vector_elements <= idx) {
-	       bound = array->type->vector_elements;
-	    }
-	 } else {
-	    if ((array->type->array_size() > 0)
-		&& (array->type->array_size() <= idx)) {
-	       bound = array->type->array_size();
-	    }
-	 }
-
-	 if (bound > 0) {
-	    _mesa_glsl_error(& loc, state, "%s index must be < %u",
-			     type_name, bound);
-	    error_emitted = true;
-	 } else if (idx < 0) {
-	    _mesa_glsl_error(& loc, state, "%s index must be >= 0",
-			     type_name);
-	    error_emitted = true;
-	 }
-
-	 if (array->type->is_array()) {
-	    /* If the array is a variable dereference, it dereferences the
-	     * whole array, by definition.  Use this to get the variable.
-	     *
-	     * FINISHME: Should some methods for getting / setting / testing
-	     * FINISHME: array access limits be added to ir_dereference?
-	     */
-	    ir_variable *const v = array->whole_variable_referenced();
-	    if ((v != NULL) && (unsigned(idx) > v->max_array_access))
-	       v->max_array_access = idx;
-	 }
-      } else if (array->type->array_size() == 0) {
-	 _mesa_glsl_error(&loc, state, "unsized array index must be constant");
-      } else {
-	 if (array->type->is_array()) {
-	    /* whole_variable_referenced can return NULL if the array is a
-	     * member of a structure.  In this case it is safe to not update
-	     * the max_array_access field because it is never used for fields
-	     * of structures.
-	     */
-	    ir_variable *v = array->whole_variable_referenced();
-	    if (v != NULL)
-	       v->max_array_access = array->type->array_size();
-	 }
-      }
-
-      /* From page 23 (29 of the PDF) of the GLSL 1.30 spec:
-       *
-       *    "Samplers aggregated into arrays within a shader (using square
-       *    brackets [ ]) can only be indexed with integral constant
-       *    expressions [...]."
-       *
-       * This restriction was added in GLSL 1.30.  Shaders using earlier version
-       * of the language should not be rejected by the compiler front-end for
-       * using this construct.  This allows useful things such as using a loop
-       * counter as the index to an array of samplers.  If the loop in unrolled,
-       * the code should compile correctly.  Instead, emit a warning.
-       */
-      if (array->type->is_array() &&
-          array->type->element_type()->is_sampler() &&
-          const_index == NULL) {
-
-	 if (state->language_version == 100) {
-	    _mesa_glsl_warning(&loc, state,
-			       "sampler arrays indexed with non-constant "
-			       "expressions is optional in GLSL ES 1.00");
-	 } else if (state->language_version < 130) {
-	    _mesa_glsl_warning(&loc, state,
-			       "sampler arrays indexed with non-constant "
-			       "expressions is forbidden in GLSL 1.30 and "
-			       "later");
-	 } else {
-	    _mesa_glsl_error(&loc, state,
-			     "sampler arrays indexed with non-constant "
-			     "expressions is forbidden in GLSL 1.30 and "
-			     "later");
-	    error_emitted = true;
-	 }
-      }
-
-      if (error_emitted)
-	 result->type = glsl_type::error_type;
-
-      type = result->type;
-      break;
-   }
-
-   case ast_function_call:
-      /* Should *NEVER* get here.  ast_function_call should always be handled
-       * by ast_function_expression::hir.
-       */
-      assert(0);
-      break;
-
-   case ast_identifier: {
-      /* ast_identifier can appear several places in a full abstract syntax
-       * tree.  This particular use must be at location specified in the grammar
-       * as 'variable_identifier'.
-       */
-      ir_variable *var = 
-	 state->symbols->get_variable(this->primary_expression.identifier);
-
-      result = new(ctx) ir_dereference_variable(var);
-
-      if (var != NULL) {
-	 var->used = true;
-	 type = result->type;
-      } else {
-	 _mesa_glsl_error(& loc, state, "`%s' undeclared",
-			  this->primary_expression.identifier);
-
-	 error_emitted = true;
-      }
-      break;
-   }
-
-   case ast_int_constant:
-      type = glsl_type::int_type;
-      result = new(ctx) ir_constant(this->primary_expression.int_constant);
-      break;
-
-   case ast_uint_constant:
-      type = glsl_type::uint_type;
-      result = new(ctx) ir_constant(this->primary_expression.uint_constant);
-      break;
-
-   case ast_float_constant:
-      type = glsl_type::float_type;
-      result = new(ctx) ir_constant(this->primary_expression.float_constant);
-      break;
-
-   case ast_bool_constant:
-      type = glsl_type::bool_type;
-      result = new(ctx) ir_constant(bool(this->primary_expression.bool_constant));
-      break;
-
-   case ast_sequence: {
-      /* It should not be possible to generate a sequence in the AST without
-       * any expressions in it.
-       */
-      assert(!this->expressions.is_empty());
-
-      /* The r-value of a sequence is the last expression in the sequence.  If
-       * the other expressions in the sequence do not have side-effects (and
-       * therefore add instructions to the instruction list), they get dropped
-       * on the floor.
-       */
-      foreach_list_typed (ast_node, ast, link, &this->expressions)
-	 result = ast->hir(instructions, state);
-
-      type = result->type;
-
-      /* Any errors should have already been emitted in the loop above.
-       */
-      error_emitted = true;
-      break;
-   }
-   }
-
-   if (type->is_error() && !error_emitted)
-      _mesa_glsl_error(& loc, state, "type mismatch");
-
-   return result;
-}
-
-
-ir_rvalue *
-ast_expression_statement::hir(exec_list *instructions,
-			      struct _mesa_glsl_parse_state *state)
-{
-   /* It is possible to have expression statements that don't have an
-    * expression.  This is the solitary semicolon:
-    *
-    * for (i = 0; i < 5; i++)
-    *     ;
-    *
-    * In this case the expression will be NULL.  Test for NULL and don't do
-    * anything in that case.
-    */
-   if (expression != NULL)
-      expression->hir(instructions, state);
-
-   /* Statements do not have r-values.
-    */
-   return NULL;
-}
-
-
-ir_rvalue *
-ast_compound_statement::hir(exec_list *instructions,
-			    struct _mesa_glsl_parse_state *state)
-{
-   if (new_scope)
-      state->symbols->push_scope();
-
-   foreach_list_typed (ast_node, ast, link, &this->statements)
-      ast->hir(instructions, state);
-
-   if (new_scope)
-      state->symbols->pop_scope();
-
-   /* Compound statements do not have r-values.
-    */
-   return NULL;
-}
-
-
-static const glsl_type *
-process_array_type(YYLTYPE *loc, const glsl_type *base, ast_node *array_size,
-		   struct _mesa_glsl_parse_state *state)
-{
-   unsigned length = 0;
-
-   /* FINISHME: Reject delcarations of multidimensional arrays. */
-
-   if (array_size != NULL) {
-      exec_list dummy_instructions;
-      ir_rvalue *const ir = array_size->hir(& dummy_instructions, state);
-      YYLTYPE loc = array_size->get_location();
-
-      /* FINISHME: Verify that the grammar forbids side-effects in array
-       * FINISHME: sizes.   i.e., 'vec4 [x = 12] data'
-       */
-      assert(dummy_instructions.is_empty());
-
-      if (ir != NULL) {
-	 if (!ir->type->is_integer()) {
-	    _mesa_glsl_error(& loc, state, "array size must be integer type");
-	 } else if (!ir->type->is_scalar()) {
-	    _mesa_glsl_error(& loc, state, "array size must be scalar type");
-	 } else {
-	    ir_constant *const size = ir->constant_expression_value();
-
-	    if (size == NULL) {
-	       _mesa_glsl_error(& loc, state, "array size must be a "
-				"constant valued expression");
-	    } else if (size->value.i[0] <= 0) {
-	       _mesa_glsl_error(& loc, state, "array size must be > 0");
-	    } else {
-	       assert(size->type == ir->type);
-	       length = size->value.u[0];
-	    }
-	 }
-      }
-   } else if (state->es_shader) {
-      /* Section 10.17 of the GLSL ES 1.00 specification states that unsized
-       * array declarations have been removed from the language.
-       */
-      _mesa_glsl_error(loc, state, "unsized array declarations are not "
-		       "allowed in GLSL ES 1.00.");
-   }
-
-   return glsl_type::get_array_instance(base, length);
-}
-
-
-const glsl_type *
-ast_type_specifier::glsl_type(const char **name,
-			      struct _mesa_glsl_parse_state *state) const
-{
-   const struct glsl_type *type;
-
-   type = state->symbols->get_type(this->type_name);
-   *name = this->type_name;
-
-   if (this->is_array) {
-      YYLTYPE loc = this->get_location();
-      type = process_array_type(&loc, type, this->array_size, state);
-   }
-
-   return type;
-}
-
-
-static void
-apply_type_qualifier_to_variable(const struct ast_type_qualifier *qual,
-				 ir_variable *var,
-				 struct _mesa_glsl_parse_state *state,
-				 YYLTYPE *loc)
-{
-   if (qual->flags.q.invariant) {
-      if (var->used) {
-	 _mesa_glsl_error(loc, state,
-			  "variable `%s' may not be redeclared "
-			  "`invariant' after being used",
-			  var->name);
-      } else {
-	 var->invariant = 1;
-      }
-   }
-
-   if (qual->flags.q.constant || qual->flags.q.attribute
-       || qual->flags.q.uniform
-       || (qual->flags.q.varying && (state->target == fragment_shader)))
-      var->read_only = 1;
-
-   if (qual->flags.q.centroid)
-      var->centroid = 1;
-
-   if (qual->flags.q.attribute && state->target != vertex_shader) {
-      var->type = glsl_type::error_type;
-      _mesa_glsl_error(loc, state,
-		       "`attribute' variables may not be declared in the "
-		       "%s shader",
-		       _mesa_glsl_shader_target_name(state->target));
-   }
-
-   /* From page 25 (page 31 of the PDF) of the GLSL 1.10 spec:
-    *
-    *     "The varying qualifier can be used only with the data types
-    *     float, vec2, vec3, vec4, mat2, mat3, and mat4, or arrays of
-    *     these."
-    */
-   if (qual->flags.q.varying) {
-      const glsl_type *non_array_type;
-
-      if (var->type && var->type->is_array())
-	 non_array_type = var->type->fields.array;
-      else
-	 non_array_type = var->type;
-
-      if (non_array_type && non_array_type->base_type != GLSL_TYPE_FLOAT) {
-	 var->type = glsl_type::error_type;
-	 _mesa_glsl_error(loc, state,
-			  "varying variables must be of base type float");
-      }
-   }
-
-   /* If there is no qualifier that changes the mode of the variable, leave
-    * the setting alone.
-    */
-   if (qual->flags.q.in && qual->flags.q.out)
-      var->mode = ir_var_inout;
-   else if (qual->flags.q.attribute || qual->flags.q.in
-	    || (qual->flags.q.varying && (state->target == fragment_shader)))
-      var->mode = ir_var_in;
-   else if (qual->flags.q.out
-	    || (qual->flags.q.varying && (state->target == vertex_shader)))
-      var->mode = ir_var_out;
-   else if (qual->flags.q.uniform)
-      var->mode = ir_var_uniform;
-
-   if (state->all_invariant && (state->current_function == NULL)) {
-      switch (state->target) {
-      case vertex_shader:
-	 if (var->mode == ir_var_out)
-	    var->invariant = true;
-	 break;
-      case geometry_shader:
-	 if ((var->mode == ir_var_in) || (var->mode == ir_var_out))
-	    var->invariant = true;
-	 break;
-      case fragment_shader:
-	 if (var->mode == ir_var_in)
-	    var->invariant = true;
-	 break;
-      }
-   }
-
-   if (qual->flags.q.flat)
-      var->interpolation = ir_var_flat;
-   else if (qual->flags.q.noperspective)
-      var->interpolation = ir_var_noperspective;
-   else
-      var->interpolation = ir_var_smooth;
-
-   var->pixel_center_integer = qual->flags.q.pixel_center_integer;
-   var->origin_upper_left = qual->flags.q.origin_upper_left;
-   if ((qual->flags.q.origin_upper_left || qual->flags.q.pixel_center_integer)
-       && (strcmp(var->name, "gl_FragCoord") != 0)) {
-      const char *const qual_string = (qual->flags.q.origin_upper_left)
-	 ? "origin_upper_left" : "pixel_center_integer";
-
-      _mesa_glsl_error(loc, state,
-		       "layout qualifier `%s' can only be applied to "
-		       "fragment shader input `gl_FragCoord'",
-		       qual_string);
-   }
-
-   if (qual->flags.q.explicit_location) {
-      const bool global_scope = (state->current_function == NULL);
-      bool fail = false;
-      const char *string = "";
-
-      /* In the vertex shader only shader inputs can be given explicit
-       * locations.
-       *
-       * In the fragment shader only shader outputs can be given explicit
-       * locations.
-       */
-      switch (state->target) {
-      case vertex_shader:
-	 if (!global_scope || (var->mode != ir_var_in)) {
-	    fail = true;
-	    string = "input";
-	 }
-	 break;
-
-      case geometry_shader:
-	 _mesa_glsl_error(loc, state,
-			  "geometry shader variables cannot be given "
-			  "explicit locations\n");
-	 break;
-
-      case fragment_shader:
-	 if (!global_scope || (var->mode != ir_var_in)) {
-	    fail = true;
-	    string = "output";
-	 }
-	 break;
-      };
-
-      if (fail) {
-	 _mesa_glsl_error(loc, state,
-			  "only %s shader %s variables can be given an "
-			  "explicit location\n",
-			  _mesa_glsl_shader_target_name(state->target),
-			  string);
-      } else {
-	 var->explicit_location = true;
-
-	 /* This bit of silliness is needed because invalid explicit locations
-	  * are supposed to be flagged during linking.  Small negative values
-	  * biased by VERT_ATTRIB_GENERIC0 or FRAG_RESULT_DATA0 could alias
-	  * built-in values (e.g., -16+VERT_ATTRIB_GENERIC0 = VERT_ATTRIB_POS).
-	  * The linker needs to be able to differentiate these cases.  This
-	  * ensures that negative values stay negative.
-	  */
-	 if (qual->location >= 0) {
-	    var->location = (state->target == vertex_shader)
-	       ? (qual->location + VERT_ATTRIB_GENERIC0)
-	       : (qual->location + FRAG_RESULT_DATA0);
-	 } else {
-	    var->location = qual->location;
-	 }
-      }
-   }
-
-   /* Does the declaration use the 'layout' keyword?
-    */
-   const bool uses_layout = qual->flags.q.pixel_center_integer
-      || qual->flags.q.origin_upper_left
-      || qual->flags.q.explicit_location;
-
-   /* Does the declaration use the deprecated 'attribute' or 'varying'
-    * keywords?
-    */
-   const bool uses_deprecated_qualifier = qual->flags.q.attribute
-      || qual->flags.q.varying;
-
-   /* Is the 'layout' keyword used with parameters that allow relaxed checking.
-    * Many implementations of GL_ARB_fragment_coord_conventions_enable and some
-    * implementations (only Mesa?) GL_ARB_explicit_attrib_location_enable
-    * allowed the layout qualifier to be used with 'varying' and 'attribute'.
-    * These extensions and all following extensions that add the 'layout'
-    * keyword have been modified to require the use of 'in' or 'out'.
-    *
-    * The following extension do not allow the deprecated keywords:
-    *
-    *    GL_AMD_conservative_depth
-    *    GL_ARB_gpu_shader5
-    *    GL_ARB_separate_shader_objects
-    *    GL_ARB_tesselation_shader
-    *    GL_ARB_transform_feedback3
-    *    GL_ARB_uniform_buffer_object
-    *
-    * It is unknown whether GL_EXT_shader_image_load_store or GL_NV_gpu_shader5
-    * allow layout with the deprecated keywords.
-    */
-   const bool relaxed_layout_qualifier_checking =
-      state->ARB_fragment_coord_conventions_enable;
-
-   if (uses_layout && uses_deprecated_qualifier) {
-      if (relaxed_layout_qualifier_checking) {
-	 _mesa_glsl_warning(loc, state,
-			    "`layout' qualifier may not be used with "
-			    "`attribute' or `varying'");
-      } else {
-	 _mesa_glsl_error(loc, state,
-			  "`layout' qualifier may not be used with "
-			  "`attribute' or `varying'");
-      }
-   }
-
-   /* Layout qualifiers for gl_FragDepth, which are enabled by extension
-    * AMD_conservative_depth.
-    */
-   int depth_layout_count = qual->flags.q.depth_any
-      + qual->flags.q.depth_greater
-      + qual->flags.q.depth_less
-      + qual->flags.q.depth_unchanged;
-   if (depth_layout_count > 0
-       && !state->AMD_conservative_depth_enable) {
-       _mesa_glsl_error(loc, state,
-                        "extension GL_AMD_conservative_depth must be enabled "
-			"to use depth layout qualifiers");
-   } else if (depth_layout_count > 0
-              && strcmp(var->name, "gl_FragDepth") != 0) {
-       _mesa_glsl_error(loc, state,
-                        "depth layout qualifiers can be applied only to "
-                        "gl_FragDepth");
-   } else if (depth_layout_count > 1
-              && strcmp(var->name, "gl_FragDepth") == 0) {
-      _mesa_glsl_error(loc, state,
-                       "at most one depth layout qualifier can be applied to "
-                       "gl_FragDepth");
-   }
-   if (qual->flags.q.depth_any)
-      var->depth_layout = ir_depth_layout_any;
-   else if (qual->flags.q.depth_greater)
-      var->depth_layout = ir_depth_layout_greater;
-   else if (qual->flags.q.depth_less)
-      var->depth_layout = ir_depth_layout_less;
-   else if (qual->flags.q.depth_unchanged)
-       var->depth_layout = ir_depth_layout_unchanged;
-   else
-       var->depth_layout = ir_depth_layout_none;
-
-   if (var->type->is_array() && state->language_version != 110) {
-      var->array_lvalue = true;
-   }
-}
-
-
-ir_rvalue *
-ast_declarator_list::hir(exec_list *instructions,
-			 struct _mesa_glsl_parse_state *state)
-{
-   void *ctx = state;
-   const struct glsl_type *decl_type;
-   const char *type_name = NULL;
-   ir_rvalue *result = NULL;
-   YYLTYPE loc = this->get_location();
-
-   /* From page 46 (page 52 of the PDF) of the GLSL 1.50 spec:
-    *
-    *     "To ensure that a particular output variable is invariant, it is
-    *     necessary to use the invariant qualifier. It can either be used to
-    *     qualify a previously declared variable as being invariant
-    *
-    *         invariant gl_Position; // make existing gl_Position be invariant"
-    *
-    * In these cases the parser will set the 'invariant' flag in the declarator
-    * list, and the type will be NULL.
-    */
-   if (this->invariant) {
-      assert(this->type == NULL);
-
-      if (state->current_function != NULL) {
-	 _mesa_glsl_error(& loc, state,
-			  "All uses of `invariant' keyword must be at global "
-			  "scope\n");
-      }
-
-      foreach_list_typed (ast_declaration, decl, link, &this->declarations) {
-	 assert(!decl->is_array);
-	 assert(decl->array_size == NULL);
-	 assert(decl->initializer == NULL);
-
-	 ir_variable *const earlier =
-	    state->symbols->get_variable(decl->identifier);
-	 if (earlier == NULL) {
-	    _mesa_glsl_error(& loc, state,
-			     "Undeclared variable `%s' cannot be marked "
-			     "invariant\n", decl->identifier);
-	 } else if ((state->target == vertex_shader)
-	       && (earlier->mode != ir_var_out)) {
-	    _mesa_glsl_error(& loc, state,
-			     "`%s' cannot be marked invariant, vertex shader "
-			     "outputs only\n", decl->identifier);
-	 } else if ((state->target == fragment_shader)
-	       && (earlier->mode != ir_var_in)) {
-	    _mesa_glsl_error(& loc, state,
-			     "`%s' cannot be marked invariant, fragment shader "
-			     "inputs only\n", decl->identifier);
-	 } else if (earlier->used) {
-	    _mesa_glsl_error(& loc, state,
-			     "variable `%s' may not be redeclared "
-			     "`invariant' after being used",
-			     earlier->name);
-	 } else {
-	    earlier->invariant = true;
-	 }
-      }
-
-      /* Invariant redeclarations do not have r-values.
-       */
-      return NULL;
-   }
-
-   assert(this->type != NULL);
-   assert(!this->invariant);
-
-   /* The type specifier may contain a structure definition.  Process that
-    * before any of the variable declarations.
-    */
-   (void) this->type->specifier->hir(instructions, state);
-
-   decl_type = this->type->specifier->glsl_type(& type_name, state);
-   if (this->declarations.is_empty()) {
-      /* The only valid case where the declaration list can be empty is when
-       * the declaration is setting the default precision of a built-in type
-       * (e.g., 'precision highp vec4;').
-       */
-
-      if (decl_type != NULL) {
-      } else {
-	    _mesa_glsl_error(& loc, state, "incomplete declaration");
-      }
-   }
-
-   foreach_list_typed (ast_declaration, decl, link, &this->declarations) {
-      const struct glsl_type *var_type;
-      ir_variable *var;
-
-      /* FINISHME: Emit a warning if a variable declaration shadows a
-       * FINISHME: declaration at a higher scope.
-       */
-
-      if ((decl_type == NULL) || decl_type->is_void()) {
-	 if (type_name != NULL) {
-	    _mesa_glsl_error(& loc, state,
-			     "invalid type `%s' in declaration of `%s'",
-			     type_name, decl->identifier);
-	 } else {
-	    _mesa_glsl_error(& loc, state,
-			     "invalid type in declaration of `%s'",
-			     decl->identifier);
-	 }
-	 continue;
-      }
-
-      if (decl->is_array) {
-	 var_type = process_array_type(&loc, decl_type, decl->array_size,
-				       state);
-      } else {
-	 var_type = decl_type;
-      }
-
-      var = new(ctx) ir_variable(var_type, decl->identifier, ir_var_auto);
-
-      /* From page 22 (page 28 of the PDF) of the GLSL 1.10 specification;
-       *
-       *     "Global variables can only use the qualifiers const,
-       *     attribute, uni form, or varying. Only one may be
-       *     specified.
-       *
-       *     Local variables can only use the qualifier const."
-       *
-       * This is relaxed in GLSL 1.30.  It is also relaxed by any extension
-       * that adds the 'layout' keyword.
-       */
-      if ((state->language_version < 130)
-	  && !state->ARB_explicit_attrib_location_enable
-	  && !state->ARB_fragment_coord_conventions_enable) {
-	 if (this->type->qualifier.flags.q.out) {
-	    _mesa_glsl_error(& loc, state,
-			     "`out' qualifier in declaration of `%s' "
-			     "only valid for function parameters in %s.",
-			     decl->identifier, state->version_string);
-	 }
-	 if (this->type->qualifier.flags.q.in) {
-	    _mesa_glsl_error(& loc, state,
-			     "`in' qualifier in declaration of `%s' "
-			     "only valid for function parameters in %s.",
-			     decl->identifier, state->version_string);
-	 }
-	 /* FINISHME: Test for other invalid qualifiers. */
-      }
-
-      apply_type_qualifier_to_variable(& this->type->qualifier, var, state,
-				       & loc);
-
-      if (this->type->qualifier.flags.q.invariant) {
-	 if ((state->target == vertex_shader) && !(var->mode == ir_var_out ||
-						   var->mode == ir_var_inout)) {
-	    /* FINISHME: Note that this doesn't work for invariant on
-	     * a function signature outval
-	     */
-	    _mesa_glsl_error(& loc, state,
-			     "`%s' cannot be marked invariant, vertex shader "
-			     "outputs only\n", var->name);
-	 } else if ((state->target == fragment_shader) &&
-		    !(var->mode == ir_var_in || var->mode == ir_var_inout)) {
-	    /* FINISHME: Note that this doesn't work for invariant on
-	     * a function signature inval
-	     */
-	    _mesa_glsl_error(& loc, state,
-			     "`%s' cannot be marked invariant, fragment shader "
-			     "inputs only\n", var->name);
-	 }
-      }
-
-      if (state->current_function != NULL) {
-	 const char *mode = NULL;
-	 const char *extra = "";
-
-	 /* There is no need to check for 'inout' here because the parser will
-	  * only allow that in function parameter lists.
-	  */
-	 if (this->type->qualifier.flags.q.attribute) {
-	    mode = "attribute";
-	 } else if (this->type->qualifier.flags.q.uniform) {
-	    mode = "uniform";
-	 } else if (this->type->qualifier.flags.q.varying) {
-	    mode = "varying";
-	 } else if (this->type->qualifier.flags.q.in) {
-	    mode = "in";
-	    extra = " or in function parameter list";
-	 } else if (this->type->qualifier.flags.q.out) {
-	    mode = "out";
-	    extra = " or in function parameter list";
-	 }
-
-	 if (mode) {
-	    _mesa_glsl_error(& loc, state,
-			     "%s variable `%s' must be declared at "
-			     "global scope%s",
-			     mode, var->name, extra);
-	 }
-      } else if (var->mode == ir_var_in) {
-         var->read_only = true;
-
-	 if (state->target == vertex_shader) {
-	    bool error_emitted = false;
-
-	    /* From page 31 (page 37 of the PDF) of the GLSL 1.50 spec:
-	     *
-	     *    "Vertex shader inputs can only be float, floating-point
-	     *    vectors, matrices, signed and unsigned integers and integer
-	     *    vectors. Vertex shader inputs can also form arrays of these
-	     *    types, but not structures."
-	     *
-	     * From page 31 (page 27 of the PDF) of the GLSL 1.30 spec:
-	     *
-	     *    "Vertex shader inputs can only be float, floating-point
-	     *    vectors, matrices, signed and unsigned integers and integer
-	     *    vectors. They cannot be arrays or structures."
-	     *
-	     * From page 23 (page 29 of the PDF) of the GLSL 1.20 spec:
-	     *
-	     *    "The attribute qualifier can be used only with float,
-	     *    floating-point vectors, and matrices. Attribute variables
-	     *    cannot be declared as arrays or structures."
-	     */
-	    const glsl_type *check_type = var->type->is_array()
-	       ? var->type->fields.array : var->type;
-
-	    switch (check_type->base_type) {
-	    case GLSL_TYPE_FLOAT:
-	       break;
-	    case GLSL_TYPE_UINT:
-	    case GLSL_TYPE_INT:
-	       if (state->language_version > 120)
-		  break;
-	       /* FALLTHROUGH */
-	    default:
-	       _mesa_glsl_error(& loc, state,
-				"vertex shader input / attribute cannot have "
-				"type %s`%s'",
-				var->type->is_array() ? "array of " : "",
-				check_type->name);
-	       error_emitted = true;
-	    }
-
-	    if (!error_emitted && (state->language_version <= 130)
-		&& var->type->is_array()) {
-	       _mesa_glsl_error(& loc, state,
-				"vertex shader input / attribute cannot have "
-				"array type");
-	       error_emitted = true;
-	    }
-	 }
-      }
-
-      /* Integer vertex outputs must be qualified with 'flat'.
-       *
-       * From section 4.3.6 of the GLSL 1.30 spec:
-       *    "If a vertex output is a signed or unsigned integer or integer
-       *    vector, then it must be qualified with the interpolation qualifier
-       *    flat."
-       */
-      if (state->language_version >= 130
-          && state->target == vertex_shader
-          && state->current_function == NULL
-          && var->type->is_integer()
-          && var->mode == ir_var_out
-          && var->interpolation != ir_var_flat) {
-
-         _mesa_glsl_error(&loc, state, "If a vertex output is an integer, "
-                          "then it must be qualified with 'flat'");
-      }
-
-
-      /* Interpolation qualifiers cannot be applied to 'centroid' and
-       * 'centroid varying'.
-       *
-       * From page 29 (page 35 of the PDF) of the GLSL 1.30 spec:
-       *    "interpolation qualifiers may only precede the qualifiers in,
-       *    centroid in, out, or centroid out in a declaration. They do not apply
-       *    to the deprecated storage qualifiers varying or centroid varying."
-       */
-      if (state->language_version >= 130
-          && this->type->qualifier.has_interpolation()
-          && this->type->qualifier.flags.q.varying) {
-
-         const char *i = this->type->qualifier.interpolation_string();
-         assert(i != NULL);
-         const char *s;
-         if (this->type->qualifier.flags.q.centroid)
-            s = "centroid varying";
-         else
-            s = "varying";
-
-         _mesa_glsl_error(&loc, state,
-                          "qualifier '%s' cannot be applied to the "
-                          "deprecated storage qualifier '%s'", i, s);
-      }
-
-
-      /* Interpolation qualifiers can only apply to vertex shader outputs and
-       * fragment shader inputs.
-       *
-       * From page 29 (page 35 of the PDF) of the GLSL 1.30 spec:
-       *    "Outputs from a vertex shader (out) and inputs to a fragment
-       *    shader (in) can be further qualified with one or more of these
-       *    interpolation qualifiers"
-       */
-      if (state->language_version >= 130
-          && this->type->qualifier.has_interpolation()) {
-
-         const char *i = this->type->qualifier.interpolation_string();
-         assert(i != NULL);
-
-         switch (state->target) {
-         case vertex_shader:
-            if (this->type->qualifier.flags.q.in) {
-               _mesa_glsl_error(&loc, state,
-                                "qualifier '%s' cannot be applied to vertex "
-                                "shader inputs", i);
-            }
-            break;
-         case fragment_shader:
-            if (this->type->qualifier.flags.q.out) {
-               _mesa_glsl_error(&loc, state,
-                                "qualifier '%s' cannot be applied to fragment "
-                                "shader outputs", i);
-            }
-            break;
-         default:
-            assert(0);
-         }
-      }
-
-
-      /* From section 4.3.4 of the GLSL 1.30 spec:
-       *    "It is an error to use centroid in in a vertex shader."
-       */
-      if (state->language_version >= 130
-          && this->type->qualifier.flags.q.centroid
-          && this->type->qualifier.flags.q.in
-          && state->target == vertex_shader) {
-
-         _mesa_glsl_error(&loc, state,
-                          "'centroid in' cannot be used in a vertex shader");
-      }
-
-
-      /* Precision qualifiers exists only in GLSL versions 1.00 and >= 1.30.
-       */
-      if (this->type->specifier->precision != ast_precision_none
-          && state->language_version != 100
-          && state->language_version < 130) {
-
-         _mesa_glsl_error(&loc, state,
-                          "precision qualifiers are supported only in GLSL ES "
-                          "1.00, and GLSL 1.30 and later");
-      }
-
-
-      /* Precision qualifiers only apply to floating point and integer types.
-       *
-       * From section 4.5.2 of the GLSL 1.30 spec:
-       *    "Any floating point or any integer declaration can have the type
-       *    preceded by one of these precision qualifiers [...] Literal
-       *    constants do not have precision qualifiers. Neither do Boolean
-       *    variables.
-       */
-      if (this->type->specifier->precision != ast_precision_none
-          && !var->type->is_float()
-          && !var->type->is_integer()
-          && !(var->type->is_array()
-               && (var->type->fields.array->is_float()
-                   || var->type->fields.array->is_integer()))) {
-
-         _mesa_glsl_error(&loc, state,
-                          "precision qualifiers apply only to floating point "
-                          "and integer types");
-      }
-
-      /* Process the initializer and add its instructions to a temporary
-       * list.  This list will be added to the instruction stream (below) after
-       * the declaration is added.  This is done because in some cases (such as
-       * redeclarations) the declaration may not actually be added to the
-       * instruction stream.
-       */
-      exec_list initializer_instructions;
-      if (decl->initializer != NULL) {
-	 YYLTYPE initializer_loc = decl->initializer->get_location();
-
-	 /* From page 24 (page 30 of the PDF) of the GLSL 1.10 spec:
-	  *
-	  *    "All uniform variables are read-only and are initialized either
-	  *    directly by an application via API commands, or indirectly by
-	  *    OpenGL."
-	  */
-	 if ((state->language_version <= 110)
-	     && (var->mode == ir_var_uniform)) {
-	    _mesa_glsl_error(& initializer_loc, state,
-			     "cannot initialize uniforms in GLSL 1.10");
-	 }
-
-	 if (var->type->is_sampler()) {
-	    _mesa_glsl_error(& initializer_loc, state,
-			     "cannot initialize samplers");
-	 }
-
-	 if ((var->mode == ir_var_in) && (state->current_function == NULL)) {
-	    _mesa_glsl_error(& initializer_loc, state,
-			     "cannot initialize %s shader input / %s",
-			     _mesa_glsl_shader_target_name(state->target),
-			     (state->target == vertex_shader)
-			     ? "attribute" : "varying");
-	 }
-
-	 ir_dereference *const lhs = new(ctx) ir_dereference_variable(var);
-	 ir_rvalue *rhs = decl->initializer->hir(&initializer_instructions,
-						 state);
-
-	 /* Calculate the constant value if this is a const or uniform
-	  * declaration.
-	  */
-	 if (this->type->qualifier.flags.q.constant
-	     || this->type->qualifier.flags.q.uniform) {
-	    ir_rvalue *new_rhs = validate_assignment(state, var->type, rhs);
-	    if (new_rhs != NULL) {
-	       rhs = new_rhs;
-
-	       ir_constant *constant_value = rhs->constant_expression_value();
-	       if (!constant_value) {
-		  _mesa_glsl_error(& initializer_loc, state,
-				   "initializer of %s variable `%s' must be a "
-				   "constant expression",
-				   (this->type->qualifier.flags.q.constant)
-				   ? "const" : "uniform",
-				   decl->identifier);
-		  if (var->type->is_numeric()) {
-		     /* Reduce cascading errors. */
-		     var->constant_value = ir_constant::zero(ctx, var->type);
-		  }
-	       } else {
-		  rhs = constant_value;
-		  var->constant_value = constant_value;
-	       }
-	    } else {
-	       _mesa_glsl_error(&initializer_loc, state,
-			        "initializer of type %s cannot be assigned to "
-				"variable of type %s",
-				rhs->type->name, var->type->name);
-	       if (var->type->is_numeric()) {
-		  /* Reduce cascading errors. */
-		  var->constant_value = ir_constant::zero(ctx, var->type);
-	       }
-	    }
-	 }
-
-	 if (rhs && !rhs->type->is_error()) {
-	    bool temp = var->read_only;
-	    if (this->type->qualifier.flags.q.constant)
-	       var->read_only = false;
-
-	    /* Never emit code to initialize a uniform.
-	     */
-	    const glsl_type *initializer_type;
-	    if (!this->type->qualifier.flags.q.uniform) {
-	       result = do_assignment(&initializer_instructions, state,
-				      lhs, rhs,
-				      this->get_location());
-	       initializer_type = result->type;
-	    } else
-	       initializer_type = rhs->type;
-
-	    /* If the declared variable is an unsized array, it must inherrit
-	     * its full type from the initializer.  A declaration such as
-	     *
-	     *     uniform float a[] = float[](1.0, 2.0, 3.0, 3.0);
-	     *
-	     * becomes
-	     *
-	     *     uniform float a[4] = float[](1.0, 2.0, 3.0, 3.0);
-	     *
-	     * The assignment generated in the if-statement (below) will also
-	     * automatically handle this case for non-uniforms.
-	     *
-	     * If the declared variable is not an array, the types must
-	     * already match exactly.  As a result, the type assignment
-	     * here can be done unconditionally.  For non-uniforms the call
-	     * to do_assignment can change the type of the initializer (via
-	     * the implicit conversion rules).  For uniforms the initializer
-	     * must be a constant expression, and the type of that expression
-	     * was validated above.
-	     */
-	    var->type = initializer_type;
-
-	    var->read_only = temp;
-	 }
-      }
-
-      /* From page 23 (page 29 of the PDF) of the GLSL 1.10 spec:
-       *
-       *     "It is an error to write to a const variable outside of
-       *      its declaration, so they must be initialized when
-       *      declared."
-       */
-      if (this->type->qualifier.flags.q.constant && decl->initializer == NULL) {
-	 _mesa_glsl_error(& loc, state,
-			  "const declaration of `%s' must be initialized",
-			  decl->identifier);
-      }
-
-      /* Check if this declaration is actually a re-declaration, either to
-       * resize an array or add qualifiers to an existing variable.
-       *
-       * This is allowed for variables in the current scope, or when at
-       * global scope (for built-ins in the implicit outer scope).
-       */
-      ir_variable *earlier = state->symbols->get_variable(decl->identifier);
-      if (earlier != NULL && (state->current_function == NULL ||
-	  state->symbols->name_declared_this_scope(decl->identifier))) {
-
-	 /* From page 24 (page 30 of the PDF) of the GLSL 1.50 spec,
-	  *
-	  * "It is legal to declare an array without a size and then
-	  *  later re-declare the same name as an array of the same
-	  *  type and specify a size."
-	  */
-	 if ((earlier->type->array_size() == 0)
-	     && var->type->is_array()
-	     && (var->type->element_type() == earlier->type->element_type())) {
-	    /* FINISHME: This doesn't match the qualifiers on the two
-	     * FINISHME: declarations.  It's not 100% clear whether this is
-	     * FINISHME: required or not.
-	     */
-
-	    /* From page 54 (page 60 of the PDF) of the GLSL 1.20 spec:
-	     *
-	     *     "The size [of gl_TexCoord] can be at most
-	     *     gl_MaxTextureCoords."
-	     */
-	    const unsigned size = unsigned(var->type->array_size());
-	    if ((strcmp("gl_TexCoord", var->name) == 0)
-		&& (size > state->Const.MaxTextureCoords)) {
-	       YYLTYPE loc = this->get_location();
-
-	       _mesa_glsl_error(& loc, state, "`gl_TexCoord' array size cannot "
-				"be larger than gl_MaxTextureCoords (%u)\n",
-				state->Const.MaxTextureCoords);
-	    } else if ((size > 0) && (size <= earlier->max_array_access)) {
-	       YYLTYPE loc = this->get_location();
-
-	       _mesa_glsl_error(& loc, state, "array size must be > %u due to "
-				"previous access",
-				earlier->max_array_access);
-	    }
-
-	    earlier->type = var->type;
-	    delete var;
-	    var = NULL;
-	 } else if (state->ARB_fragment_coord_conventions_enable
-		    && strcmp(var->name, "gl_FragCoord") == 0
-		    && earlier->type == var->type
-		    && earlier->mode == var->mode) {
-	    /* Allow redeclaration of gl_FragCoord for ARB_fcc layout
-	     * qualifiers.
-	     */
-	    earlier->origin_upper_left = var->origin_upper_left;
-	    earlier->pixel_center_integer = var->pixel_center_integer;
-
-	 /* According to section 4.3.7 of the GLSL 1.30 spec,
-	  * the following built-in varaibles can be redeclared with an
-	  * interpolation qualifier:
-	  *    * gl_FrontColor
-	  *    * gl_BackColor
-	  *    * gl_FrontSecondaryColor
-	  *    * gl_BackSecondaryColor
-	  *    * gl_Color
-	  *    * gl_SecondaryColor
-	  */
-	 } else if (state->language_version >= 130
-	            && (strcmp(var->name, "gl_FrontColor") == 0
-                        || strcmp(var->name, "gl_BackColor") == 0
-                        || strcmp(var->name, "gl_FrontSecondaryColor") == 0
-                        || strcmp(var->name, "gl_BackSecondaryColor") == 0
-                        || strcmp(var->name, "gl_Color") == 0
-                        || strcmp(var->name, "gl_SecondaryColor") == 0)
-	            && earlier->type == var->type
-	            && earlier->mode == var->mode) {
-	    earlier->interpolation = var->interpolation;
-
-         /* Layout qualifiers for gl_FragDepth. */
-         } else if (state->AMD_conservative_depth_enable
-                    && strcmp(var->name, "gl_FragDepth") == 0
-                    && earlier->type == var->type
-                    && earlier->mode == var->mode) {
-
-            /** From the AMD_conservative_depth spec:
-             *     Within any shader, the first redeclarations of gl_FragDepth
-             *     must appear before any use of gl_FragDepth.
-             */
-            if (earlier->used) {
-               _mesa_glsl_error(&loc, state,
-                                "the first redeclaration of gl_FragDepth "
-                                "must appear before any use of gl_FragDepth");
-            }
-
-            /* Prevent inconsistent redeclaration of depth layout qualifier. */
-            if (earlier->depth_layout != ir_depth_layout_none
-                && earlier->depth_layout != var->depth_layout) {
-               _mesa_glsl_error(&loc, state,
-                                "gl_FragDepth: depth layout is declared here "
-                                "as '%s, but it was previously declared as "
-                                "'%s'",
-                                depth_layout_string(var->depth_layout),
-                                depth_layout_string(earlier->depth_layout));
-            }
-
-            earlier->depth_layout = var->depth_layout;
-
-	 } else {
-	    YYLTYPE loc = this->get_location();
-	    _mesa_glsl_error(&loc, state, "`%s' redeclared", decl->identifier);
-	 }
-
-	 continue;
-      }
-
-      /* By now, we know it's a new variable declaration (we didn't hit the
-       * above "continue").
-       *
-       * From page 15 (page 21 of the PDF) of the GLSL 1.10 spec,
-       *
-       *   "Identifiers starting with "gl_" are reserved for use by
-       *   OpenGL, and may not be declared in a shader as either a
-       *   variable or a function."
-       */
-      if (strncmp(decl->identifier, "gl_", 3) == 0)
-	 _mesa_glsl_error(& loc, state,
-			  "identifier `%s' uses reserved `gl_' prefix",
-			  decl->identifier);
-
-      /* Add the variable to the symbol table.  Note that the initializer's
-       * IR was already processed earlier (though it hasn't been emitted yet),
-       * without the variable in scope.
-       *
-       * This differs from most C-like languages, but it follows the GLSL
-       * specification.  From page 28 (page 34 of the PDF) of the GLSL 1.50
-       * spec:
-       *
-       *     "Within a declaration, the scope of a name starts immediately
-       *     after the initializer if present or immediately after the name
-       *     being declared if not."
-       */
-      if (!state->symbols->add_variable(var)) {
-	 YYLTYPE loc = this->get_location();
-	 _mesa_glsl_error(&loc, state, "name `%s' already taken in the "
-			  "current scope", decl->identifier);
-	 continue;
-      }
-
-      /* Push the variable declaration to the top.  It means that all
-       * the variable declarations will appear in a funny
-       * last-to-first order, but otherwise we run into trouble if a
-       * function is prototyped, a global var is decled, then the
-       * function is defined with usage of the global var.  See
-       * glslparsertest's CorrectModule.frag.
-       */
-      instructions->push_head(var);
-      instructions->append_list(&initializer_instructions);
-   }
-
-
-   /* Generally, variable declarations do not have r-values.  However,
-    * one is used for the declaration in
-    *
-    * while (bool b = some_condition()) {
-    *   ...
-    * }
-    *
-    * so we return the rvalue from the last seen declaration here.
-    */
-   return result;
-}
-
-
-ir_rvalue *
-ast_parameter_declarator::hir(exec_list *instructions,
-			      struct _mesa_glsl_parse_state *state)
-{
-   void *ctx = state;
-   const struct glsl_type *type;
-   const char *name = NULL;
-   YYLTYPE loc = this->get_location();
-
-   type = this->type->specifier->glsl_type(& name, state);
-
-   if (type == NULL) {
-      if (name != NULL) {
-	 _mesa_glsl_error(& loc, state,
-			  "invalid type `%s' in declaration of `%s'",
-			  name, this->identifier);
-      } else {
-	 _mesa_glsl_error(& loc, state,
-			  "invalid type in declaration of `%s'",
-			  this->identifier);
-      }
-
-      type = glsl_type::error_type;
-   }
-
-   /* From page 62 (page 68 of the PDF) of the GLSL 1.50 spec:
-    *
-    *    "Functions that accept no input arguments need not use void in the
-    *    argument list because prototypes (or definitions) are required and
-    *    therefore there is no ambiguity when an empty argument list "( )" is
-    *    declared. The idiom "(void)" as a parameter list is provided for
-    *    convenience."
-    *
-    * Placing this check here prevents a void parameter being set up
-    * for a function, which avoids tripping up checks for main taking
-    * parameters and lookups of an unnamed symbol.
-    */
-   if (type->is_void()) {
-      if (this->identifier != NULL)
-	 _mesa_glsl_error(& loc, state,
-			  "named parameter cannot have type `void'");
-
-      is_void = true;
-      return NULL;
-   }
-
-   if (formal_parameter && (this->identifier == NULL)) {
-      _mesa_glsl_error(& loc, state, "formal parameter lacks a name");
-      return NULL;
-   }
-
-   /* This only handles "vec4 foo[..]".  The earlier specifier->glsl_type(...)
-    * call already handled the "vec4[..] foo" case.
-    */
-   if (this->is_array) {
-      type = process_array_type(&loc, type, this->array_size, state);
-   }
-
-   if (type->array_size() == 0) {
-      _mesa_glsl_error(&loc, state, "arrays passed as parameters must have "
-		       "a declared size.");
-      type = glsl_type::error_type;
-   }
-
-   is_void = false;
-   ir_variable *var = new(ctx) ir_variable(type, this->identifier, ir_var_in);
-
-   /* Apply any specified qualifiers to the parameter declaration.  Note that
-    * for function parameters the default mode is 'in'.
-    */
-   apply_type_qualifier_to_variable(& this->type->qualifier, var, state, & loc);
-
-   instructions->push_tail(var);
-
-   /* Parameter declarations do not have r-values.
-    */
-   return NULL;
-}
-
-
-void
-ast_parameter_declarator::parameters_to_hir(exec_list *ast_parameters,
-					    bool formal,
-					    exec_list *ir_parameters,
-					    _mesa_glsl_parse_state *state)
-{
-   ast_parameter_declarator *void_param = NULL;
-   unsigned count = 0;
-
-   foreach_list_typed (ast_parameter_declarator, param, link, ast_parameters) {
-      param->formal_parameter = formal;
-      param->hir(ir_parameters, state);
-
-      if (param->is_void)
-	 void_param = param;
-
-      count++;
-   }
-
-   if ((void_param != NULL) && (count > 1)) {
-      YYLTYPE loc = void_param->get_location();
-
-      _mesa_glsl_error(& loc, state,
-		       "`void' parameter must be only parameter");
-   }
-}
-
-
-void
-emit_function(_mesa_glsl_parse_state *state, exec_list *instructions,
-	      ir_function *f)
-{
-   /* Emit the new function header */
-   if (state->current_function == NULL) {
-      instructions->push_tail(f);
-   } else {
-      /* IR invariants disallow function declarations or definitions nested
-       * within other function definitions.  Insert the new ir_function
-       * block in the instruction sequence before the ir_function block
-       * containing the current ir_function_signature.
-       */
-      ir_function *const curr =
-	 const_cast<ir_function *>(state->current_function->function());
-
-      curr->insert_before(f);
-   }
-}
-
-
-ir_rvalue *
-ast_function::hir(exec_list *instructions,
-		  struct _mesa_glsl_parse_state *state)
-{
-   void *ctx = state;
-   ir_function *f = NULL;
-   ir_function_signature *sig = NULL;
-   exec_list hir_parameters;
-
-   const char *const name = identifier;
-
-   /* From page 21 (page 27 of the PDF) of the GLSL 1.20 spec,
-    *
-    *   "Function declarations (prototypes) cannot occur inside of functions;
-    *   they must be at global scope, or for the built-in functions, outside
-    *   the global scope."
-    *
-    * From page 27 (page 33 of the PDF) of the GLSL ES 1.00.16 spec,
-    *
-    *   "User defined functions may only be defined within the global scope."
-    *
-    * Note that this language does not appear in GLSL 1.10.
-    */
-   if ((state->current_function != NULL) && (state->language_version != 110)) {
-      YYLTYPE loc = this->get_location();
-      _mesa_glsl_error(&loc, state,
-		       "declaration of function `%s' not allowed within "
-		       "function body", name);
-   }
-
-   /* From page 15 (page 21 of the PDF) of the GLSL 1.10 spec,
-    *
-    *   "Identifiers starting with "gl_" are reserved for use by
-    *   OpenGL, and may not be declared in a shader as either a
-    *   variable or a function."
-    */
-   if (strncmp(name, "gl_", 3) == 0) {
-      YYLTYPE loc = this->get_location();
-      _mesa_glsl_error(&loc, state,
-		       "identifier `%s' uses reserved `gl_' prefix", name);
-   }
-
-   /* Convert the list of function parameters to HIR now so that they can be
-    * used below to compare this function's signature with previously seen
-    * signatures for functions with the same name.
-    */
-   ast_parameter_declarator::parameters_to_hir(& this->parameters,
-					       is_definition,
-					       & hir_parameters, state);
-
-   const char *return_type_name;
-   const glsl_type *return_type =
-      this->return_type->specifier->glsl_type(& return_type_name, state);
-
-   if (!return_type) {
-      YYLTYPE loc = this->get_location();
-      _mesa_glsl_error(&loc, state,
-		       "function `%s' has undeclared return type `%s'",
-		       name, return_type_name);
-      return_type = glsl_type::error_type;
-   }
-
-   /* From page 56 (page 62 of the PDF) of the GLSL 1.30 spec:
-    * "No qualifier is allowed on the return type of a function."
-    */
-   if (this->return_type->has_qualifiers()) {
-      YYLTYPE loc = this->get_location();
-      _mesa_glsl_error(& loc, state,
-		       "function `%s' return type has qualifiers", name);
-   }
-
-   /* Verify that this function's signature either doesn't match a previously
-    * seen signature for a function with the same name, or, if a match is found,
-    * that the previously seen signature does not have an associated definition.
-    */
-   f = state->symbols->get_function(name);
-   if (f != NULL && (state->es_shader || f->has_user_signature())) {
-      sig = f->exact_matching_signature(&hir_parameters);
-      if (sig != NULL) {
-	 const char *badvar = sig->qualifiers_match(&hir_parameters);
-	 if (badvar != NULL) {
-	    YYLTYPE loc = this->get_location();
-
-	    _mesa_glsl_error(&loc, state, "function `%s' parameter `%s' "
-			     "qualifiers don't match prototype", name, badvar);
-	 }
-
-	 if (sig->return_type != return_type) {
-	    YYLTYPE loc = this->get_location();
-
-	    _mesa_glsl_error(&loc, state, "function `%s' return type doesn't "
-			     "match prototype", name);
-	 }
-
-	 if (is_definition && sig->is_defined) {
-	    YYLTYPE loc = this->get_location();
-
-	    _mesa_glsl_error(& loc, state, "function `%s' redefined", name);
-	 }
-      }
-   } else {
-      f = new(ctx) ir_function(name);
-      if (!state->symbols->add_function(f)) {
-	 /* This function name shadows a non-function use of the same name. */
-	 YYLTYPE loc = this->get_location();
-
-	 _mesa_glsl_error(&loc, state, "function name `%s' conflicts with "
-			  "non-function", name);
-	 return NULL;
-      }
-
-      emit_function(state, instructions, f);
-   }
-
-   /* Verify the return type of main() */
-   if (strcmp(name, "main") == 0) {
-      if (! return_type->is_void()) {
-	 YYLTYPE loc = this->get_location();
-
-	 _mesa_glsl_error(& loc, state, "main() must return void");
-      }
-
-      if (!hir_parameters.is_empty()) {
-	 YYLTYPE loc = this->get_location();
-
-	 _mesa_glsl_error(& loc, state, "main() must not take any parameters");
-      }
-   }
-
-   /* Finish storing the information about this new function in its signature.
-    */
-   if (sig == NULL) {
-      sig = new(ctx) ir_function_signature(return_type);
-      f->add_signature(sig);
-   }
-
-   sig->replace_parameters(&hir_parameters);
-   signature = sig;
-
-   /* Function declarations (prototypes) do not have r-values.
-    */
-   return NULL;
-}
-
-
-ir_rvalue *
-ast_function_definition::hir(exec_list *instructions,
-			     struct _mesa_glsl_parse_state *state)
-{
-   prototype->is_definition = true;
-   prototype->hir(instructions, state);
-
-   ir_function_signature *signature = prototype->signature;
-   if (signature == NULL)
-      return NULL;
-
-   assert(state->current_function == NULL);
-   state->current_function = signature;
-   state->found_return = false;
-
-   /* Duplicate parameters declared in the prototype as concrete variables.
-    * Add these to the symbol table.
-    */
-   state->symbols->push_scope();
-   foreach_iter(exec_list_iterator, iter, signature->parameters) {
-      ir_variable *const var = ((ir_instruction *) iter.get())->as_variable();
-
-      assert(var != NULL);
-
-      /* The only way a parameter would "exist" is if two parameters have
-       * the same name.
-       */
-      if (state->symbols->name_declared_this_scope(var->name)) {
-	 YYLTYPE loc = this->get_location();
-
-	 _mesa_glsl_error(& loc, state, "parameter `%s' redeclared", var->name);
-      } else {
-	 state->symbols->add_variable(var);
-      }
-   }
-
-   /* Convert the body of the function to HIR. */
-   this->body->hir(&signature->body, state);
-   signature->is_defined = true;
-
-   state->symbols->pop_scope();
-
-   assert(state->current_function == signature);
-   state->current_function = NULL;
-
-   if (!signature->return_type->is_void() && !state->found_return) {
-      YYLTYPE loc = this->get_location();
-      _mesa_glsl_error(& loc, state, "function `%s' has non-void return type "
-		       "%s, but no return statement",
-		       signature->function_name(),
-		       signature->return_type->name);
-   }
-
-   /* Function definitions do not have r-values.
-    */
-   return NULL;
-}
-
-
-ir_rvalue *
-ast_jump_statement::hir(exec_list *instructions,
-			struct _mesa_glsl_parse_state *state)
-{
-   void *ctx = state;
-
-   switch (mode) {
-   case ast_return: {
-      ir_return *inst;
-      assert(state->current_function);
-
-      if (opt_return_value) {
-	 ir_rvalue *const ret = opt_return_value->hir(instructions, state);
-
-	 /* The value of the return type can be NULL if the shader says
-	  * 'return foo();' and foo() is a function that returns void.
-	  *
-	  * NOTE: The GLSL spec doesn't say that this is an error.  The type
-	  * of the return value is void.  If the return type of the function is
-	  * also void, then this should compile without error.  Seriously.
-	  */
-	 const glsl_type *const ret_type =
-	    (ret == NULL) ? glsl_type::void_type : ret->type;
-
-	 /* Implicit conversions are not allowed for return values. */
-	 if (state->current_function->return_type != ret_type) {
-	    YYLTYPE loc = this->get_location();
-
-	    _mesa_glsl_error(& loc, state,
-			     "`return' with wrong type %s, in function `%s' "
-			     "returning %s",
-			     ret_type->name,
-			     state->current_function->function_name(),
-			     state->current_function->return_type->name);
-	 }
-
-	 inst = new(ctx) ir_return(ret);
-      } else {
-	 if (state->current_function->return_type->base_type !=
-	     GLSL_TYPE_VOID) {
-	    YYLTYPE loc = this->get_location();
-
-	    _mesa_glsl_error(& loc, state,
-			     "`return' with no value, in function %s returning "
-			     "non-void",
-			     state->current_function->function_name());
-	 }
-	 inst = new(ctx) ir_return;
-      }
-
-      state->found_return = true;
-      instructions->push_tail(inst);
-      break;
-   }
-
-   case ast_discard:
-      if (state->target != fragment_shader) {
-	 YYLTYPE loc = this->get_location();
-
-	 _mesa_glsl_error(& loc, state,
-			  "`discard' may only appear in a fragment shader");
-      }
-      instructions->push_tail(new(ctx) ir_discard);
-      break;
-
-   case ast_break:
-   case ast_continue:
-      /* FINISHME: Handle switch-statements.  They cannot contain 'continue',
-       * FINISHME: and they use a different IR instruction for 'break'.
-       */
-      /* FINISHME: Correctly handle the nesting.  If a switch-statement is
-       * FINISHME: inside a loop, a 'continue' is valid and will bind to the
-       * FINISHME: loop.
-       */
-      if (state->loop_or_switch_nesting == NULL) {
-	 YYLTYPE loc = this->get_location();
-
-	 _mesa_glsl_error(& loc, state,
-			  "`%s' may only appear in a loop",
-			  (mode == ast_break) ? "break" : "continue");
-      } else {
-	 ir_loop *const loop = state->loop_or_switch_nesting->as_loop();
-
-	 /* Inline the for loop expression again, since we don't know
-	  * where near the end of the loop body the normal copy of it
-	  * is going to be placed.
-	  */
-	 if (mode == ast_continue &&
-	     state->loop_or_switch_nesting_ast->rest_expression) {
-	    state->loop_or_switch_nesting_ast->rest_expression->hir(instructions,
-								    state);
-	 }
-
-	 if (loop != NULL) {
-	    ir_loop_jump *const jump =
-	       new(ctx) ir_loop_jump((mode == ast_break)
-				     ? ir_loop_jump::jump_break
-				     : ir_loop_jump::jump_continue);
-	    instructions->push_tail(jump);
-	 }
-      }
-
-      break;
-   }
-
-   /* Jump instructions do not have r-values.
-    */
-   return NULL;
-}
-
-
-ir_rvalue *
-ast_selection_statement::hir(exec_list *instructions,
-			     struct _mesa_glsl_parse_state *state)
-{
-   void *ctx = state;
-
-   ir_rvalue *const condition = this->condition->hir(instructions, state);
-
-   /* From page 66 (page 72 of the PDF) of the GLSL 1.50 spec:
-    *
-    *    "Any expression whose type evaluates to a Boolean can be used as the
-    *    conditional expression bool-expression. Vector types are not accepted
-    *    as the expression to if."
-    *
-    * The checks are separated so that higher quality diagnostics can be
-    * generated for cases where both rules are violated.
-    */
-   if (!condition->type->is_boolean() || !condition->type->is_scalar()) {
-      YYLTYPE loc = this->condition->get_location();
-
-      _mesa_glsl_error(& loc, state, "if-statement condition must be scalar "
-		       "boolean");
-   }
-
-   ir_if *const stmt = new(ctx) ir_if(condition);
-
-   if (then_statement != NULL) {
-      state->symbols->push_scope();
-      then_statement->hir(& stmt->then_instructions, state);
-      state->symbols->pop_scope();
-   }
-
-   if (else_statement != NULL) {
-      state->symbols->push_scope();
-      else_statement->hir(& stmt->else_instructions, state);
-      state->symbols->pop_scope();
-   }
-
-   instructions->push_tail(stmt);
-
-   /* if-statements do not have r-values.
-    */
-   return NULL;
-}
-
-
-void
-ast_iteration_statement::condition_to_hir(ir_loop *stmt,
-					  struct _mesa_glsl_parse_state *state)
-{
-   void *ctx = state;
-
-   if (condition != NULL) {
-      ir_rvalue *const cond =
-	 condition->hir(& stmt->body_instructions, state);
-
-      if ((cond == NULL)
-	  || !cond->type->is_boolean() || !cond->type->is_scalar()) {
-	 YYLTYPE loc = condition->get_location();
-
-	 _mesa_glsl_error(& loc, state,
-			  "loop condition must be scalar boolean");
-      } else {
-	 /* As the first code in the loop body, generate a block that looks
-	  * like 'if (!condition) break;' as the loop termination condition.
-	  */
-	 ir_rvalue *const not_cond =
-	    new(ctx) ir_expression(ir_unop_logic_not, glsl_type::bool_type, cond,
-				   NULL);
-
-	 ir_if *const if_stmt = new(ctx) ir_if(not_cond);
-
-	 ir_jump *const break_stmt =
-	    new(ctx) ir_loop_jump(ir_loop_jump::jump_break);
-
-	 if_stmt->then_instructions.push_tail(break_stmt);
-	 stmt->body_instructions.push_tail(if_stmt);
-      }
-   }
-}
-
-
-ir_rvalue *
-ast_iteration_statement::hir(exec_list *instructions,
-			     struct _mesa_glsl_parse_state *state)
-{
-   void *ctx = state;
-
-   /* For-loops and while-loops start a new scope, but do-while loops do not.
-    */
-   if (mode != ast_do_while)
-      state->symbols->push_scope();
-
-   if (init_statement != NULL)
-      init_statement->hir(instructions, state);
-
-   ir_loop *const stmt = new(ctx) ir_loop();
-   instructions->push_tail(stmt);
-
-   /* Track the current loop and / or switch-statement nesting.
-    */
-   ir_instruction *const nesting = state->loop_or_switch_nesting;
-   ast_iteration_statement *nesting_ast = state->loop_or_switch_nesting_ast;
-
-   state->loop_or_switch_nesting = stmt;
-   state->loop_or_switch_nesting_ast = this;
-
-   if (mode != ast_do_while)
-      condition_to_hir(stmt, state);
-
-   if (body != NULL)
-      body->hir(& stmt->body_instructions, state);
-
-   if (rest_expression != NULL)
-      rest_expression->hir(& stmt->body_instructions, state);
-
-   if (mode == ast_do_while)
-      condition_to_hir(stmt, state);
-
-   if (mode != ast_do_while)
-      state->symbols->pop_scope();
-
-   /* Restore previous nesting before returning.
-    */
-   state->loop_or_switch_nesting = nesting;
-   state->loop_or_switch_nesting_ast = nesting_ast;
-
-   /* Loops do not have r-values.
-    */
-   return NULL;
-}
-
-
-ir_rvalue *
-ast_type_specifier::hir(exec_list *instructions,
-			  struct _mesa_glsl_parse_state *state)
-{
-   if (!this->is_precision_statement && this->structure == NULL)
-      return NULL;
-
-   YYLTYPE loc = this->get_location();
-
-   if (this->precision != ast_precision_none
-       && state->language_version != 100
-       && state->language_version < 130) {
-      _mesa_glsl_error(&loc, state,
-                       "precision qualifiers exist only in "
-                       "GLSL ES 1.00, and GLSL 1.30 and later");
-      return NULL;
-   }
-   if (this->precision != ast_precision_none
-       && this->structure != NULL) {
-      _mesa_glsl_error(&loc, state,
-                       "precision qualifiers do not apply to structures");
-      return NULL;
-   }
-
-   /* If this is a precision statement, check that the type to which it is
-    * applied is either float or int.
-    *
-    * From section 4.5.3 of the GLSL 1.30 spec:
-    *    "The precision statement
-    *       precision precision-qualifier type;
-    *    can be used to establish a default precision qualifier. The type
-    *    field can be either int or float [...].  Any other types or
-    *    qualifiers will result in an error.
-    */
-   if (this->is_precision_statement) {
-      assert(this->precision != ast_precision_none);
-      assert(this->structure == NULL); /* The check for structures was
-                                        * performed above. */
-      if (this->is_array) {
-         _mesa_glsl_error(&loc, state,
-                          "default precision statements do not apply to "
-                          "arrays");
-         return NULL;
-      }
-      if (this->type_specifier != ast_float
-          && this->type_specifier != ast_int) {
-         _mesa_glsl_error(&loc, state,
-                          "default precision statements apply only to types "
-                          "float and int");
-         return NULL;
-      }
-
-      /* FINISHME: Translate precision statements into IR. */
-      return NULL;
-   }
-
-   if (this->structure != NULL)
-      return this->structure->hir(instructions, state);
-
-   return NULL;
-}
-
-
-ir_rvalue *
-ast_struct_specifier::hir(exec_list *instructions,
-			  struct _mesa_glsl_parse_state *state)
-{
-   unsigned decl_count = 0;
-
-   /* Make an initial pass over the list of structure fields to determine how
-    * many there are.  Each element in this list is an ast_declarator_list.
-    * This means that we actually need to count the number of elements in the
-    * 'declarations' list in each of the elements.
-    */
-   foreach_list_typed (ast_declarator_list, decl_list, link,
-		       &this->declarations) {
-      foreach_list_const (decl_ptr, & decl_list->declarations) {
-	 decl_count++;
-      }
-   }
-
-   /* Allocate storage for the structure fields and process the field
-    * declarations.  As the declarations are processed, try to also convert
-    * the types to HIR.  This ensures that structure definitions embedded in
-    * other structure definitions are processed.
-    */
-   glsl_struct_field *const fields = ralloc_array(state, glsl_struct_field,
-						  decl_count);
-
-   unsigned i = 0;
-   foreach_list_typed (ast_declarator_list, decl_list, link,
-		       &this->declarations) {
-      const char *type_name;
-
-      decl_list->type->specifier->hir(instructions, state);
-
-      /* Section 10.9 of the GLSL ES 1.00 specification states that
-       * embedded structure definitions have been removed from the language.
-       */
-      if (state->es_shader && decl_list->type->specifier->structure != NULL) {
-	 YYLTYPE loc = this->get_location();
-	 _mesa_glsl_error(&loc, state, "Embedded structure definitions are "
-			  "not allowed in GLSL ES 1.00.");
-      }
-
-      const glsl_type *decl_type =
-	 decl_list->type->specifier->glsl_type(& type_name, state);
-
-      foreach_list_typed (ast_declaration, decl, link,
-			  &decl_list->declarations) {
-	 const struct glsl_type *field_type = decl_type;
-	 if (decl->is_array) {
-	    YYLTYPE loc = decl->get_location();
-	    field_type = process_array_type(&loc, decl_type, decl->array_size,
-					    state);
-	 }
-	 fields[i].type = (field_type != NULL)
-	    ? field_type : glsl_type::error_type;
-	 fields[i].name = decl->identifier;
-	 i++;
-      }
-   }
-
-   assert(i == decl_count);
-
-   const glsl_type *t =
-      glsl_type::get_record_instance(fields, decl_count, this->name);
-
-   YYLTYPE loc = this->get_location();
-   if (!state->symbols->add_type(name, t)) {
-      _mesa_glsl_error(& loc, state, "struct `%s' previously defined", name);
-   } else {
-      const glsl_type **s = reralloc(state, state->user_structures,
-				     const glsl_type *,
-				     state->num_user_structures + 1);
-      if (s != NULL) {
-	 s[state->num_user_structures] = t;
-	 state->user_structures = s;
-	 state->num_user_structures++;
-      }
-   }
-
-   /* Structure type definitions do not have r-values.
-    */
-   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.

+ */

+

+/**

+ * \file ast_to_hir.c

+ * Convert abstract syntax to to high-level intermediate reprensentation (HIR).

+ *

+ * During the conversion to HIR, the majority of the symantic checking is

+ * preformed on the program.  This includes:

+ *

+ *    * Symbol table management

+ *    * Type checking

+ *    * Function binding

+ *

+ * The majority of this work could be done during parsing, and the parser could

+ * probably generate HIR directly.  However, this results in frequent changes

+ * to the parser code.  Since we do not assume that every system this complier

+ * is built on will have Flex and Bison installed, we have to store the code

+ * generated by these tools in our version control system.  In other parts of

+ * the system we've seen problems where a parser was changed but the generated

+ * code was not committed, merge conflicts where created because two developers

+ * had slightly different versions of Bison installed, etc.

+ *

+ * I have also noticed that running Bison generated parsers in GDB is very

+ * irritating.  When you get a segfault on '$$ = $1->foo', you can't very

+ * well 'print $1' in GDB.

+ *

+ * As a result, my preference is to put as little C code as possible in the

+ * parser (and lexer) sources.

+ */

+

+#include "main/core.h" /* for struct gl_extensions */

+#include "glsl_symbol_table.h"

+#include "glsl_parser_extras.h"

+#include "ast.h"

+#include "glsl_types.h"

+#include "ir.h"

+

+void

+_mesa_ast_to_hir(exec_list *instructions, struct _mesa_glsl_parse_state *state)

+{

+   _mesa_glsl_initialize_variables(instructions, state);

+   _mesa_glsl_initialize_functions(state);

+

+   state->symbols->language_version = state->language_version;

+

+   state->current_function = NULL;

+

+   /* Section 4.2 of the GLSL 1.20 specification states:

+    * "The built-in functions are scoped in a scope outside the global scope

+    *  users declare global variables in.  That is, a shader's global scope,

+    *  available for user-defined functions and global variables, is nested

+    *  inside the scope containing the built-in functions."

+    *

+    * Since built-in functions like ftransform() access built-in variables,

+    * it follows that those must be in the outer scope as well.

+    *

+    * We push scope here to create this nesting effect...but don't pop.

+    * This way, a shader's globals are still in the symbol table for use

+    * by the linker.

+    */

+   state->symbols->push_scope();

+

+   foreach_list_typed (ast_node, ast, link, & state->translation_unit)

+      ast->hir(instructions, state);

+}

+

+

+/**

+ * If a conversion is available, convert one operand to a different type

+ *

+ * The \c from \c ir_rvalue is converted "in place".

+ *

+ * \param to     Type that the operand it to be converted to

+ * \param from   Operand that is being converted

+ * \param state  GLSL compiler state

+ *

+ * \return

+ * If a conversion is possible (or unnecessary), \c true is returned.

+ * Otherwise \c false is returned.

+ */

+bool

+apply_implicit_conversion(const glsl_type *to, ir_rvalue * &from,

+			  struct _mesa_glsl_parse_state *state)

+{

+   void *ctx = state;

+   if (to->base_type == from->type->base_type)

+      return true;

+

+   /* This conversion was added in GLSL 1.20.  If the compilation mode is

+    * GLSL 1.10, the conversion is skipped.

+    */

+   if (state->language_version < 120)

+      return false;

+

+   /* From page 27 (page 33 of the PDF) of the GLSL 1.50 spec:

+    *

+    *    "There are no implicit array or structure conversions. For

+    *    example, an array of int cannot be implicitly converted to an

+    *    array of float. There are no implicit conversions between

+    *    signed and unsigned integers."

+    */

+   /* FINISHME: The above comment is partially a lie.  There is int/uint

+    * FINISHME: conversion for immediate constants.

+    */

+   if (!to->is_float() || !from->type->is_numeric())

+      return false;

+

+   /* Convert to a floating point type with the same number of components

+    * as the original type - i.e. int to float, not int to vec4.

+    */

+   to = glsl_type::get_instance(GLSL_TYPE_FLOAT, from->type->vector_elements,

+			        from->type->matrix_columns);

+

+   switch (from->type->base_type) {

+   case GLSL_TYPE_INT:

+      from = new(ctx) ir_expression(ir_unop_i2f, to, from, NULL);

+      break;

+   case GLSL_TYPE_UINT:

+      from = new(ctx) ir_expression(ir_unop_u2f, to, from, NULL);

+      break;

+   case GLSL_TYPE_BOOL:

+      from = new(ctx) ir_expression(ir_unop_b2f, to, from, NULL);

+      break;

+   default:

+      assert(0);

+   }

+

+   return true;

+}

+

+

+static const struct glsl_type *

+arithmetic_result_type(ir_rvalue * &value_a, ir_rvalue * &value_b,

+		       bool multiply,

+		       struct _mesa_glsl_parse_state *state, YYLTYPE *loc)

+{

+   const glsl_type *type_a = value_a->type;

+   const glsl_type *type_b = value_b->type;

+

+   /* From GLSL 1.50 spec, page 56:

+    *

+    *    "The arithmetic binary operators add (+), subtract (-),

+    *    multiply (*), and divide (/) operate on integer and

+    *    floating-point scalars, vectors, and matrices."

+    */

+   if (!type_a->is_numeric() || !type_b->is_numeric()) {

+      _mesa_glsl_error(loc, state,

+		       "Operands to arithmetic operators must be numeric");

+      return glsl_type::error_type;

+   }

+

+

+   /*    "If one operand is floating-point based and the other is

+    *    not, then the conversions from Section 4.1.10 "Implicit

+    *    Conversions" are applied to the non-floating-point-based operand."

+    */

+   if (!apply_implicit_conversion(type_a, value_b, state)

+       && !apply_implicit_conversion(type_b, value_a, state)) {

+      _mesa_glsl_error(loc, state,

+		       "Could not implicitly convert operands to "

+		       "arithmetic operator");

+      return glsl_type::error_type;

+   }

+   type_a = value_a->type;

+   type_b = value_b->type;

+

+   /*    "If the operands are integer types, they must both be signed or

+    *    both be unsigned."

+    *

+    * From this rule and the preceeding conversion it can be inferred that

+    * both types must be GLSL_TYPE_FLOAT, or GLSL_TYPE_UINT, or GLSL_TYPE_INT.

+    * The is_numeric check above already filtered out the case where either

+    * type is not one of these, so now the base types need only be tested for

+    * equality.

+    */

+   if (type_a->base_type != type_b->base_type) {

+      _mesa_glsl_error(loc, state,

+		       "base type mismatch for arithmetic operator");

+      return glsl_type::error_type;

+   }

+

+   /*    "All arithmetic binary operators result in the same fundamental type

+    *    (signed integer, unsigned integer, or floating-point) as the

+    *    operands they operate on, after operand type conversion. After

+    *    conversion, the following cases are valid

+    *

+    *    * The two operands are scalars. In this case the operation is

+    *      applied, resulting in a scalar."

+    */

+   if (type_a->is_scalar() && type_b->is_scalar())

+      return type_a;

+

+   /*   "* One operand is a scalar, and the other is a vector or matrix.

+    *      In this case, the scalar operation is applied independently to each

+    *      component of the vector or matrix, resulting in the same size

+    *      vector or matrix."

+    */

+   if (type_a->is_scalar()) {

+      if (!type_b->is_scalar())

+	 return type_b;

+   } else if (type_b->is_scalar()) {

+      return type_a;

+   }

+

+   /* All of the combinations of <scalar, scalar>, <vector, scalar>,

+    * <scalar, vector>, <scalar, matrix>, and <matrix, scalar> have been

+    * handled.

+    */

+   assert(!type_a->is_scalar());

+   assert(!type_b->is_scalar());

+

+   /*   "* The two operands are vectors of the same size. In this case, the

+    *      operation is done component-wise resulting in the same size

+    *      vector."

+    */

+   if (type_a->is_vector() && type_b->is_vector()) {

+      if (type_a == type_b) {

+	 return type_a;

+      } else {

+	 _mesa_glsl_error(loc, state,

+			  "vector size mismatch for arithmetic operator");

+	 return glsl_type::error_type;

+      }

+   }

+

+   /* All of the combinations of <scalar, scalar>, <vector, scalar>,

+    * <scalar, vector>, <scalar, matrix>, <matrix, scalar>, and

+    * <vector, vector> have been handled.  At least one of the operands must

+    * be matrix.  Further, since there are no integer matrix types, the base

+    * type of both operands must be float.

+    */

+   assert(type_a->is_matrix() || type_b->is_matrix());

+   assert(type_a->base_type == GLSL_TYPE_FLOAT);

+   assert(type_b->base_type == GLSL_TYPE_FLOAT);

+

+   /*   "* The operator is add (+), subtract (-), or divide (/), and the

+    *      operands are matrices with the same number of rows and the same

+    *      number of columns. In this case, the operation is done component-

+    *      wise resulting in the same size matrix."

+    *    * The operator is multiply (*), where both operands are matrices or

+    *      one operand is a vector and the other a matrix. A right vector

+    *      operand is treated as a column vector and a left vector operand as a

+    *      row vector. In all these cases, it is required that the number of

+    *      columns of the left operand is equal to the number of rows of the

+    *      right operand. Then, the multiply (*) operation does a linear

+    *      algebraic multiply, yielding an object that has the same number of

+    *      rows as the left operand and the same number of columns as the right

+    *      operand. Section 5.10 "Vector and Matrix Operations" explains in

+    *      more detail how vectors and matrices are operated on."

+    */

+   if (! multiply) {

+      if (type_a == type_b)

+	 return type_a;

+   } else {

+      if (type_a->is_matrix() && type_b->is_matrix()) {

+	 /* Matrix multiply.  The columns of A must match the rows of B.  Given

+	  * the other previously tested constraints, this means the vector type

+	  * of a row from A must be the same as the vector type of a column from

+	  * B.

+	  */

+	 if (type_a->row_type() == type_b->column_type()) {

+	    /* The resulting matrix has the number of columns of matrix B and

+	     * the number of rows of matrix A.  We get the row count of A by

+	     * looking at the size of a vector that makes up a column.  The

+	     * transpose (size of a row) is done for B.

+	     */

+	    const glsl_type *const type =

+	       glsl_type::get_instance(type_a->base_type,

+				       type_a->column_type()->vector_elements,

+				       type_b->row_type()->vector_elements);

+	    assert(type != glsl_type::error_type);

+

+	    return type;

+	 }

+      } else if (type_a->is_matrix()) {

+	 /* A is a matrix and B is a column vector.  Columns of A must match

+	  * rows of B.  Given the other previously tested constraints, this

+	  * means the vector type of a row from A must be the same as the

+	  * vector the type of B.

+	  */

+	 if (type_a->row_type() == type_b) {

+	    /* The resulting vector has a number of elements equal to

+	     * the number of rows of matrix A. */

+	    const glsl_type *const type =

+	       glsl_type::get_instance(type_a->base_type,

+				       type_a->column_type()->vector_elements,

+				       1);

+	    assert(type != glsl_type::error_type);

+

+	    return type;

+	 }

+      } else {

+	 assert(type_b->is_matrix());

+

+	 /* A is a row vector and B is a matrix.  Columns of A must match rows

+	  * of B.  Given the other previously tested constraints, this means

+	  * the type of A must be the same as the vector type of a column from

+	  * B.

+	  */

+	 if (type_a == type_b->column_type()) {

+	    /* The resulting vector has a number of elements equal to

+	     * the number of columns of matrix B. */

+	    const glsl_type *const type =

+	       glsl_type::get_instance(type_a->base_type,

+				       type_b->row_type()->vector_elements,

+				       1);

+	    assert(type != glsl_type::error_type);

+

+	    return type;

+	 }

+      }

+

+      _mesa_glsl_error(loc, state, "size mismatch for matrix multiplication");

+      return glsl_type::error_type;

+   }

+

+

+   /*    "All other cases are illegal."

+    */

+   _mesa_glsl_error(loc, state, "type mismatch");

+   return glsl_type::error_type;

+}

+

+

+static const struct glsl_type *

+unary_arithmetic_result_type(const struct glsl_type *type,

+			     struct _mesa_glsl_parse_state *state, YYLTYPE *loc)

+{

+   /* From GLSL 1.50 spec, page 57:

+    *

+    *    "The arithmetic unary operators negate (-), post- and pre-increment

+    *     and decrement (-- and ++) operate on integer or floating-point

+    *     values (including vectors and matrices). All unary operators work

+    *     component-wise on their operands. These result with the same type

+    *     they operated on."

+    */

+   if (!type->is_numeric()) {

+      _mesa_glsl_error(loc, state,

+		       "Operands to arithmetic operators must be numeric");

+      return glsl_type::error_type;

+   }

+

+   return type;

+}

+

+/**

+ * \brief Return the result type of a bit-logic operation.

+ *

+ * If the given types to the bit-logic operator are invalid, return

+ * glsl_type::error_type.

+ *

+ * \param type_a Type of LHS of bit-logic op

+ * \param type_b Type of RHS of bit-logic op

+ */

+static const struct glsl_type *

+bit_logic_result_type(const struct glsl_type *type_a,

+                      const struct glsl_type *type_b,

+                      ast_operators op,

+                      struct _mesa_glsl_parse_state *state, YYLTYPE *loc)

+{

+    if (state->language_version < 130) {

+       _mesa_glsl_error(loc, state, "bit operations require GLSL 1.30");

+       return glsl_type::error_type;

+    }

+

+    /* From page 50 (page 56 of PDF) of GLSL 1.30 spec:

+     *

+     *     "The bitwise operators and (&), exclusive-or (^), and inclusive-or

+     *     (|). The operands must be of type signed or unsigned integers or

+     *     integer vectors."

+     */

+    if (!type_a->is_integer()) {

+       _mesa_glsl_error(loc, state, "LHS of `%s' must be an integer",

+                         ast_expression::operator_string(op));

+       return glsl_type::error_type;

+    }

+    if (!type_b->is_integer()) {

+       _mesa_glsl_error(loc, state, "RHS of `%s' must be an integer",

+                        ast_expression::operator_string(op));

+       return glsl_type::error_type;

+    }

+

+    /*     "The fundamental types of the operands (signed or unsigned) must

+     *     match,"

+     */

+    if (type_a->base_type != type_b->base_type) {

+       _mesa_glsl_error(loc, state, "operands of `%s' must have the same "

+                        "base type", ast_expression::operator_string(op));

+       return glsl_type::error_type;

+    }

+

+    /*     "The operands cannot be vectors of differing size." */

+    if (type_a->is_vector() &&

+        type_b->is_vector() &&

+        type_a->vector_elements != type_b->vector_elements) {

+       _mesa_glsl_error(loc, state, "operands of `%s' cannot be vectors of "

+                        "different sizes", ast_expression::operator_string(op));

+       return glsl_type::error_type;

+    }

+

+    /*     "If one operand is a scalar and the other a vector, the scalar is

+     *     applied component-wise to the vector, resulting in the same type as

+     *     the vector. The fundamental types of the operands [...] will be the

+     *     resulting fundamental type."

+     */

+    if (type_a->is_scalar())

+        return type_b;

+    else

+        return type_a;

+}

+

+static const struct glsl_type *

+modulus_result_type(const struct glsl_type *type_a,

+		    const struct glsl_type *type_b,

+		    struct _mesa_glsl_parse_state *state, YYLTYPE *loc)

+{

+   if (state->language_version < 130) {

+      _mesa_glsl_error(loc, state,

+                       "operator '%%' is reserved in %s",

+                       state->version_string);

+      return glsl_type::error_type;

+   }

+

+   /* From GLSL 1.50 spec, page 56:

+    *    "The operator modulus (%) operates on signed or unsigned integers or

+    *    integer vectors. The operand types must both be signed or both be

+    *    unsigned."

+    */

+   if (!type_a->is_integer() || !type_b->is_integer()

+       || (type_a->base_type != type_b->base_type)) {

+      _mesa_glsl_error(loc, state, "type mismatch");

+      return glsl_type::error_type;

+   }

+

+   /*    "The operands cannot be vectors of differing size. If one operand is

+    *    a scalar and the other vector, then the scalar is applied component-

+    *    wise to the vector, resulting in the same type as the vector. If both

+    *    are vectors of the same size, the result is computed component-wise."

+    */

+   if (type_a->is_vector()) {

+      if (!type_b->is_vector()

+	  || (type_a->vector_elements == type_b->vector_elements))

+	 return type_a;

+   } else

+      return type_b;

+

+   /*    "The operator modulus (%) is not defined for any other data types

+    *    (non-integer types)."

+    */

+   _mesa_glsl_error(loc, state, "type mismatch");

+   return glsl_type::error_type;

+}

+

+

+static const struct glsl_type *

+relational_result_type(ir_rvalue * &value_a, ir_rvalue * &value_b,

+		       struct _mesa_glsl_parse_state *state, YYLTYPE *loc)

+{

+   const glsl_type *type_a = value_a->type;

+   const glsl_type *type_b = value_b->type;

+

+   /* From GLSL 1.50 spec, page 56:

+    *    "The relational operators greater than (>), less than (<), greater

+    *    than or equal (>=), and less than or equal (<=) operate only on

+    *    scalar integer and scalar floating-point expressions."

+    */

+   if (!type_a->is_numeric()

+       || !type_b->is_numeric()

+       || !type_a->is_scalar()

+       || !type_b->is_scalar()) {

+      _mesa_glsl_error(loc, state,

+		       "Operands to relational operators must be scalar and "

+		       "numeric");

+      return glsl_type::error_type;

+   }

+

+   /*    "Either the operands' types must match, or the conversions from

+    *    Section 4.1.10 "Implicit Conversions" will be applied to the integer

+    *    operand, after which the types must match."

+    */

+   if (!apply_implicit_conversion(type_a, value_b, state)

+       && !apply_implicit_conversion(type_b, value_a, state)) {

+      _mesa_glsl_error(loc, state,

+		       "Could not implicitly convert operands to "

+		       "relational operator");

+      return glsl_type::error_type;

+   }

+   type_a = value_a->type;

+   type_b = value_b->type;

+

+   if (type_a->base_type != type_b->base_type) {

+      _mesa_glsl_error(loc, state, "base type mismatch");

+      return glsl_type::error_type;

+   }

+

+   /*    "The result is scalar Boolean."

+    */

+   return glsl_type::bool_type;

+}

+

+/**

+ * \brief Return the result type of a bit-shift operation.

+ *

+ * If the given types to the bit-shift operator are invalid, return

+ * glsl_type::error_type.

+ *

+ * \param type_a Type of LHS of bit-shift op

+ * \param type_b Type of RHS of bit-shift op

+ */

+static const struct glsl_type *

+shift_result_type(const struct glsl_type *type_a,

+                  const struct glsl_type *type_b,

+                  ast_operators op,

+                  struct _mesa_glsl_parse_state *state, YYLTYPE *loc)

+{

+   if (state->language_version < 130) {

+      _mesa_glsl_error(loc, state, "bit operations require GLSL 1.30");

+      return glsl_type::error_type;

+   }

+

+   /* From page 50 (page 56 of the PDF) of the GLSL 1.30 spec:

+    *

+    *     "The shift operators (<<) and (>>). For both operators, the operands

+    *     must be signed or unsigned integers or integer vectors. One operand

+    *     can be signed while the other is unsigned."

+    */

+   if (!type_a->is_integer()) {

+      _mesa_glsl_error(loc, state, "LHS of operator %s must be an integer or "

+              "integer vector", ast_expression::operator_string(op));

+     return glsl_type::error_type;

+

+   }

+   if (!type_b->is_integer()) {

+      _mesa_glsl_error(loc, state, "RHS of operator %s must be an integer or "

+              "integer vector", ast_expression::operator_string(op));

+     return glsl_type::error_type;

+   }

+

+   /*     "If the first operand is a scalar, the second operand has to be

+    *     a scalar as well."

+    */

+   if (type_a->is_scalar() && !type_b->is_scalar()) {

+      _mesa_glsl_error(loc, state, "If the first operand of %s is scalar, the "

+              "second must be scalar as well",

+              ast_expression::operator_string(op));

+     return glsl_type::error_type;

+   }

+

+   /* If both operands are vectors, check that they have same number of

+    * elements.

+    */

+   if (type_a->is_vector() &&

+      type_b->is_vector() &&

+      type_a->vector_elements != type_b->vector_elements) {

+      _mesa_glsl_error(loc, state, "Vector operands to operator %s must "

+              "have same number of elements",

+              ast_expression::operator_string(op));

+     return glsl_type::error_type;

+   }

+

+   /*     "In all cases, the resulting type will be the same type as the left

+    *     operand."

+    */

+   return type_a;

+}

+

+/**

+ * Validates that a value can be assigned to a location with a specified type

+ *

+ * Validates that \c rhs can be assigned to some location.  If the types are

+ * not an exact match but an automatic conversion is possible, \c rhs will be

+ * converted.

+ *

+ * \return

+ * \c NULL if \c rhs cannot be assigned to a location with type \c lhs_type.

+ * Otherwise the actual RHS to be assigned will be returned.  This may be

+ * \c rhs, or it may be \c rhs after some type conversion.

+ *

+ * \note

+ * In addition to being used for assignments, this function is used to

+ * type-check return values.

+ */

+ir_rvalue *

+validate_assignment(struct _mesa_glsl_parse_state *state,

+		    const glsl_type *lhs_type, ir_rvalue *rhs)

+{

+   /* If there is already some error in the RHS, just return it.  Anything

+    * else will lead to an avalanche of error message back to the user.

+    */

+   if (rhs->type->is_error())

+      return rhs;

+

+   /* If the types are identical, the assignment can trivially proceed.

+    */

+   if (rhs->type == lhs_type)

+      return rhs;

+

+   /* If the array element types are the same and the size of the LHS is zero,

+    * the assignment is okay.

+    *

+    * Note: Whole-array assignments are not permitted in GLSL 1.10, but this

+    * is handled by ir_dereference::is_lvalue.

+    */

+   if (lhs_type->is_array() && rhs->type->is_array()

+       && (lhs_type->element_type() == rhs->type->element_type())

+       && (lhs_type->array_size() == 0)) {

+      return rhs;

+   }

+

+   /* Check for implicit conversion in GLSL 1.20 */

+   if (apply_implicit_conversion(lhs_type, rhs, state)) {

+      if (rhs->type == lhs_type)

+	 return rhs;

+   }

+

+   return NULL;

+}

+

+ir_rvalue *

+do_assignment(exec_list *instructions, struct _mesa_glsl_parse_state *state,

+	      ir_rvalue *lhs, ir_rvalue *rhs,

+	      YYLTYPE lhs_loc)

+{

+   void *ctx = state;

+   bool error_emitted = (lhs->type->is_error() || rhs->type->is_error());

+

+   if (!error_emitted) {

+      if (lhs->variable_referenced() != NULL

+          && lhs->variable_referenced()->read_only) {

+         _mesa_glsl_error(&lhs_loc, state,

+                          "assignment to read-only variable '%s'",

+                          lhs->variable_referenced()->name);

+         error_emitted = true;

+

+      } else if (!lhs->is_lvalue()) {

+	 _mesa_glsl_error(& lhs_loc, state, "non-lvalue in assignment");

+	 error_emitted = true;

+      }

+

+      if (state->es_shader && lhs->type->is_array()) {

+	 _mesa_glsl_error(&lhs_loc, state, "whole array assignment is not "

+			  "allowed in GLSL ES 1.00.");

+	 error_emitted = true;

+      }

+   }

+

+   ir_rvalue *new_rhs = validate_assignment(state, lhs->type, rhs);

+   if (new_rhs == NULL) {

+      _mesa_glsl_error(& lhs_loc, state, "type mismatch");

+   } else {

+      rhs = new_rhs;

+

+      /* If the LHS array was not declared with a size, it takes it size from

+       * the RHS.  If the LHS is an l-value and a whole array, it must be a

+       * dereference of a variable.  Any other case would require that the LHS

+       * is either not an l-value or not a whole array.

+       */

+      if (lhs->type->array_size() == 0) {

+	 ir_dereference *const d = lhs->as_dereference();

+

+	 assert(d != NULL);

+

+	 ir_variable *const var = d->variable_referenced();

+

+	 assert(var != NULL);

+

+	 if (var->max_array_access >= unsigned(rhs->type->array_size())) {

+	    /* FINISHME: This should actually log the location of the RHS. */

+	    _mesa_glsl_error(& lhs_loc, state, "array size must be > %u due to "

+			     "previous access",

+			     var->max_array_access);

+	 }

+

+	 var->type = glsl_type::get_array_instance(lhs->type->element_type(),

+						   rhs->type->array_size());

+	 d->type = var->type;

+      }

+   }

+

+   /* Most callers of do_assignment (assign, add_assign, pre_inc/dec,

+    * but not post_inc) need the converted assigned value as an rvalue

+    * to handle things like:

+    *

+    * i = j += 1;

+    *

+    * So we always just store the computed value being assigned to a

+    * temporary and return a deref of that temporary.  If the rvalue

+    * ends up not being used, the temp will get copy-propagated out.

+    */

+   ir_variable *var = new(ctx) ir_variable(rhs->type, "assignment_tmp",

+					   ir_var_temporary);

+   ir_dereference_variable *deref_var = new(ctx) ir_dereference_variable(var);

+   instructions->push_tail(var);

+   instructions->push_tail(new(ctx) ir_assignment(deref_var,

+						  rhs,

+						  NULL));

+   deref_var = new(ctx) ir_dereference_variable(var);

+

+   if (!error_emitted)

+      instructions->push_tail(new(ctx) ir_assignment(lhs, deref_var, NULL));

+

+   return new(ctx) ir_dereference_variable(var);

+}

+

+static ir_rvalue *

+get_lvalue_copy(exec_list *instructions, ir_rvalue *lvalue)

+{

+   void *ctx = ralloc_parent(lvalue);

+   ir_variable *var;

+

+   var = new(ctx) ir_variable(lvalue->type, "_post_incdec_tmp",

+			      ir_var_temporary);

+   instructions->push_tail(var);

+   var->mode = ir_var_auto;

+

+   instructions->push_tail(new(ctx) ir_assignment(new(ctx) ir_dereference_variable(var),

+						  lvalue, NULL));

+

+   /* Once we've created this temporary, mark it read only so it's no

+    * longer considered an lvalue.

+    */

+   var->read_only = true;

+

+   return new(ctx) ir_dereference_variable(var);

+}

+

+

+ir_rvalue *

+ast_node::hir(exec_list *instructions,

+	      struct _mesa_glsl_parse_state *state)

+{

+   (void) instructions;

+   (void) state;

+

+   return NULL;

+}

+

+static void

+mark_whole_array_access(ir_rvalue *access)

+{

+   ir_dereference_variable *deref = access->as_dereference_variable();

+

+   if (deref) {

+      deref->var->max_array_access = deref->type->length - 1;

+   }

+}

+

+static ir_rvalue *

+do_comparison(void *mem_ctx, int operation, ir_rvalue *op0, ir_rvalue *op1)

+{

+   int join_op;

+   ir_rvalue *cmp = NULL;

+

+   if (operation == ir_binop_all_equal)

+      join_op = ir_binop_logic_and;

+   else

+      join_op = ir_binop_logic_or;

+

+   switch (op0->type->base_type) {

+   case GLSL_TYPE_FLOAT:

+   case GLSL_TYPE_UINT:

+   case GLSL_TYPE_INT:

+   case GLSL_TYPE_BOOL:

+      return new(mem_ctx) ir_expression(operation, op0, op1);

+

+   case GLSL_TYPE_ARRAY: {

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

+	 ir_rvalue *e0, *e1, *result;

+

+	 e0 = new(mem_ctx) ir_dereference_array(op0->clone(mem_ctx, NULL),

+						new(mem_ctx) ir_constant(i));

+	 e1 = new(mem_ctx) ir_dereference_array(op1->clone(mem_ctx, NULL),

+						new(mem_ctx) ir_constant(i));

+	 result = do_comparison(mem_ctx, operation, e0, e1);

+

+	 if (cmp) {

+	    cmp = new(mem_ctx) ir_expression(join_op, cmp, result);

+	 } else {

+	    cmp = result;

+	 }

+      }

+

+      mark_whole_array_access(op0);

+      mark_whole_array_access(op1);

+      break;

+   }

+

+   case GLSL_TYPE_STRUCT: {

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

+	 ir_rvalue *e0, *e1, *result;

+	 const char *field_name = op0->type->fields.structure[i].name;

+

+	 e0 = new(mem_ctx) ir_dereference_record(op0->clone(mem_ctx, NULL),

+						 field_name);

+	 e1 = new(mem_ctx) ir_dereference_record(op1->clone(mem_ctx, NULL),

+						 field_name);

+	 result = do_comparison(mem_ctx, operation, e0, e1);

+

+	 if (cmp) {

+	    cmp = new(mem_ctx) ir_expression(join_op, cmp, result);

+	 } else {

+	    cmp = result;

+	 }

+      }

+      break;

+   }

+

+   case GLSL_TYPE_ERROR:

+   case GLSL_TYPE_VOID:

+   case GLSL_TYPE_SAMPLER:

+      /* I assume a comparison of a struct containing a sampler just

+       * ignores the sampler present in the type.

+       */

+      break;

+

+   default:

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

+      break;

+   }

+

+   if (cmp == NULL)

+      cmp = new(mem_ctx) ir_constant(true);

+

+   return cmp;

+}

+

+ir_rvalue *

+ast_expression::hir(exec_list *instructions,

+		    struct _mesa_glsl_parse_state *state)

+{

+   void *ctx = state;

+   static const int operations[AST_NUM_OPERATORS] = {

+      -1,               /* ast_assign doesn't convert to ir_expression. */

+      -1,               /* ast_plus doesn't convert to ir_expression. */

+      ir_unop_neg,

+      ir_binop_add,

+      ir_binop_sub,

+      ir_binop_mul,

+      ir_binop_div,

+      ir_binop_mod,

+      ir_binop_lshift,

+      ir_binop_rshift,

+      ir_binop_less,

+      ir_binop_greater,

+      ir_binop_lequal,

+      ir_binop_gequal,

+      ir_binop_all_equal,

+      ir_binop_any_nequal,

+      ir_binop_bit_and,

+      ir_binop_bit_xor,

+      ir_binop_bit_or,

+      ir_unop_bit_not,

+      ir_binop_logic_and,

+      ir_binop_logic_xor,

+      ir_binop_logic_or,

+      ir_unop_logic_not,

+

+      /* Note: The following block of expression types actually convert

+       * to multiple IR instructions.

+       */

+      ir_binop_mul,     /* ast_mul_assign */

+      ir_binop_div,     /* ast_div_assign */

+      ir_binop_mod,     /* ast_mod_assign */

+      ir_binop_add,     /* ast_add_assign */

+      ir_binop_sub,     /* ast_sub_assign */

+      ir_binop_lshift,  /* ast_ls_assign */

+      ir_binop_rshift,  /* ast_rs_assign */

+      ir_binop_bit_and, /* ast_and_assign */

+      ir_binop_bit_xor, /* ast_xor_assign */

+      ir_binop_bit_or,  /* ast_or_assign */

+

+      -1,               /* ast_conditional doesn't convert to ir_expression. */

+      ir_binop_add,     /* ast_pre_inc. */

+      ir_binop_sub,     /* ast_pre_dec. */

+      ir_binop_add,     /* ast_post_inc. */

+      ir_binop_sub,     /* ast_post_dec. */

+      -1,               /* ast_field_selection doesn't conv to ir_expression. */

+      -1,               /* ast_array_index doesn't convert to ir_expression. */

+      -1,               /* ast_function_call doesn't conv to ir_expression. */

+      -1,               /* ast_identifier doesn't convert to ir_expression. */

+      -1,               /* ast_int_constant doesn't convert to ir_expression. */

+      -1,               /* ast_uint_constant doesn't conv to ir_expression. */

+      -1,               /* ast_float_constant doesn't conv to ir_expression. */

+      -1,               /* ast_bool_constant doesn't conv to ir_expression. */

+      -1,               /* ast_sequence doesn't convert to ir_expression. */

+   };

+   ir_rvalue *result = NULL;

+   ir_rvalue *op[3];

+   const struct glsl_type *type = glsl_type::error_type;

+   bool error_emitted = false;

+   YYLTYPE loc;

+

+   loc = this->get_location();

+

+   switch (this->oper) {

+   case ast_assign: {

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

+      op[1] = this->subexpressions[1]->hir(instructions, state);

+

+      result = do_assignment(instructions, state, op[0], op[1],

+			     this->subexpressions[0]->get_location());

+      error_emitted = result->type->is_error();

+      type = result->type;

+      break;

+   }

+

+   case ast_plus:

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

+

+      type = unary_arithmetic_result_type(op[0]->type, state, & loc);

+

+      error_emitted = type->is_error();

+

+      result = op[0];

+      break;

+

+   case ast_neg:

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

+

+      type = unary_arithmetic_result_type(op[0]->type, state, & loc);

+

+      error_emitted = type->is_error();

+

+      result = new(ctx) ir_expression(operations[this->oper], type,

+				      op[0], NULL);

+      break;

+

+   case ast_add:

+   case ast_sub:

+   case ast_mul:

+   case ast_div:

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

+      op[1] = this->subexpressions[1]->hir(instructions, state);

+

+      type = arithmetic_result_type(op[0], op[1],

+				    (this->oper == ast_mul),

+				    state, & loc);

+      error_emitted = type->is_error();

+

+      result = new(ctx) ir_expression(operations[this->oper], type,

+				      op[0], op[1]);

+      break;

+

+   case ast_mod:

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

+      op[1] = this->subexpressions[1]->hir(instructions, state);

+

+      type = modulus_result_type(op[0]->type, op[1]->type, state, & loc);

+

+      assert(operations[this->oper] == ir_binop_mod);

+

+      result = new(ctx) ir_expression(operations[this->oper], type,

+				      op[0], op[1]);

+      error_emitted = type->is_error();

+      break;

+

+   case ast_lshift:

+   case ast_rshift:

+       if (state->language_version < 130) {

+          _mesa_glsl_error(&loc, state, "operator %s requires GLSL 1.30",

+              operator_string(this->oper));

+          error_emitted = true;

+       }

+

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

+       op[1] = this->subexpressions[1]->hir(instructions, state);

+       type = shift_result_type(op[0]->type, op[1]->type, this->oper, state,

+                                &loc);

+       result = new(ctx) ir_expression(operations[this->oper], type,

+                                       op[0], op[1]);

+       error_emitted = op[0]->type->is_error() || op[1]->type->is_error();

+       break;

+

+   case ast_less:

+   case ast_greater:

+   case ast_lequal:

+   case ast_gequal:

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

+      op[1] = this->subexpressions[1]->hir(instructions, state);

+

+      type = relational_result_type(op[0], op[1], state, & loc);

+

+      /* The relational operators must either generate an error or result

+       * in a scalar boolean.  See page 57 of the GLSL 1.50 spec.

+       */

+      assert(type->is_error()

+	     || ((type->base_type == GLSL_TYPE_BOOL)

+		 && type->is_scalar()));

+

+      result = new(ctx) ir_expression(operations[this->oper], type,

+				      op[0], op[1]);

+      error_emitted = type->is_error();

+      break;

+

+   case ast_nequal:

+   case ast_equal:

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

+      op[1] = this->subexpressions[1]->hir(instructions, state);

+

+      /* From page 58 (page 64 of the PDF) of the GLSL 1.50 spec:

+       *

+       *    "The equality operators equal (==), and not equal (!=)

+       *    operate on all types. They result in a scalar Boolean. If

+       *    the operand types do not match, then there must be a

+       *    conversion from Section 4.1.10 "Implicit Conversions"

+       *    applied to one operand that can make them match, in which

+       *    case this conversion is done."

+       */

+      if ((!apply_implicit_conversion(op[0]->type, op[1], state)

+	   && !apply_implicit_conversion(op[1]->type, op[0], state))

+	  || (op[0]->type != op[1]->type)) {

+	 _mesa_glsl_error(& loc, state, "operands of `%s' must have the same "

+			  "type", (this->oper == ast_equal) ? "==" : "!=");

+	 error_emitted = true;

+      } else if ((state->language_version <= 110)

+		 && (op[0]->type->is_array() || op[1]->type->is_array())) {

+	 _mesa_glsl_error(& loc, state, "array comparisons forbidden in "

+			  "GLSL 1.10");

+	 error_emitted = true;

+      }

+

+      result = do_comparison(ctx, operations[this->oper], op[0], op[1]);

+      type = glsl_type::bool_type;

+

+      assert(error_emitted || (result->type == glsl_type::bool_type));

+      break;

+

+   case ast_bit_and:

+   case ast_bit_xor:

+   case ast_bit_or:

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

+      op[1] = this->subexpressions[1]->hir(instructions, state);

+      type = bit_logic_result_type(op[0]->type, op[1]->type, this->oper,

+                                   state, &loc);

+      result = new(ctx) ir_expression(operations[this->oper], type,

+				      op[0], op[1]);

+      error_emitted = op[0]->type->is_error() || op[1]->type->is_error();

+      break;

+

+   case ast_bit_not:

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

+

+      if (state->language_version < 130) {

+	 _mesa_glsl_error(&loc, state, "bit-wise operations require GLSL 1.30");

+	 error_emitted = true;

+      }

+

+      if (!op[0]->type->is_integer()) {

+	 _mesa_glsl_error(&loc, state, "operand of `~' must be an integer");

+	 error_emitted = true;

+      }

+

+      type = op[0]->type;

+      result = new(ctx) ir_expression(ir_unop_bit_not, type, op[0], NULL);

+      break;

+

+   case ast_logic_and: {

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

+

+      if (!op[0]->type->is_boolean() || !op[0]->type->is_scalar()) {

+	 YYLTYPE loc = this->subexpressions[0]->get_location();

+

+	 _mesa_glsl_error(& loc, state, "LHS of `%s' must be scalar boolean",

+			  operator_string(this->oper));

+	 error_emitted = true;

+      }

+

+      ir_constant *op0_const = op[0]->constant_expression_value();

+      if (op0_const) {

+	 if (op0_const->value.b[0]) {

+	    op[1] = this->subexpressions[1]->hir(instructions, state);

+

+	    if (!op[1]->type->is_boolean() || !op[1]->type->is_scalar()) {

+	       YYLTYPE loc = this->subexpressions[1]->get_location();

+

+	       _mesa_glsl_error(& loc, state,

+				"RHS of `%s' must be scalar boolean",

+				operator_string(this->oper));

+	       error_emitted = true;

+	    }

+	    result = op[1];

+	 } else {

+	    result = op0_const;

+	 }

+	 type = glsl_type::bool_type;

+      } else {

+	 ir_variable *const tmp = new(ctx) ir_variable(glsl_type::bool_type,

+						       "and_tmp",

+						       ir_var_temporary);

+	 instructions->push_tail(tmp);

+

+	 ir_if *const stmt = new(ctx) ir_if(op[0]);

+	 instructions->push_tail(stmt);

+

+	 op[1] = this->subexpressions[1]->hir(&stmt->then_instructions, state);

+

+	 if (!op[1]->type->is_boolean() || !op[1]->type->is_scalar()) {

+	    YYLTYPE loc = this->subexpressions[1]->get_location();

+

+	    _mesa_glsl_error(& loc, state,

+			     "RHS of `%s' must be scalar boolean",

+			     operator_string(this->oper));

+	    error_emitted = true;

+	 }

+

+	 ir_dereference *const then_deref = new(ctx) ir_dereference_variable(tmp);

+	 ir_assignment *const then_assign =

+	    new(ctx) ir_assignment(then_deref, op[1], NULL);

+	 stmt->then_instructions.push_tail(then_assign);

+

+	 ir_dereference *const else_deref = new(ctx) ir_dereference_variable(tmp);

+	 ir_assignment *const else_assign =

+	    new(ctx) ir_assignment(else_deref, new(ctx) ir_constant(false), NULL);

+	 stmt->else_instructions.push_tail(else_assign);

+

+	 result = new(ctx) ir_dereference_variable(tmp);

+	 type = tmp->type;

+      }

+      break;

+   }

+

+   case ast_logic_or: {

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

+

+      if (!op[0]->type->is_boolean() || !op[0]->type->is_scalar()) {

+	 YYLTYPE loc = this->subexpressions[0]->get_location();

+

+	 _mesa_glsl_error(& loc, state, "LHS of `%s' must be scalar boolean",

+			  operator_string(this->oper));

+	 error_emitted = true;

+      }

+

+      ir_constant *op0_const = op[0]->constant_expression_value();

+      if (op0_const) {

+	 if (op0_const->value.b[0]) {

+	    result = op0_const;

+	 } else {

+	    op[1] = this->subexpressions[1]->hir(instructions, state);

+

+	    if (!op[1]->type->is_boolean() || !op[1]->type->is_scalar()) {

+	       YYLTYPE loc = this->subexpressions[1]->get_location();

+

+	       _mesa_glsl_error(& loc, state,

+				"RHS of `%s' must be scalar boolean",

+				operator_string(this->oper));

+	       error_emitted = true;

+	    }

+	    result = op[1];

+	 }

+	 type = glsl_type::bool_type;

+      } else {

+	 ir_variable *const tmp = new(ctx) ir_variable(glsl_type::bool_type,

+						       "or_tmp",

+						       ir_var_temporary);

+	 instructions->push_tail(tmp);

+

+	 ir_if *const stmt = new(ctx) ir_if(op[0]);

+	 instructions->push_tail(stmt);

+

+	 op[1] = this->subexpressions[1]->hir(&stmt->else_instructions, state);

+

+	 if (!op[1]->type->is_boolean() || !op[1]->type->is_scalar()) {

+	    YYLTYPE loc = this->subexpressions[1]->get_location();

+

+	    _mesa_glsl_error(& loc, state, "RHS of `%s' must be scalar boolean",

+			     operator_string(this->oper));

+	    error_emitted = true;

+	 }

+

+	 ir_dereference *const then_deref = new(ctx) ir_dereference_variable(tmp);

+	 ir_assignment *const then_assign =

+	    new(ctx) ir_assignment(then_deref, new(ctx) ir_constant(true), NULL);

+	 stmt->then_instructions.push_tail(then_assign);

+

+	 ir_dereference *const else_deref = new(ctx) ir_dereference_variable(tmp);

+	 ir_assignment *const else_assign =

+	    new(ctx) ir_assignment(else_deref, op[1], NULL);

+	 stmt->else_instructions.push_tail(else_assign);

+

+	 result = new(ctx) ir_dereference_variable(tmp);

+	 type = tmp->type;

+      }

+      break;

+   }

+

+   case ast_logic_xor:

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

+      op[1] = this->subexpressions[1]->hir(instructions, state);

+

+

+      result = new(ctx) ir_expression(operations[this->oper], glsl_type::bool_type,

+				      op[0], op[1]);

+      type = glsl_type::bool_type;

+      break;

+

+   case ast_logic_not:

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

+

+      if (!op[0]->type->is_boolean() || !op[0]->type->is_scalar()) {

+	 YYLTYPE loc = this->subexpressions[0]->get_location();

+

+	 _mesa_glsl_error(& loc, state,

+			  "operand of `!' must be scalar boolean");

+	 error_emitted = true;

+      }

+

+      result = new(ctx) ir_expression(operations[this->oper], glsl_type::bool_type,

+				      op[0], NULL);

+      type = glsl_type::bool_type;

+      break;

+

+   case ast_mul_assign:

+   case ast_div_assign:

+   case ast_add_assign:

+   case ast_sub_assign: {

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

+      op[1] = this->subexpressions[1]->hir(instructions, state);

+

+      type = arithmetic_result_type(op[0], op[1],

+				    (this->oper == ast_mul_assign),

+				    state, & loc);

+

+      ir_rvalue *temp_rhs = new(ctx) ir_expression(operations[this->oper], type,

+						   op[0], op[1]);

+

+      result = do_assignment(instructions, state,

+			     op[0]->clone(ctx, NULL), temp_rhs,

+			     this->subexpressions[0]->get_location());

+      type = result->type;

+      error_emitted = (op[0]->type->is_error());

+

+      /* GLSL 1.10 does not allow array assignment.  However, we don't have to

+       * explicitly test for this because none of the binary expression

+       * operators allow array operands either.

+       */

+

+      break;

+   }

+

+   case ast_mod_assign: {

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

+      op[1] = this->subexpressions[1]->hir(instructions, state);

+

+      type = modulus_result_type(op[0]->type, op[1]->type, state, & loc);

+

+      assert(operations[this->oper] == ir_binop_mod);

+

+      ir_rvalue *temp_rhs;

+      temp_rhs = new(ctx) ir_expression(operations[this->oper], type,

+					op[0], op[1]);

+

+      result = do_assignment(instructions, state,

+			     op[0]->clone(ctx, NULL), temp_rhs,

+			     this->subexpressions[0]->get_location());

+      type = result->type;

+      error_emitted = type->is_error();

+      break;

+   }

+

+   case ast_ls_assign:

+   case ast_rs_assign: {

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

+      op[1] = this->subexpressions[1]->hir(instructions, state);

+      type = shift_result_type(op[0]->type, op[1]->type, this->oper, state,

+                               &loc);

+      ir_rvalue *temp_rhs = new(ctx) ir_expression(operations[this->oper],

+                                                   type, op[0], op[1]);

+      result = do_assignment(instructions, state, op[0]->clone(ctx, NULL),

+                             temp_rhs,

+                             this->subexpressions[0]->get_location());

+      error_emitted = op[0]->type->is_error() || op[1]->type->is_error();

+      break;

+   }

+

+   case ast_and_assign:

+   case ast_xor_assign:

+   case ast_or_assign: {

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

+      op[1] = this->subexpressions[1]->hir(instructions, state);

+      type = bit_logic_result_type(op[0]->type, op[1]->type, this->oper,

+                                   state, &loc);

+      ir_rvalue *temp_rhs = new(ctx) ir_expression(operations[this->oper],

+                                                   type, op[0], op[1]);

+      result = do_assignment(instructions, state, op[0]->clone(ctx, NULL),

+                             temp_rhs,

+                             this->subexpressions[0]->get_location());

+      error_emitted = op[0]->type->is_error() || op[1]->type->is_error();

+      break;

+   }

+

+   case ast_conditional: {

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

+

+      /* From page 59 (page 65 of the PDF) of the GLSL 1.50 spec:

+       *

+       *    "The ternary selection operator (?:). It operates on three

+       *    expressions (exp1 ? exp2 : exp3). This operator evaluates the

+       *    first expression, which must result in a scalar Boolean."

+       */

+      if (!op[0]->type->is_boolean() || !op[0]->type->is_scalar()) {

+	 YYLTYPE loc = this->subexpressions[0]->get_location();

+

+	 _mesa_glsl_error(& loc, state, "?: condition must be scalar boolean");

+	 error_emitted = true;

+      }

+

+      /* The :? operator is implemented by generating an anonymous temporary

+       * followed by an if-statement.  The last instruction in each branch of

+       * the if-statement assigns a value to the anonymous temporary.  This

+       * temporary is the r-value of the expression.

+       */

+      exec_list then_instructions;

+      exec_list else_instructions;

+

+      op[1] = this->subexpressions[1]->hir(&then_instructions, state);

+      op[2] = this->subexpressions[2]->hir(&else_instructions, state);

+

+      /* From page 59 (page 65 of the PDF) of the GLSL 1.50 spec:

+       *

+       *     "The second and third expressions can be any type, as

+       *     long their types match, or there is a conversion in

+       *     Section 4.1.10 "Implicit Conversions" that can be applied

+       *     to one of the expressions to make their types match. This

+       *     resulting matching type is the type of the entire

+       *     expression."

+       */

+      if ((!apply_implicit_conversion(op[1]->type, op[2], state)

+	   && !apply_implicit_conversion(op[2]->type, op[1], state))

+	  || (op[1]->type != op[2]->type)) {

+	 YYLTYPE loc = this->subexpressions[1]->get_location();

+

+	 _mesa_glsl_error(& loc, state, "Second and third operands of ?: "

+			  "operator must have matching types.");

+	 error_emitted = true;

+	 type = glsl_type::error_type;

+      } else {

+	 type = op[1]->type;

+      }

+

+      /* From page 33 (page 39 of the PDF) of the GLSL 1.10 spec:

+       *

+       *    "The second and third expressions must be the same type, but can

+       *    be of any type other than an array."

+       */

+      if ((state->language_version <= 110) && type->is_array()) {

+	 _mesa_glsl_error(& loc, state, "Second and third operands of ?: "

+			  "operator must not be arrays.");

+	 error_emitted = true;

+      }

+

+      ir_constant *cond_val = op[0]->constant_expression_value();

+      ir_constant *then_val = op[1]->constant_expression_value();

+      ir_constant *else_val = op[2]->constant_expression_value();

+

+      if (then_instructions.is_empty()

+	  && else_instructions.is_empty()

+	  && (cond_val != NULL) && (then_val != NULL) && (else_val != NULL)) {

+	 result = (cond_val->value.b[0]) ? then_val : else_val;

+      } else {

+	 ir_variable *const tmp =

+	    new(ctx) ir_variable(type, "conditional_tmp", ir_var_temporary);

+	 instructions->push_tail(tmp);

+

+	 ir_if *const stmt = new(ctx) ir_if(op[0]);

+	 instructions->push_tail(stmt);

+

+	 then_instructions.move_nodes_to(& stmt->then_instructions);

+	 ir_dereference *const then_deref =

+	    new(ctx) ir_dereference_variable(tmp);

+	 ir_assignment *const then_assign =

+	    new(ctx) ir_assignment(then_deref, op[1], NULL);

+	 stmt->then_instructions.push_tail(then_assign);

+

+	 else_instructions.move_nodes_to(& stmt->else_instructions);

+	 ir_dereference *const else_deref =

+	    new(ctx) ir_dereference_variable(tmp);

+	 ir_assignment *const else_assign =

+	    new(ctx) ir_assignment(else_deref, op[2], NULL);

+	 stmt->else_instructions.push_tail(else_assign);

+

+	 result = new(ctx) ir_dereference_variable(tmp);

+      }

+      break;

+   }

+

+   case ast_pre_inc:

+   case ast_pre_dec: {

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

+      if (op[0]->type->base_type == GLSL_TYPE_FLOAT)

+	 op[1] = new(ctx) ir_constant(1.0f);

+      else

+	 op[1] = new(ctx) ir_constant(1);

+

+      type = arithmetic_result_type(op[0], op[1], false, state, & loc);

+

+      ir_rvalue *temp_rhs;

+      temp_rhs = new(ctx) ir_expression(operations[this->oper], type,

+					op[0], op[1]);

+

+      result = do_assignment(instructions, state,

+			     op[0]->clone(ctx, NULL), temp_rhs,

+			     this->subexpressions[0]->get_location());

+      type = result->type;

+      error_emitted = op[0]->type->is_error();

+      break;

+   }

+

+   case ast_post_inc:

+   case ast_post_dec: {

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

+      if (op[0]->type->base_type == GLSL_TYPE_FLOAT)

+	 op[1] = new(ctx) ir_constant(1.0f);

+      else

+	 op[1] = new(ctx) ir_constant(1);

+

+      error_emitted = op[0]->type->is_error() || op[1]->type->is_error();

+

+      type = arithmetic_result_type(op[0], op[1], false, state, & loc);

+

+      ir_rvalue *temp_rhs;

+      temp_rhs = new(ctx) ir_expression(operations[this->oper], type,

+					op[0], op[1]);

+

+      /* Get a temporary of a copy of the lvalue before it's modified.

+       * This may get thrown away later.

+       */

+      result = get_lvalue_copy(instructions, op[0]->clone(ctx, NULL));

+

+      (void)do_assignment(instructions, state,

+			  op[0]->clone(ctx, NULL), temp_rhs,

+			  this->subexpressions[0]->get_location());

+

+      type = result->type;

+      error_emitted = op[0]->type->is_error();

+      break;

+   }

+

+   case ast_field_selection:

+      result = _mesa_ast_field_selection_to_hir(this, instructions, state);

+      type = result->type;

+      break;

+

+   case ast_array_index: {

+      YYLTYPE index_loc = subexpressions[1]->get_location();

+

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

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

+

+      error_emitted = op[0]->type->is_error() || op[1]->type->is_error();

+

+      ir_rvalue *const array = op[0];

+

+      result = new(ctx) ir_dereference_array(op[0], op[1]);

+

+      /* Do not use op[0] after this point.  Use array.

+       */

+      op[0] = NULL;

+

+

+      if (error_emitted)

+	 break;

+

+      if (!array->type->is_array()

+	  && !array->type->is_matrix()

+	  && !array->type->is_vector()) {

+	 _mesa_glsl_error(& index_loc, state,

+			  "cannot dereference non-array / non-matrix / "

+			  "non-vector");

+	 error_emitted = true;

+      }

+

+      if (!op[1]->type->is_integer()) {

+	 _mesa_glsl_error(& index_loc, state,

+			  "array index must be integer type");

+	 error_emitted = true;

+      } else if (!op[1]->type->is_scalar()) {

+	 _mesa_glsl_error(& index_loc, state,

+			  "array index must be scalar");

+	 error_emitted = true;

+      }

+

+      /* If the array index is a constant expression and the array has a

+       * declared size, ensure that the access is in-bounds.  If the array

+       * index is not a constant expression, ensure that the array has a

+       * declared size.

+       */

+      ir_constant *const const_index = op[1]->constant_expression_value();

+      if (const_index != NULL) {

+	 const int idx = const_index->value.i[0];

+	 const char *type_name;

+	 unsigned bound = 0;

+

+	 if (array->type->is_matrix()) {

+	    type_name = "matrix";

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

+	    type_name = "vector";

+	 } else {

+	    type_name = "array";

+	 }

+

+	 /* From page 24 (page 30 of the PDF) of the GLSL 1.50 spec:

+	  *

+	  *    "It is illegal to declare an array with a size, and then

+	  *    later (in the same shader) index the same array with an

+	  *    integral constant expression greater than or equal to the

+	  *    declared size. It is also illegal to index an array with a

+	  *    negative constant expression."

+	  */

+	 if (array->type->is_matrix()) {

+	    if (array->type->row_type()->vector_elements <= idx) {

+	       bound = array->type->row_type()->vector_elements;

+	    }

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

+	    if (array->type->vector_elements <= idx) {

+	       bound = array->type->vector_elements;

+	    }

+	 } else {

+	    if ((array->type->array_size() > 0)

+		&& (array->type->array_size() <= idx)) {

+	       bound = array->type->array_size();

+	    }

+	 }

+

+	 if (bound > 0) {

+	    _mesa_glsl_error(& loc, state, "%s index must be < %u",

+			     type_name, bound);

+	    error_emitted = true;

+	 } else if (idx < 0) {

+	    _mesa_glsl_error(& loc, state, "%s index must be >= 0",

+			     type_name);

+	    error_emitted = true;

+	 }

+

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

+	    /* If the array is a variable dereference, it dereferences the

+	     * whole array, by definition.  Use this to get the variable.

+	     *

+	     * FINISHME: Should some methods for getting / setting / testing

+	     * FINISHME: array access limits be added to ir_dereference?

+	     */

+	    ir_variable *const v = array->whole_variable_referenced();

+	    if ((v != NULL) && (unsigned(idx) > v->max_array_access))

+	       v->max_array_access = idx;

+	 }

+      } else if (array->type->array_size() == 0) {

+	 _mesa_glsl_error(&loc, state, "unsized array index must be constant");

+      } else {

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

+	    /* whole_variable_referenced can return NULL if the array is a

+	     * member of a structure.  In this case it is safe to not update

+	     * the max_array_access field because it is never used for fields

+	     * of structures.

+	     */

+	    ir_variable *v = array->whole_variable_referenced();

+	    if (v != NULL)

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

+	 }

+      }

+

+      /* From page 23 (29 of the PDF) of the GLSL 1.30 spec:

+       *

+       *    "Samplers aggregated into arrays within a shader (using square

+       *    brackets [ ]) can only be indexed with integral constant

+       *    expressions [...]."

+       *

+       * This restriction was added in GLSL 1.30.  Shaders using earlier version

+       * of the language should not be rejected by the compiler front-end for

+       * using this construct.  This allows useful things such as using a loop

+       * counter as the index to an array of samplers.  If the loop in unrolled,

+       * the code should compile correctly.  Instead, emit a warning.

+       */

+      if (array->type->is_array() &&

+          array->type->element_type()->is_sampler() &&

+          const_index == NULL) {

+

+	 if (state->language_version == 100) {

+	    _mesa_glsl_warning(&loc, state,

+			       "sampler arrays indexed with non-constant "

+			       "expressions is optional in GLSL ES 1.00");

+	 } else if (state->language_version < 130) {

+	    _mesa_glsl_warning(&loc, state,

+			       "sampler arrays indexed with non-constant "

+			       "expressions is forbidden in GLSL 1.30 and "

+			       "later");

+	 } else {

+	    _mesa_glsl_error(&loc, state,

+			     "sampler arrays indexed with non-constant "

+			     "expressions is forbidden in GLSL 1.30 and "

+			     "later");

+	    error_emitted = true;

+	 }

+      }

+

+      if (error_emitted)

+	 result->type = glsl_type::error_type;

+

+      type = result->type;

+      break;

+   }

+

+   case ast_function_call:

+      /* Should *NEVER* get here.  ast_function_call should always be handled

+       * by ast_function_expression::hir.

+       */

+      assert(0);

+      break;

+

+   case ast_identifier: {

+      /* ast_identifier can appear several places in a full abstract syntax

+       * tree.  This particular use must be at location specified in the grammar

+       * as 'variable_identifier'.

+       */

+      ir_variable *var = 

+	 state->symbols->get_variable(this->primary_expression.identifier);

+

+      result = new(ctx) ir_dereference_variable(var);

+

+      if (var != NULL) {

+	 var->used = true;

+	 type = result->type;

+      } else {

+	 _mesa_glsl_error(& loc, state, "`%s' undeclared",

+			  this->primary_expression.identifier);

+

+	 error_emitted = true;

+      }

+      break;

+   }

+

+   case ast_int_constant:

+      type = glsl_type::int_type;

+      result = new(ctx) ir_constant(this->primary_expression.int_constant);

+      break;

+

+   case ast_uint_constant:

+      type = glsl_type::uint_type;

+      result = new(ctx) ir_constant(this->primary_expression.uint_constant);

+      break;

+

+   case ast_float_constant:

+      type = glsl_type::float_type;

+      result = new(ctx) ir_constant(this->primary_expression.float_constant);

+      break;

+

+   case ast_bool_constant:

+      type = glsl_type::bool_type;

+      result = new(ctx) ir_constant(bool(this->primary_expression.bool_constant));

+      break;

+

+   case ast_sequence: {

+      /* It should not be possible to generate a sequence in the AST without

+       * any expressions in it.

+       */

+      assert(!this->expressions.is_empty());

+

+      /* The r-value of a sequence is the last expression in the sequence.  If

+       * the other expressions in the sequence do not have side-effects (and

+       * therefore add instructions to the instruction list), they get dropped

+       * on the floor.

+       */

+      foreach_list_typed (ast_node, ast, link, &this->expressions)

+	 result = ast->hir(instructions, state);

+

+      type = result->type;

+

+      /* Any errors should have already been emitted in the loop above.

+       */

+      error_emitted = true;

+      break;

+   }

+   }

+

+   if (type->is_error() && !error_emitted)

+      _mesa_glsl_error(& loc, state, "type mismatch");

+

+   return result;

+}

+

+

+ir_rvalue *

+ast_expression_statement::hir(exec_list *instructions,

+			      struct _mesa_glsl_parse_state *state)

+{

+   /* It is possible to have expression statements that don't have an

+    * expression.  This is the solitary semicolon:

+    *

+    * for (i = 0; i < 5; i++)

+    *     ;

+    *

+    * In this case the expression will be NULL.  Test for NULL and don't do

+    * anything in that case.

+    */

+   if (expression != NULL)

+      expression->hir(instructions, state);

+

+   /* Statements do not have r-values.

+    */

+   return NULL;

+}

+

+

+ir_rvalue *

+ast_compound_statement::hir(exec_list *instructions,

+			    struct _mesa_glsl_parse_state *state)

+{

+   if (new_scope)

+      state->symbols->push_scope();

+

+   foreach_list_typed (ast_node, ast, link, &this->statements)

+      ast->hir(instructions, state);

+

+   if (new_scope)

+      state->symbols->pop_scope();

+

+   /* Compound statements do not have r-values.

+    */

+   return NULL;

+}

+

+

+static const glsl_type *

+process_array_type(YYLTYPE *loc, const glsl_type *base, ast_node *array_size,

+		   struct _mesa_glsl_parse_state *state)

+{

+   unsigned length = 0;

+

+   /* FINISHME: Reject delcarations of multidimensional arrays. */

+

+   if (array_size != NULL) {

+      exec_list dummy_instructions;

+      ir_rvalue *const ir = array_size->hir(& dummy_instructions, state);

+      YYLTYPE loc = array_size->get_location();

+

+      /* FINISHME: Verify that the grammar forbids side-effects in array

+       * FINISHME: sizes.   i.e., 'vec4 [x = 12] data'

+       */

+      assert(dummy_instructions.is_empty());

+

+      if (ir != NULL) {

+	 if (!ir->type->is_integer()) {

+	    _mesa_glsl_error(& loc, state, "array size must be integer type");

+	 } else if (!ir->type->is_scalar()) {

+	    _mesa_glsl_error(& loc, state, "array size must be scalar type");

+	 } else {

+	    ir_constant *const size = ir->constant_expression_value();

+

+	    if (size == NULL) {

+	       _mesa_glsl_error(& loc, state, "array size must be a "

+				"constant valued expression");

+	    } else if (size->value.i[0] <= 0) {

+	       _mesa_glsl_error(& loc, state, "array size must be > 0");

+	    } else {

+	       assert(size->type == ir->type);

+	       length = size->value.u[0];

+	    }

+	 }

+      }

+   } else if (state->es_shader) {

+      /* Section 10.17 of the GLSL ES 1.00 specification states that unsized

+       * array declarations have been removed from the language.

+       */

+      _mesa_glsl_error(loc, state, "unsized array declarations are not "

+		       "allowed in GLSL ES 1.00.");

+   }

+

+   return glsl_type::get_array_instance(base, length);

+}

+

+

+const glsl_type *

+ast_type_specifier::glsl_type(const char **name,

+			      struct _mesa_glsl_parse_state *state) const

+{

+   const struct glsl_type *type;

+

+   type = state->symbols->get_type(this->type_name);

+   *name = this->type_name;

+

+   if (this->is_array) {

+      YYLTYPE loc = this->get_location();

+      type = process_array_type(&loc, type, this->array_size, state);

+   }

+

+   return type;

+}

+

+

+static void

+apply_type_qualifier_to_variable(const struct ast_type_qualifier *qual,

+				 ir_variable *var,

+				 struct _mesa_glsl_parse_state *state,

+				 YYLTYPE *loc)

+{

+   if (qual->flags.q.invariant) {

+      if (var->used) {

+	 _mesa_glsl_error(loc, state,

+			  "variable `%s' may not be redeclared "

+			  "`invariant' after being used",

+			  var->name);

+      } else {

+	 var->invariant = 1;

+      }

+   }

+

+   if (qual->flags.q.constant || qual->flags.q.attribute

+       || qual->flags.q.uniform

+       || (qual->flags.q.varying && (state->target == fragment_shader)))

+      var->read_only = 1;

+

+   if (qual->flags.q.centroid)

+      var->centroid = 1;

+

+   if (qual->flags.q.attribute && state->target != vertex_shader) {

+      var->type = glsl_type::error_type;

+      _mesa_glsl_error(loc, state,

+		       "`attribute' variables may not be declared in the "

+		       "%s shader",

+		       _mesa_glsl_shader_target_name(state->target));

+   }

+

+   /* From page 25 (page 31 of the PDF) of the GLSL 1.10 spec:

+    *

+    *     "The varying qualifier can be used only with the data types

+    *     float, vec2, vec3, vec4, mat2, mat3, and mat4, or arrays of

+    *     these."

+    */

+   if (qual->flags.q.varying) {

+      const glsl_type *non_array_type;

+

+      if (var->type && var->type->is_array())

+	 non_array_type = var->type->fields.array;

+      else

+	 non_array_type = var->type;

+

+      if (non_array_type && non_array_type->base_type != GLSL_TYPE_FLOAT) {

+	 var->type = glsl_type::error_type;

+	 _mesa_glsl_error(loc, state,

+			  "varying variables must be of base type float");

+      }

+   }

+

+   /* If there is no qualifier that changes the mode of the variable, leave

+    * the setting alone.

+    */

+   if (qual->flags.q.in && qual->flags.q.out)

+      var->mode = ir_var_inout;

+   else if (qual->flags.q.attribute || qual->flags.q.in

+	    || (qual->flags.q.varying && (state->target == fragment_shader)))

+      var->mode = ir_var_in;

+   else if (qual->flags.q.out

+	    || (qual->flags.q.varying && (state->target == vertex_shader)))

+      var->mode = ir_var_out;

+   else if (qual->flags.q.uniform)

+      var->mode = ir_var_uniform;

+

+   if (state->all_invariant && (state->current_function == NULL)) {

+      switch (state->target) {

+      case vertex_shader:

+	 if (var->mode == ir_var_out)

+	    var->invariant = true;

+	 break;

+      case geometry_shader:

+	 if ((var->mode == ir_var_in) || (var->mode == ir_var_out))

+	    var->invariant = true;

+	 break;

+      case fragment_shader:

+	 if (var->mode == ir_var_in)

+	    var->invariant = true;

+	 break;

+      }

+   }

+

+   if (qual->flags.q.flat)

+      var->interpolation = ir_var_flat;

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

+      var->interpolation = ir_var_noperspective;

+   else

+      var->interpolation = ir_var_smooth;

+

+   var->pixel_center_integer = qual->flags.q.pixel_center_integer;

+   var->origin_upper_left = qual->flags.q.origin_upper_left;

+   if ((qual->flags.q.origin_upper_left || qual->flags.q.pixel_center_integer)

+       && (strcmp(var->name, "gl_FragCoord") != 0)) {

+      const char *const qual_string = (qual->flags.q.origin_upper_left)

+	 ? "origin_upper_left" : "pixel_center_integer";

+

+      _mesa_glsl_error(loc, state,

+		       "layout qualifier `%s' can only be applied to "

+		       "fragment shader input `gl_FragCoord'",

+		       qual_string);

+   }

+

+   if (qual->flags.q.explicit_location) {

+      const bool global_scope = (state->current_function == NULL);

+      bool fail = false;

+      const char *string = "";

+

+      /* In the vertex shader only shader inputs can be given explicit

+       * locations.

+       *

+       * In the fragment shader only shader outputs can be given explicit

+       * locations.

+       */

+      switch (state->target) {

+      case vertex_shader:

+	 if (!global_scope || (var->mode != ir_var_in)) {

+	    fail = true;

+	    string = "input";

+	 }

+	 break;

+

+      case geometry_shader:

+	 _mesa_glsl_error(loc, state,

+			  "geometry shader variables cannot be given "

+			  "explicit locations\n");

+	 break;

+

+      case fragment_shader:

+	 if (!global_scope || (var->mode != ir_var_in)) {

+	    fail = true;

+	    string = "output";

+	 }

+	 break;

+      };

+

+      if (fail) {

+	 _mesa_glsl_error(loc, state,

+			  "only %s shader %s variables can be given an "

+			  "explicit location\n",

+			  _mesa_glsl_shader_target_name(state->target),

+			  string);

+      } else {

+	 var->explicit_location = true;

+

+	 /* This bit of silliness is needed because invalid explicit locations

+	  * are supposed to be flagged during linking.  Small negative values

+	  * biased by VERT_ATTRIB_GENERIC0 or FRAG_RESULT_DATA0 could alias

+	  * built-in values (e.g., -16+VERT_ATTRIB_GENERIC0 = VERT_ATTRIB_POS).

+	  * The linker needs to be able to differentiate these cases.  This

+	  * ensures that negative values stay negative.

+	  */

+	 if (qual->location >= 0) {

+	    var->location = (state->target == vertex_shader)

+	       ? (qual->location + VERT_ATTRIB_GENERIC0)

+	       : (qual->location + FRAG_RESULT_DATA0);

+	 } else {

+	    var->location = qual->location;

+	 }

+      }

+   }

+

+   /* Does the declaration use the 'layout' keyword?

+    */

+   const bool uses_layout = qual->flags.q.pixel_center_integer

+      || qual->flags.q.origin_upper_left

+      || qual->flags.q.explicit_location;

+

+   /* Does the declaration use the deprecated 'attribute' or 'varying'

+    * keywords?

+    */

+   const bool uses_deprecated_qualifier = qual->flags.q.attribute

+      || qual->flags.q.varying;

+

+   /* Is the 'layout' keyword used with parameters that allow relaxed checking.

+    * Many implementations of GL_ARB_fragment_coord_conventions_enable and some

+    * implementations (only Mesa?) GL_ARB_explicit_attrib_location_enable

+    * allowed the layout qualifier to be used with 'varying' and 'attribute'.

+    * These extensions and all following extensions that add the 'layout'

+    * keyword have been modified to require the use of 'in' or 'out'.

+    *

+    * The following extension do not allow the deprecated keywords:

+    *

+    *    GL_AMD_conservative_depth

+    *    GL_ARB_gpu_shader5

+    *    GL_ARB_separate_shader_objects

+    *    GL_ARB_tesselation_shader

+    *    GL_ARB_transform_feedback3

+    *    GL_ARB_uniform_buffer_object

+    *

+    * It is unknown whether GL_EXT_shader_image_load_store or GL_NV_gpu_shader5

+    * allow layout with the deprecated keywords.

+    */

+   const bool relaxed_layout_qualifier_checking =

+      state->ARB_fragment_coord_conventions_enable;

+

+   if (uses_layout && uses_deprecated_qualifier) {

+      if (relaxed_layout_qualifier_checking) {

+	 _mesa_glsl_warning(loc, state,

+			    "`layout' qualifier may not be used with "

+			    "`attribute' or `varying'");

+      } else {

+	 _mesa_glsl_error(loc, state,

+			  "`layout' qualifier may not be used with "

+			  "`attribute' or `varying'");

+      }

+   }

+

+   /* Layout qualifiers for gl_FragDepth, which are enabled by extension

+    * AMD_conservative_depth.

+    */

+   int depth_layout_count = qual->flags.q.depth_any

+      + qual->flags.q.depth_greater

+      + qual->flags.q.depth_less

+      + qual->flags.q.depth_unchanged;

+   if (depth_layout_count > 0

+       && !state->AMD_conservative_depth_enable) {

+       _mesa_glsl_error(loc, state,

+                        "extension GL_AMD_conservative_depth must be enabled "

+			"to use depth layout qualifiers");

+   } else if (depth_layout_count > 0

+              && strcmp(var->name, "gl_FragDepth") != 0) {

+       _mesa_glsl_error(loc, state,

+                        "depth layout qualifiers can be applied only to "

+                        "gl_FragDepth");

+   } else if (depth_layout_count > 1

+              && strcmp(var->name, "gl_FragDepth") == 0) {

+      _mesa_glsl_error(loc, state,

+                       "at most one depth layout qualifier can be applied to "

+                       "gl_FragDepth");

+   }

+   if (qual->flags.q.depth_any)

+      var->depth_layout = ir_depth_layout_any;

+   else if (qual->flags.q.depth_greater)

+      var->depth_layout = ir_depth_layout_greater;

+   else if (qual->flags.q.depth_less)

+      var->depth_layout = ir_depth_layout_less;

+   else if (qual->flags.q.depth_unchanged)

+       var->depth_layout = ir_depth_layout_unchanged;

+   else

+       var->depth_layout = ir_depth_layout_none;

+

+   if (var->type->is_array() && state->language_version != 110) {

+      var->array_lvalue = true;

+   }

+}

+

+/**

+ * Get the variable that is being redeclared by this declaration

+ *

+ * Semantic checks to verify the validity of the redeclaration are also

+ * performed.  If semantic checks fail, compilation error will be emitted via

+ * \c _mesa_glsl_error, but a non-\c NULL pointer will still be returned.

+ *

+ * \returns

+ * A pointer to an existing variable in the current scope if the declaration

+ * is a redeclaration, \c NULL otherwise.

+ */

+ir_variable *

+get_variable_being_redeclared(ir_variable *var, ast_declaration *decl,

+			      struct _mesa_glsl_parse_state *state)

+{

+   /* Check if this declaration is actually a re-declaration, either to

+    * resize an array or add qualifiers to an existing variable.

+    *

+    * This is allowed for variables in the current scope, or when at

+    * global scope (for built-ins in the implicit outer scope).

+    */

+   ir_variable *earlier = state->symbols->get_variable(decl->identifier);

+   if (earlier == NULL ||

+       (state->current_function != NULL &&

+	!state->symbols->name_declared_this_scope(decl->identifier))) {

+      return NULL;

+   }

+

+

+   YYLTYPE loc = decl->get_location();

+

+   /* From page 24 (page 30 of the PDF) of the GLSL 1.50 spec,

+    *

+    * "It is legal to declare an array without a size and then

+    *  later re-declare the same name as an array of the same

+    *  type and specify a size."

+    */

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

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

+       && (var->type->element_type() == earlier->type->element_type())) {

+      /* FINISHME: This doesn't match the qualifiers on the two

+       * FINISHME: declarations.  It's not 100% clear whether this is

+       * FINISHME: required or not.

+       */

+

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

+       *

+       *     "The size [of gl_TexCoord] can be at most

+       *     gl_MaxTextureCoords."

+       */

+      const unsigned size = unsigned(var->type->array_size());

+      if ((strcmp("gl_TexCoord", var->name) == 0)

+	  && (size > state->Const.MaxTextureCoords)) {

+	 _mesa_glsl_error(& loc, state, "`gl_TexCoord' array size cannot "

+			  "be larger than gl_MaxTextureCoords (%u)\n",

+			  state->Const.MaxTextureCoords);

+      } else if ((size > 0) && (size <= earlier->max_array_access)) {

+	 _mesa_glsl_error(& loc, state, "array size must be > %u due to "

+			  "previous access",

+			  earlier->max_array_access);

+      }

+

+      earlier->type = var->type;

+      delete var;

+      var = NULL;

+   } else if (state->ARB_fragment_coord_conventions_enable

+	      && strcmp(var->name, "gl_FragCoord") == 0

+	      && earlier->type == var->type

+	      && earlier->mode == var->mode) {

+      /* Allow redeclaration of gl_FragCoord for ARB_fcc layout

+       * qualifiers.

+       */

+      earlier->origin_upper_left = var->origin_upper_left;

+      earlier->pixel_center_integer = var->pixel_center_integer;

+

+      /* According to section 4.3.7 of the GLSL 1.30 spec,

+       * the following built-in varaibles can be redeclared with an

+       * interpolation qualifier:

+       *    * gl_FrontColor

+       *    * gl_BackColor

+       *    * gl_FrontSecondaryColor

+       *    * gl_BackSecondaryColor

+       *    * gl_Color

+       *    * gl_SecondaryColor

+       */

+   } else if (state->language_version >= 130

+	      && (strcmp(var->name, "gl_FrontColor") == 0

+		  || strcmp(var->name, "gl_BackColor") == 0

+		  || strcmp(var->name, "gl_FrontSecondaryColor") == 0

+		  || strcmp(var->name, "gl_BackSecondaryColor") == 0

+		  || strcmp(var->name, "gl_Color") == 0

+		  || strcmp(var->name, "gl_SecondaryColor") == 0)

+	      && earlier->type == var->type

+	      && earlier->mode == var->mode) {

+      earlier->interpolation = var->interpolation;

+

+      /* Layout qualifiers for gl_FragDepth. */

+   } else if (state->AMD_conservative_depth_enable

+	      && strcmp(var->name, "gl_FragDepth") == 0

+	      && earlier->type == var->type

+	      && earlier->mode == var->mode) {

+

+      /** From the AMD_conservative_depth spec:

+       *     Within any shader, the first redeclarations of gl_FragDepth

+       *     must appear before any use of gl_FragDepth.

+       */

+      if (earlier->used) {

+	 _mesa_glsl_error(&loc, state,

+			  "the first redeclaration of gl_FragDepth "

+			  "must appear before any use of gl_FragDepth");

+      }

+

+      /* Prevent inconsistent redeclaration of depth layout qualifier. */

+      if (earlier->depth_layout != ir_depth_layout_none

+	  && earlier->depth_layout != var->depth_layout) {

+	 _mesa_glsl_error(&loc, state,

+			  "gl_FragDepth: depth layout is declared here "

+			  "as '%s, but it was previously declared as "

+			  "'%s'",

+			  depth_layout_string(var->depth_layout),

+			  depth_layout_string(earlier->depth_layout));

+      }

+

+      earlier->depth_layout = var->depth_layout;

+

+   } else {

+      _mesa_glsl_error(&loc, state, "`%s' redeclared", decl->identifier);

+   }

+

+   return earlier;

+}

+

+/**

+ * Generate the IR for an initializer in a variable declaration

+ */

+ir_rvalue *

+process_initializer(ir_variable *var, ast_declaration *decl,

+		    ast_fully_specified_type *type,

+		    exec_list *initializer_instructions,

+		    struct _mesa_glsl_parse_state *state)

+{

+   ir_rvalue *result = NULL;

+

+   YYLTYPE initializer_loc = decl->initializer->get_location();

+

+   /* From page 24 (page 30 of the PDF) of the GLSL 1.10 spec:

+    *

+    *    "All uniform variables are read-only and are initialized either

+    *    directly by an application via API commands, or indirectly by

+    *    OpenGL."

+    */

+   if ((state->language_version <= 110)

+       && (var->mode == ir_var_uniform)) {

+      _mesa_glsl_error(& initializer_loc, state,

+		       "cannot initialize uniforms in GLSL 1.10");

+   }

+

+   if (var->type->is_sampler()) {

+      _mesa_glsl_error(& initializer_loc, state,

+		       "cannot initialize samplers");

+   }

+

+   if ((var->mode == ir_var_in) && (state->current_function == NULL)) {

+      _mesa_glsl_error(& initializer_loc, state,

+		       "cannot initialize %s shader input / %s",

+		       _mesa_glsl_shader_target_name(state->target),

+		       (state->target == vertex_shader)

+		       ? "attribute" : "varying");

+   }

+

+   ir_dereference *const lhs = new(state) ir_dereference_variable(var);

+   ir_rvalue *rhs = decl->initializer->hir(initializer_instructions,

+					   state);

+

+   /* Calculate the constant value if this is a const or uniform

+    * declaration.

+    */

+   if (type->qualifier.flags.q.constant

+       || type->qualifier.flags.q.uniform) {

+      ir_rvalue *new_rhs = validate_assignment(state, var->type, rhs);

+      if (new_rhs != NULL) {

+	 rhs = new_rhs;

+

+	 ir_constant *constant_value = rhs->constant_expression_value();

+	 if (!constant_value) {

+	    _mesa_glsl_error(& initializer_loc, state,

+			     "initializer of %s variable `%s' must be a "

+			     "constant expression",

+			     (type->qualifier.flags.q.constant)

+			     ? "const" : "uniform",

+			     decl->identifier);

+	    if (var->type->is_numeric()) {

+	       /* Reduce cascading errors. */

+	       var->constant_value = ir_constant::zero(state, var->type);

+	    }

+	 } else {

+	    rhs = constant_value;

+	    var->constant_value = constant_value;

+	 }

+      } else {

+	 _mesa_glsl_error(&initializer_loc, state,

+			  "initializer of type %s cannot be assigned to "

+			  "variable of type %s",

+			  rhs->type->name, var->type->name);

+	 if (var->type->is_numeric()) {

+	    /* Reduce cascading errors. */

+	    var->constant_value = ir_constant::zero(state, var->type);

+	 }

+      }

+   }

+

+   if (rhs && !rhs->type->is_error()) {

+      bool temp = var->read_only;

+      if (type->qualifier.flags.q.constant)

+	 var->read_only = false;

+

+      /* Never emit code to initialize a uniform.

+       */

+      const glsl_type *initializer_type;

+      if (!type->qualifier.flags.q.uniform) {

+	 result = do_assignment(initializer_instructions, state,

+				lhs, rhs,

+				type->get_location());

+	 initializer_type = result->type;

+      } else

+	 initializer_type = rhs->type;

+

+      /* If the declared variable is an unsized array, it must inherrit

+       * its full type from the initializer.  A declaration such as

+       *

+       *     uniform float a[] = float[](1.0, 2.0, 3.0, 3.0);

+       *

+       * becomes

+       *

+       *     uniform float a[4] = float[](1.0, 2.0, 3.0, 3.0);

+       *

+       * The assignment generated in the if-statement (below) will also

+       * automatically handle this case for non-uniforms.

+       *

+       * If the declared variable is not an array, the types must

+       * already match exactly.  As a result, the type assignment

+       * here can be done unconditionally.  For non-uniforms the call

+       * to do_assignment can change the type of the initializer (via

+       * the implicit conversion rules).  For uniforms the initializer

+       * must be a constant expression, and the type of that expression

+       * was validated above.

+       */

+      var->type = initializer_type;

+

+      var->read_only = temp;

+   }

+

+   return result;

+}

+

+ir_rvalue *

+ast_declarator_list::hir(exec_list *instructions,

+			 struct _mesa_glsl_parse_state *state)

+{

+   void *ctx = state;

+   const struct glsl_type *decl_type;

+   const char *type_name = NULL;

+   ir_rvalue *result = NULL;

+   YYLTYPE loc = this->get_location();

+

+   /* From page 46 (page 52 of the PDF) of the GLSL 1.50 spec:

+    *

+    *     "To ensure that a particular output variable is invariant, it is

+    *     necessary to use the invariant qualifier. It can either be used to

+    *     qualify a previously declared variable as being invariant

+    *

+    *         invariant gl_Position; // make existing gl_Position be invariant"

+    *

+    * In these cases the parser will set the 'invariant' flag in the declarator

+    * list, and the type will be NULL.

+    */

+   if (this->invariant) {

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

+

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

+	 _mesa_glsl_error(& loc, state,

+			  "All uses of `invariant' keyword must be at global "

+			  "scope\n");

+      }

+

+      foreach_list_typed (ast_declaration, decl, link, &this->declarations) {

+	 assert(!decl->is_array);

+	 assert(decl->array_size == NULL);

+	 assert(decl->initializer == NULL);

+

+	 ir_variable *const earlier =

+	    state->symbols->get_variable(decl->identifier);

+	 if (earlier == NULL) {

+	    _mesa_glsl_error(& loc, state,

+			     "Undeclared variable `%s' cannot be marked "

+			     "invariant\n", decl->identifier);

+	 } else if ((state->target == vertex_shader)

+	       && (earlier->mode != ir_var_out)) {

+	    _mesa_glsl_error(& loc, state,

+			     "`%s' cannot be marked invariant, vertex shader "

+			     "outputs only\n", decl->identifier);

+	 } else if ((state->target == fragment_shader)

+	       && (earlier->mode != ir_var_in)) {

+	    _mesa_glsl_error(& loc, state,

+			     "`%s' cannot be marked invariant, fragment shader "

+			     "inputs only\n", decl->identifier);

+	 } else if (earlier->used) {

+	    _mesa_glsl_error(& loc, state,

+			     "variable `%s' may not be redeclared "

+			     "`invariant' after being used",

+			     earlier->name);

+	 } else {

+	    earlier->invariant = true;

+	 }

+      }

+

+      /* Invariant redeclarations do not have r-values.

+       */

+      return NULL;

+   }

+

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

+   assert(!this->invariant);

+

+   /* The type specifier may contain a structure definition.  Process that

+    * before any of the variable declarations.

+    */

+   (void) this->type->specifier->hir(instructions, state);

+

+   decl_type = this->type->specifier->glsl_type(& type_name, state);

+   if (this->declarations.is_empty()) {

+      /* The only valid case where the declaration list can be empty is when

+       * the declaration is setting the default precision of a built-in type

+       * (e.g., 'precision highp vec4;').

+       */

+

+      if (decl_type != NULL) {

+      } else {

+	    _mesa_glsl_error(& loc, state, "incomplete declaration");

+      }

+   }

+

+   foreach_list_typed (ast_declaration, decl, link, &this->declarations) {

+      const struct glsl_type *var_type;

+      ir_variable *var;

+

+      /* FINISHME: Emit a warning if a variable declaration shadows a

+       * FINISHME: declaration at a higher scope.

+       */

+

+      if ((decl_type == NULL) || decl_type->is_void()) {

+	 if (type_name != NULL) {

+	    _mesa_glsl_error(& loc, state,

+			     "invalid type `%s' in declaration of `%s'",

+			     type_name, decl->identifier);

+	 } else {

+	    _mesa_glsl_error(& loc, state,

+			     "invalid type in declaration of `%s'",

+			     decl->identifier);

+	 }

+	 continue;

+      }

+

+      if (decl->is_array) {

+	 var_type = process_array_type(&loc, decl_type, decl->array_size,

+				       state);

+      } else {

+	 var_type = decl_type;

+      }

+

+      var = new(ctx) ir_variable(var_type, decl->identifier, ir_var_auto);

+

+      /* From page 22 (page 28 of the PDF) of the GLSL 1.10 specification;

+       *

+       *     "Global variables can only use the qualifiers const,

+       *     attribute, uni form, or varying. Only one may be

+       *     specified.

+       *

+       *     Local variables can only use the qualifier const."

+       *

+       * This is relaxed in GLSL 1.30.  It is also relaxed by any extension

+       * that adds the 'layout' keyword.

+       */

+      if ((state->language_version < 130)

+	  && !state->ARB_explicit_attrib_location_enable

+	  && !state->ARB_fragment_coord_conventions_enable) {

+	 if (this->type->qualifier.flags.q.out) {

+	    _mesa_glsl_error(& loc, state,

+			     "`out' qualifier in declaration of `%s' "

+			     "only valid for function parameters in %s.",

+			     decl->identifier, state->version_string);

+	 }

+	 if (this->type->qualifier.flags.q.in) {

+	    _mesa_glsl_error(& loc, state,

+			     "`in' qualifier in declaration of `%s' "

+			     "only valid for function parameters in %s.",

+			     decl->identifier, state->version_string);

+	 }

+	 /* FINISHME: Test for other invalid qualifiers. */

+      }

+

+      apply_type_qualifier_to_variable(& this->type->qualifier, var, state,

+				       & loc);

+

+      if (this->type->qualifier.flags.q.invariant) {

+	 if ((state->target == vertex_shader) && !(var->mode == ir_var_out ||

+						   var->mode == ir_var_inout)) {

+	    /* FINISHME: Note that this doesn't work for invariant on

+	     * a function signature outval

+	     */

+	    _mesa_glsl_error(& loc, state,

+			     "`%s' cannot be marked invariant, vertex shader "

+			     "outputs only\n", var->name);

+	 } else if ((state->target == fragment_shader) &&

+		    !(var->mode == ir_var_in || var->mode == ir_var_inout)) {

+	    /* FINISHME: Note that this doesn't work for invariant on

+	     * a function signature inval

+	     */

+	    _mesa_glsl_error(& loc, state,

+			     "`%s' cannot be marked invariant, fragment shader "

+			     "inputs only\n", var->name);

+	 }

+      }

+

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

+	 const char *mode = NULL;

+	 const char *extra = "";

+

+	 /* There is no need to check for 'inout' here because the parser will

+	  * only allow that in function parameter lists.

+	  */

+	 if (this->type->qualifier.flags.q.attribute) {

+	    mode = "attribute";

+	 } else if (this->type->qualifier.flags.q.uniform) {

+	    mode = "uniform";

+	 } else if (this->type->qualifier.flags.q.varying) {

+	    mode = "varying";

+	 } else if (this->type->qualifier.flags.q.in) {

+	    mode = "in";

+	    extra = " or in function parameter list";

+	 } else if (this->type->qualifier.flags.q.out) {

+	    mode = "out";

+	    extra = " or in function parameter list";

+	 }

+

+	 if (mode) {

+	    _mesa_glsl_error(& loc, state,

+			     "%s variable `%s' must be declared at "

+			     "global scope%s",

+			     mode, var->name, extra);

+	 }

+      } else if (var->mode == ir_var_in) {

+         var->read_only = true;

+

+	 if (state->target == vertex_shader) {

+	    bool error_emitted = false;

+

+	    /* From page 31 (page 37 of the PDF) of the GLSL 1.50 spec:

+	     *

+	     *    "Vertex shader inputs can only be float, floating-point

+	     *    vectors, matrices, signed and unsigned integers and integer

+	     *    vectors. Vertex shader inputs can also form arrays of these

+	     *    types, but not structures."

+	     *

+	     * From page 31 (page 27 of the PDF) of the GLSL 1.30 spec:

+	     *

+	     *    "Vertex shader inputs can only be float, floating-point

+	     *    vectors, matrices, signed and unsigned integers and integer

+	     *    vectors. They cannot be arrays or structures."

+	     *

+	     * From page 23 (page 29 of the PDF) of the GLSL 1.20 spec:

+	     *

+	     *    "The attribute qualifier can be used only with float,

+	     *    floating-point vectors, and matrices. Attribute variables

+	     *    cannot be declared as arrays or structures."

+	     */

+	    const glsl_type *check_type = var->type->is_array()

+	       ? var->type->fields.array : var->type;

+

+	    switch (check_type->base_type) {

+	    case GLSL_TYPE_FLOAT:

+	       break;

+	    case GLSL_TYPE_UINT:

+	    case GLSL_TYPE_INT:

+	       if (state->language_version > 120)

+		  break;

+	       /* FALLTHROUGH */

+	    default:

+	       _mesa_glsl_error(& loc, state,

+				"vertex shader input / attribute cannot have "

+				"type %s`%s'",

+				var->type->is_array() ? "array of " : "",

+				check_type->name);

+	       error_emitted = true;

+	    }

+

+	    if (!error_emitted && (state->language_version <= 130)

+		&& var->type->is_array()) {

+	       _mesa_glsl_error(& loc, state,

+				"vertex shader input / attribute cannot have "

+				"array type");

+	       error_emitted = true;

+	    }

+	 }

+      }

+

+      /* Integer vertex outputs must be qualified with 'flat'.

+       *

+       * From section 4.3.6 of the GLSL 1.30 spec:

+       *    "If a vertex output is a signed or unsigned integer or integer

+       *    vector, then it must be qualified with the interpolation qualifier

+       *    flat."

+       */

+      if (state->language_version >= 130

+          && state->target == vertex_shader

+          && state->current_function == NULL

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

+          && var->mode == ir_var_out

+          && var->interpolation != ir_var_flat) {

+

+         _mesa_glsl_error(&loc, state, "If a vertex output is an integer, "

+                          "then it must be qualified with 'flat'");

+      }

+

+

+      /* Interpolation qualifiers cannot be applied to 'centroid' and

+       * 'centroid varying'.

+       *

+       * From page 29 (page 35 of the PDF) of the GLSL 1.30 spec:

+       *    "interpolation qualifiers may only precede the qualifiers in,

+       *    centroid in, out, or centroid out in a declaration. They do not apply

+       *    to the deprecated storage qualifiers varying or centroid varying."

+       */

+      if (state->language_version >= 130

+          && this->type->qualifier.has_interpolation()

+          && this->type->qualifier.flags.q.varying) {

+

+         const char *i = this->type->qualifier.interpolation_string();

+         assert(i != NULL);

+         const char *s;

+         if (this->type->qualifier.flags.q.centroid)

+            s = "centroid varying";

+         else

+            s = "varying";

+

+         _mesa_glsl_error(&loc, state,

+                          "qualifier '%s' cannot be applied to the "

+                          "deprecated storage qualifier '%s'", i, s);

+      }

+

+

+      /* Interpolation qualifiers can only apply to vertex shader outputs and

+       * fragment shader inputs.

+       *

+       * From page 29 (page 35 of the PDF) of the GLSL 1.30 spec:

+       *    "Outputs from a vertex shader (out) and inputs to a fragment

+       *    shader (in) can be further qualified with one or more of these

+       *    interpolation qualifiers"

+       */

+      if (state->language_version >= 130

+          && this->type->qualifier.has_interpolation()) {

+

+         const char *i = this->type->qualifier.interpolation_string();

+         assert(i != NULL);

+

+         switch (state->target) {

+         case vertex_shader:

+            if (this->type->qualifier.flags.q.in) {

+               _mesa_glsl_error(&loc, state,

+                                "qualifier '%s' cannot be applied to vertex "

+                                "shader inputs", i);

+            }

+            break;

+         case fragment_shader:

+            if (this->type->qualifier.flags.q.out) {

+               _mesa_glsl_error(&loc, state,

+                                "qualifier '%s' cannot be applied to fragment "

+                                "shader outputs", i);

+            }

+            break;

+         default:

+            assert(0);

+         }

+      }

+

+

+      /* From section 4.3.4 of the GLSL 1.30 spec:

+       *    "It is an error to use centroid in in a vertex shader."

+       */

+      if (state->language_version >= 130

+          && this->type->qualifier.flags.q.centroid

+          && this->type->qualifier.flags.q.in

+          && state->target == vertex_shader) {

+

+         _mesa_glsl_error(&loc, state,

+                          "'centroid in' cannot be used in a vertex shader");

+      }

+

+

+      /* Precision qualifiers exists only in GLSL versions 1.00 and >= 1.30.

+       */

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

+          && state->language_version != 100

+          && state->language_version < 130) {

+

+         _mesa_glsl_error(&loc, state,

+                          "precision qualifiers are supported only in GLSL ES "

+                          "1.00, and GLSL 1.30 and later");

+      }

+

+

+      /* Precision qualifiers only apply to floating point and integer types.

+       *

+       * From section 4.5.2 of the GLSL 1.30 spec:

+       *    "Any floating point or any integer declaration can have the type

+       *    preceded by one of these precision qualifiers [...] Literal

+       *    constants do not have precision qualifiers. Neither do Boolean

+       *    variables.

+       */

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

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

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

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

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

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

+

+         _mesa_glsl_error(&loc, state,

+                          "precision qualifiers apply only to floating point "

+                          "and integer types");

+      }

+

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

+       * list.  This list will be added to the instruction stream (below) after

+       * the declaration is added.  This is done because in some cases (such as

+       * redeclarations) the declaration may not actually be added to the

+       * instruction stream.

+       */

+      exec_list initializer_instructions;

+      ir_variable *earlier = get_variable_being_redeclared(var, decl, state);

+

+      if (decl->initializer != NULL) {

+	 result = process_initializer((earlier == NULL) ? var : earlier,

+				      decl, this->type,

+				      &initializer_instructions, state);

+      }

+

+      /* From page 23 (page 29 of the PDF) of the GLSL 1.10 spec:

+       *

+       *     "It is an error to write to a const variable outside of

+       *      its declaration, so they must be initialized when

+       *      declared."

+       */

+      if (this->type->qualifier.flags.q.constant && decl->initializer == NULL) {

+	 _mesa_glsl_error(& loc, state,

+			  "const declaration of `%s' must be initialized",

+			  decl->identifier);

+      }

+

+      /* If the declaration is not a redeclaration, there are a few additional

+       * semantic checks that must be applied.  In addition, variable that was

+       * created for the declaration should be added to the IR stream.

+       */

+      if (earlier == NULL) {

+	 /* From page 15 (page 21 of the PDF) of the GLSL 1.10 spec,

+	  *

+	  *   "Identifiers starting with "gl_" are reserved for use by

+	  *   OpenGL, and may not be declared in a shader as either a

+	  *   variable or a function."

+	  */

+	 if (strncmp(decl->identifier, "gl_", 3) == 0)

+	    _mesa_glsl_error(& loc, state,

+			     "identifier `%s' uses reserved `gl_' prefix",

+			     decl->identifier);

+

+	 /* Add the variable to the symbol table.  Note that the initializer's

+	  * IR was already processed earlier (though it hasn't been emitted

+	  * yet), without the variable in scope.

+	  *

+	  * This differs from most C-like languages, but it follows the GLSL

+	  * specification.  From page 28 (page 34 of the PDF) of the GLSL 1.50

+	  * spec:

+	  *

+	  *     "Within a declaration, the scope of a name starts immediately

+	  *     after the initializer if present or immediately after the name

+	  *     being declared if not."

+	  */

+	 if (!state->symbols->add_variable(var)) {

+	    YYLTYPE loc = this->get_location();

+	    _mesa_glsl_error(&loc, state, "name `%s' already taken in the "

+			     "current scope", decl->identifier);

+	    continue;

+	 }

+

+	 /* Push the variable declaration to the top.  It means that all the

+	  * variable declarations will appear in a funny last-to-first order,

+	  * but otherwise we run into trouble if a function is prototyped, a

+	  * global var is decled, then the function is defined with usage of

+	  * the global var.  See glslparsertest's CorrectModule.frag.

+	  */

+	 instructions->push_head(var);

+      }

+

+      instructions->append_list(&initializer_instructions);

+   }

+

+

+   /* Generally, variable declarations do not have r-values.  However,

+    * one is used for the declaration in

+    *

+    * while (bool b = some_condition()) {

+    *   ...

+    * }

+    *

+    * so we return the rvalue from the last seen declaration here.

+    */

+   return result;

+}

+

+

+ir_rvalue *

+ast_parameter_declarator::hir(exec_list *instructions,

+			      struct _mesa_glsl_parse_state *state)

+{

+   void *ctx = state;

+   const struct glsl_type *type;

+   const char *name = NULL;

+   YYLTYPE loc = this->get_location();

+

+   type = this->type->specifier->glsl_type(& name, state);

+

+   if (type == NULL) {

+      if (name != NULL) {

+	 _mesa_glsl_error(& loc, state,

+			  "invalid type `%s' in declaration of `%s'",

+			  name, this->identifier);

+      } else {

+	 _mesa_glsl_error(& loc, state,

+			  "invalid type in declaration of `%s'",

+			  this->identifier);

+      }

+

+      type = glsl_type::error_type;

+   }

+

+   /* From page 62 (page 68 of the PDF) of the GLSL 1.50 spec:

+    *

+    *    "Functions that accept no input arguments need not use void in the

+    *    argument list because prototypes (or definitions) are required and

+    *    therefore there is no ambiguity when an empty argument list "( )" is

+    *    declared. The idiom "(void)" as a parameter list is provided for

+    *    convenience."

+    *

+    * Placing this check here prevents a void parameter being set up

+    * for a function, which avoids tripping up checks for main taking

+    * parameters and lookups of an unnamed symbol.

+    */

+   if (type->is_void()) {

+      if (this->identifier != NULL)

+	 _mesa_glsl_error(& loc, state,

+			  "named parameter cannot have type `void'");

+

+      is_void = true;

+      return NULL;

+   }

+

+   if (formal_parameter && (this->identifier == NULL)) {

+      _mesa_glsl_error(& loc, state, "formal parameter lacks a name");

+      return NULL;

+   }

+

+   /* This only handles "vec4 foo[..]".  The earlier specifier->glsl_type(...)

+    * call already handled the "vec4[..] foo" case.

+    */

+   if (this->is_array) {

+      type = process_array_type(&loc, type, this->array_size, state);

+   }

+

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

+      _mesa_glsl_error(&loc, state, "arrays passed as parameters must have "

+		       "a declared size.");

+      type = glsl_type::error_type;

+   }

+

+   is_void = false;

+   ir_variable *var = new(ctx) ir_variable(type, this->identifier, ir_var_in);

+

+   /* Apply any specified qualifiers to the parameter declaration.  Note that

+    * for function parameters the default mode is 'in'.

+    */

+   apply_type_qualifier_to_variable(& this->type->qualifier, var, state, & loc);

+

+   instructions->push_tail(var);

+

+   /* Parameter declarations do not have r-values.

+    */

+   return NULL;

+}

+

+

+void

+ast_parameter_declarator::parameters_to_hir(exec_list *ast_parameters,

+					    bool formal,

+					    exec_list *ir_parameters,

+					    _mesa_glsl_parse_state *state)

+{

+   ast_parameter_declarator *void_param = NULL;

+   unsigned count = 0;

+

+   foreach_list_typed (ast_parameter_declarator, param, link, ast_parameters) {

+      param->formal_parameter = formal;

+      param->hir(ir_parameters, state);

+

+      if (param->is_void)

+	 void_param = param;

+

+      count++;

+   }

+

+   if ((void_param != NULL) && (count > 1)) {

+      YYLTYPE loc = void_param->get_location();

+

+      _mesa_glsl_error(& loc, state,

+		       "`void' parameter must be only parameter");

+   }

+}

+

+

+void

+emit_function(_mesa_glsl_parse_state *state, exec_list *instructions,

+	      ir_function *f)

+{

+   /* Emit the new function header */

+   if (state->current_function == NULL) {

+      instructions->push_tail(f);

+   } else {

+      /* IR invariants disallow function declarations or definitions nested

+       * within other function definitions.  Insert the new ir_function

+       * block in the instruction sequence before the ir_function block

+       * containing the current ir_function_signature.

+       */

+      ir_function *const curr =

+	 const_cast<ir_function *>(state->current_function->function());

+

+      curr->insert_before(f);

+   }

+}

+

+

+ir_rvalue *

+ast_function::hir(exec_list *instructions,

+		  struct _mesa_glsl_parse_state *state)

+{

+   void *ctx = state;

+   ir_function *f = NULL;

+   ir_function_signature *sig = NULL;

+   exec_list hir_parameters;

+

+   const char *const name = identifier;

+

+   /* From page 21 (page 27 of the PDF) of the GLSL 1.20 spec,

+    *

+    *   "Function declarations (prototypes) cannot occur inside of functions;

+    *   they must be at global scope, or for the built-in functions, outside

+    *   the global scope."

+    *

+    * From page 27 (page 33 of the PDF) of the GLSL ES 1.00.16 spec,

+    *

+    *   "User defined functions may only be defined within the global scope."

+    *

+    * Note that this language does not appear in GLSL 1.10.

+    */

+   if ((state->current_function != NULL) && (state->language_version != 110)) {

+      YYLTYPE loc = this->get_location();

+      _mesa_glsl_error(&loc, state,

+		       "declaration of function `%s' not allowed within "

+		       "function body", name);

+   }

+

+   /* From page 15 (page 21 of the PDF) of the GLSL 1.10 spec,

+    *

+    *   "Identifiers starting with "gl_" are reserved for use by

+    *   OpenGL, and may not be declared in a shader as either a

+    *   variable or a function."

+    */

+   if (strncmp(name, "gl_", 3) == 0) {

+      YYLTYPE loc = this->get_location();

+      _mesa_glsl_error(&loc, state,

+		       "identifier `%s' uses reserved `gl_' prefix", name);

+   }

+

+   /* Convert the list of function parameters to HIR now so that they can be

+    * used below to compare this function's signature with previously seen

+    * signatures for functions with the same name.

+    */

+   ast_parameter_declarator::parameters_to_hir(& this->parameters,

+					       is_definition,

+					       & hir_parameters, state);

+

+   const char *return_type_name;

+   const glsl_type *return_type =

+      this->return_type->specifier->glsl_type(& return_type_name, state);

+

+   if (!return_type) {

+      YYLTYPE loc = this->get_location();

+      _mesa_glsl_error(&loc, state,

+		       "function `%s' has undeclared return type `%s'",

+		       name, return_type_name);

+      return_type = glsl_type::error_type;

+   }

+

+   /* From page 56 (page 62 of the PDF) of the GLSL 1.30 spec:

+    * "No qualifier is allowed on the return type of a function."

+    */

+   if (this->return_type->has_qualifiers()) {

+      YYLTYPE loc = this->get_location();

+      _mesa_glsl_error(& loc, state,

+		       "function `%s' return type has qualifiers", name);

+   }

+

+   /* Verify that this function's signature either doesn't match a previously

+    * seen signature for a function with the same name, or, if a match is found,

+    * that the previously seen signature does not have an associated definition.

+    */

+   f = state->symbols->get_function(name);

+   if (f != NULL && (state->es_shader || f->has_user_signature())) {

+      sig = f->exact_matching_signature(&hir_parameters);

+      if (sig != NULL) {

+	 const char *badvar = sig->qualifiers_match(&hir_parameters);

+	 if (badvar != NULL) {

+	    YYLTYPE loc = this->get_location();

+

+	    _mesa_glsl_error(&loc, state, "function `%s' parameter `%s' "

+			     "qualifiers don't match prototype", name, badvar);

+	 }

+

+	 if (sig->return_type != return_type) {

+	    YYLTYPE loc = this->get_location();

+

+	    _mesa_glsl_error(&loc, state, "function `%s' return type doesn't "

+			     "match prototype", name);

+	 }

+

+	 if (is_definition && sig->is_defined) {

+	    YYLTYPE loc = this->get_location();

+

+	    _mesa_glsl_error(& loc, state, "function `%s' redefined", name);

+	 }

+      }

+   } else {

+      f = new(ctx) ir_function(name);

+      if (!state->symbols->add_function(f)) {

+	 /* This function name shadows a non-function use of the same name. */

+	 YYLTYPE loc = this->get_location();

+

+	 _mesa_glsl_error(&loc, state, "function name `%s' conflicts with "

+			  "non-function", name);

+	 return NULL;

+      }

+

+      emit_function(state, instructions, f);

+   }

+

+   /* Verify the return type of main() */

+   if (strcmp(name, "main") == 0) {

+      if (! return_type->is_void()) {

+	 YYLTYPE loc = this->get_location();

+

+	 _mesa_glsl_error(& loc, state, "main() must return void");

+      }

+

+      if (!hir_parameters.is_empty()) {

+	 YYLTYPE loc = this->get_location();

+

+	 _mesa_glsl_error(& loc, state, "main() must not take any parameters");

+      }

+   }

+

+   /* Finish storing the information about this new function in its signature.

+    */

+   if (sig == NULL) {

+      sig = new(ctx) ir_function_signature(return_type);

+      f->add_signature(sig);

+   }

+

+   sig->replace_parameters(&hir_parameters);

+   signature = sig;

+

+   /* Function declarations (prototypes) do not have r-values.

+    */

+   return NULL;

+}

+

+

+ir_rvalue *

+ast_function_definition::hir(exec_list *instructions,

+			     struct _mesa_glsl_parse_state *state)

+{

+   prototype->is_definition = true;

+   prototype->hir(instructions, state);

+

+   ir_function_signature *signature = prototype->signature;

+   if (signature == NULL)

+      return NULL;

+

+   assert(state->current_function == NULL);

+   state->current_function = signature;

+   state->found_return = false;

+

+   /* Duplicate parameters declared in the prototype as concrete variables.

+    * Add these to the symbol table.

+    */

+   state->symbols->push_scope();

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

+      ir_variable *const var = ((ir_instruction *) iter.get())->as_variable();

+

+      assert(var != NULL);

+

+      /* The only way a parameter would "exist" is if two parameters have

+       * the same name.

+       */

+      if (state->symbols->name_declared_this_scope(var->name)) {

+	 YYLTYPE loc = this->get_location();

+

+	 _mesa_glsl_error(& loc, state, "parameter `%s' redeclared", var->name);

+      } else {

+	 state->symbols->add_variable(var);

+      }

+   }

+

+   /* Convert the body of the function to HIR. */

+   this->body->hir(&signature->body, state);

+   signature->is_defined = true;

+

+   state->symbols->pop_scope();

+

+   assert(state->current_function == signature);

+   state->current_function = NULL;

+

+   if (!signature->return_type->is_void() && !state->found_return) {

+      YYLTYPE loc = this->get_location();

+      _mesa_glsl_error(& loc, state, "function `%s' has non-void return type "

+		       "%s, but no return statement",

+		       signature->function_name(),

+		       signature->return_type->name);

+   }

+

+   /* Function definitions do not have r-values.

+    */

+   return NULL;

+}

+

+

+ir_rvalue *

+ast_jump_statement::hir(exec_list *instructions,

+			struct _mesa_glsl_parse_state *state)

+{

+   void *ctx = state;

+

+   switch (mode) {

+   case ast_return: {

+      ir_return *inst;

+      assert(state->current_function);

+

+      if (opt_return_value) {

+	 ir_rvalue *const ret = opt_return_value->hir(instructions, state);

+

+	 /* The value of the return type can be NULL if the shader says

+	  * 'return foo();' and foo() is a function that returns void.

+	  *

+	  * NOTE: The GLSL spec doesn't say that this is an error.  The type

+	  * of the return value is void.  If the return type of the function is

+	  * also void, then this should compile without error.  Seriously.

+	  */

+	 const glsl_type *const ret_type =

+	    (ret == NULL) ? glsl_type::void_type : ret->type;

+

+	 /* Implicit conversions are not allowed for return values. */

+	 if (state->current_function->return_type != ret_type) {

+	    YYLTYPE loc = this->get_location();

+

+	    _mesa_glsl_error(& loc, state,

+			     "`return' with wrong type %s, in function `%s' "

+			     "returning %s",

+			     ret_type->name,

+			     state->current_function->function_name(),

+			     state->current_function->return_type->name);

+	 }

+

+	 inst = new(ctx) ir_return(ret);

+      } else {

+	 if (state->current_function->return_type->base_type !=

+	     GLSL_TYPE_VOID) {

+	    YYLTYPE loc = this->get_location();

+

+	    _mesa_glsl_error(& loc, state,

+			     "`return' with no value, in function %s returning "

+			     "non-void",

+			     state->current_function->function_name());

+	 }

+	 inst = new(ctx) ir_return;

+      }

+

+      state->found_return = true;

+      instructions->push_tail(inst);

+      break;

+   }

+

+   case ast_discard:

+      if (state->target != fragment_shader) {

+	 YYLTYPE loc = this->get_location();

+

+	 _mesa_glsl_error(& loc, state,

+			  "`discard' may only appear in a fragment shader");

+      }

+      instructions->push_tail(new(ctx) ir_discard);

+      break;

+

+   case ast_break:

+   case ast_continue:

+      /* FINISHME: Handle switch-statements.  They cannot contain 'continue',

+       * FINISHME: and they use a different IR instruction for 'break'.

+       */

+      /* FINISHME: Correctly handle the nesting.  If a switch-statement is

+       * FINISHME: inside a loop, a 'continue' is valid and will bind to the

+       * FINISHME: loop.

+       */

+      if (state->loop_or_switch_nesting == NULL) {

+	 YYLTYPE loc = this->get_location();

+

+	 _mesa_glsl_error(& loc, state,

+			  "`%s' may only appear in a loop",

+			  (mode == ast_break) ? "break" : "continue");

+      } else {

+	 ir_loop *const loop = state->loop_or_switch_nesting->as_loop();

+

+	 /* Inline the for loop expression again, since we don't know

+	  * where near the end of the loop body the normal copy of it

+	  * is going to be placed.

+	  */

+	 if (mode == ast_continue &&

+	     state->loop_or_switch_nesting_ast->rest_expression) {

+	    state->loop_or_switch_nesting_ast->rest_expression->hir(instructions,

+								    state);

+	 }

+

+	 if (loop != NULL) {

+	    ir_loop_jump *const jump =

+	       new(ctx) ir_loop_jump((mode == ast_break)

+				     ? ir_loop_jump::jump_break

+				     : ir_loop_jump::jump_continue);

+	    instructions->push_tail(jump);

+	 }

+      }

+

+      break;

+   }

+

+   /* Jump instructions do not have r-values.

+    */

+   return NULL;

+}

+

+

+ir_rvalue *

+ast_selection_statement::hir(exec_list *instructions,

+			     struct _mesa_glsl_parse_state *state)

+{

+   void *ctx = state;

+

+   ir_rvalue *const condition = this->condition->hir(instructions, state);

+

+   /* From page 66 (page 72 of the PDF) of the GLSL 1.50 spec:

+    *

+    *    "Any expression whose type evaluates to a Boolean can be used as the

+    *    conditional expression bool-expression. Vector types are not accepted

+    *    as the expression to if."

+    *

+    * The checks are separated so that higher quality diagnostics can be

+    * generated for cases where both rules are violated.

+    */

+   if (!condition->type->is_boolean() || !condition->type->is_scalar()) {

+      YYLTYPE loc = this->condition->get_location();

+

+      _mesa_glsl_error(& loc, state, "if-statement condition must be scalar "

+		       "boolean");

+   }

+

+   ir_if *const stmt = new(ctx) ir_if(condition);

+

+   if (then_statement != NULL) {

+      state->symbols->push_scope();

+      then_statement->hir(& stmt->then_instructions, state);

+      state->symbols->pop_scope();

+   }

+

+   if (else_statement != NULL) {

+      state->symbols->push_scope();

+      else_statement->hir(& stmt->else_instructions, state);

+      state->symbols->pop_scope();

+   }

+

+   instructions->push_tail(stmt);

+

+   /* if-statements do not have r-values.

+    */

+   return NULL;

+}

+

+

+void

+ast_iteration_statement::condition_to_hir(ir_loop *stmt,

+					  struct _mesa_glsl_parse_state *state)

+{

+   void *ctx = state;

+

+   if (condition != NULL) {

+      ir_rvalue *const cond =

+	 condition->hir(& stmt->body_instructions, state);

+

+      if ((cond == NULL)

+	  || !cond->type->is_boolean() || !cond->type->is_scalar()) {

+	 YYLTYPE loc = condition->get_location();

+

+	 _mesa_glsl_error(& loc, state,

+			  "loop condition must be scalar boolean");

+      } else {

+	 /* As the first code in the loop body, generate a block that looks

+	  * like 'if (!condition) break;' as the loop termination condition.

+	  */

+	 ir_rvalue *const not_cond =

+	    new(ctx) ir_expression(ir_unop_logic_not, glsl_type::bool_type, cond,

+				   NULL);

+

+	 ir_if *const if_stmt = new(ctx) ir_if(not_cond);

+

+	 ir_jump *const break_stmt =

+	    new(ctx) ir_loop_jump(ir_loop_jump::jump_break);

+

+	 if_stmt->then_instructions.push_tail(break_stmt);

+	 stmt->body_instructions.push_tail(if_stmt);

+      }

+   }

+}

+

+

+ir_rvalue *

+ast_iteration_statement::hir(exec_list *instructions,

+			     struct _mesa_glsl_parse_state *state)

+{

+   void *ctx = state;

+

+   /* For-loops and while-loops start a new scope, but do-while loops do not.

+    */

+   if (mode != ast_do_while)

+      state->symbols->push_scope();

+

+   if (init_statement != NULL)

+      init_statement->hir(instructions, state);

+

+   ir_loop *const stmt = new(ctx) ir_loop();

+   instructions->push_tail(stmt);

+

+   /* Track the current loop and / or switch-statement nesting.

+    */

+   ir_instruction *const nesting = state->loop_or_switch_nesting;

+   ast_iteration_statement *nesting_ast = state->loop_or_switch_nesting_ast;

+

+   state->loop_or_switch_nesting = stmt;

+   state->loop_or_switch_nesting_ast = this;

+

+   if (mode != ast_do_while)

+      condition_to_hir(stmt, state);

+

+   if (body != NULL)

+      body->hir(& stmt->body_instructions, state);

+

+   if (rest_expression != NULL)

+      rest_expression->hir(& stmt->body_instructions, state);

+

+   if (mode == ast_do_while)

+      condition_to_hir(stmt, state);

+

+   if (mode != ast_do_while)

+      state->symbols->pop_scope();

+

+   /* Restore previous nesting before returning.

+    */

+   state->loop_or_switch_nesting = nesting;

+   state->loop_or_switch_nesting_ast = nesting_ast;

+

+   /* Loops do not have r-values.

+    */

+   return NULL;

+}

+

+

+ir_rvalue *

+ast_type_specifier::hir(exec_list *instructions,

+			  struct _mesa_glsl_parse_state *state)

+{

+   if (!this->is_precision_statement && this->structure == NULL)

+      return NULL;

+

+   YYLTYPE loc = this->get_location();

+

+   if (this->precision != ast_precision_none

+       && state->language_version != 100

+       && state->language_version < 130) {

+      _mesa_glsl_error(&loc, state,

+                       "precision qualifiers exist only in "

+                       "GLSL ES 1.00, and GLSL 1.30 and later");

+      return NULL;

+   }

+   if (this->precision != ast_precision_none

+       && this->structure != NULL) {

+      _mesa_glsl_error(&loc, state,

+                       "precision qualifiers do not apply to structures");

+      return NULL;

+   }

+

+   /* If this is a precision statement, check that the type to which it is

+    * applied is either float or int.

+    *

+    * From section 4.5.3 of the GLSL 1.30 spec:

+    *    "The precision statement

+    *       precision precision-qualifier type;

+    *    can be used to establish a default precision qualifier. The type

+    *    field can be either int or float [...].  Any other types or

+    *    qualifiers will result in an error.

+    */

+   if (this->is_precision_statement) {

+      assert(this->precision != ast_precision_none);

+      assert(this->structure == NULL); /* The check for structures was

+                                        * performed above. */

+      if (this->is_array) {

+         _mesa_glsl_error(&loc, state,

+                          "default precision statements do not apply to "

+                          "arrays");

+         return NULL;

+      }

+      if (this->type_specifier != ast_float

+          && this->type_specifier != ast_int) {

+         _mesa_glsl_error(&loc, state,

+                          "default precision statements apply only to types "

+                          "float and int");

+         return NULL;

+      }

+

+      /* FINISHME: Translate precision statements into IR. */

+      return NULL;

+   }

+

+   if (this->structure != NULL)

+      return this->structure->hir(instructions, state);

+

+   return NULL;

+}

+

+

+ir_rvalue *

+ast_struct_specifier::hir(exec_list *instructions,

+			  struct _mesa_glsl_parse_state *state)

+{

+   unsigned decl_count = 0;

+

+   /* Make an initial pass over the list of structure fields to determine how

+    * many there are.  Each element in this list is an ast_declarator_list.

+    * This means that we actually need to count the number of elements in the

+    * 'declarations' list in each of the elements.

+    */

+   foreach_list_typed (ast_declarator_list, decl_list, link,

+		       &this->declarations) {

+      foreach_list_const (decl_ptr, & decl_list->declarations) {

+	 decl_count++;

+      }

+   }

+

+   /* Allocate storage for the structure fields and process the field

+    * declarations.  As the declarations are processed, try to also convert

+    * the types to HIR.  This ensures that structure definitions embedded in

+    * other structure definitions are processed.

+    */

+   glsl_struct_field *const fields = ralloc_array(state, glsl_struct_field,

+						  decl_count);

+

+   unsigned i = 0;

+   foreach_list_typed (ast_declarator_list, decl_list, link,

+		       &this->declarations) {

+      const char *type_name;

+

+      decl_list->type->specifier->hir(instructions, state);

+

+      /* Section 10.9 of the GLSL ES 1.00 specification states that

+       * embedded structure definitions have been removed from the language.

+       */

+      if (state->es_shader && decl_list->type->specifier->structure != NULL) {

+	 YYLTYPE loc = this->get_location();

+	 _mesa_glsl_error(&loc, state, "Embedded structure definitions are "

+			  "not allowed in GLSL ES 1.00.");

+      }

+

+      const glsl_type *decl_type =

+	 decl_list->type->specifier->glsl_type(& type_name, state);

+

+      foreach_list_typed (ast_declaration, decl, link,

+			  &decl_list->declarations) {

+	 const struct glsl_type *field_type = decl_type;

+	 if (decl->is_array) {

+	    YYLTYPE loc = decl->get_location();

+	    field_type = process_array_type(&loc, decl_type, decl->array_size,

+					    state);

+	 }

+	 fields[i].type = (field_type != NULL)

+	    ? field_type : glsl_type::error_type;

+	 fields[i].name = decl->identifier;

+	 i++;

+      }

+   }

+

+   assert(i == decl_count);

+

+   const glsl_type *t =

+      glsl_type::get_record_instance(fields, decl_count, this->name);

+

+   YYLTYPE loc = this->get_location();

+   if (!state->symbols->add_type(name, t)) {

+      _mesa_glsl_error(& loc, state, "struct `%s' previously defined", name);

+   } else {

+      const glsl_type **s = reralloc(state, state->user_structures,

+				     const glsl_type *,

+				     state->num_user_structures + 1);

+      if (s != NULL) {

+	 s[state->num_user_structures] = t;

+	 state->user_structures = s;

+	 state->num_user_structures++;

+      }

+   }

+

+   /* Structure type definitions do not have r-values.

+    */

+   return NULL;

+}

diff --git a/mesalib/src/glsl/glcpp/glcpp-lex.l b/mesalib/src/glsl/glcpp/glcpp-lex.l
index 68e44eb79..596c6db70 100644
--- a/mesalib/src/glsl/glcpp/glcpp-lex.l
+++ b/mesalib/src/glsl/glcpp/glcpp-lex.l
@@ -1,320 +1,324 @@
-%{
-/*
- * 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 <stdio.h>
-#include <string.h>
-#include <ctype.h>
-
-#include "glcpp.h"
-#include "glcpp-parse.h"
-
-/* Flex annoyingly generates some functions without making them
- * static. Let's declare them here. */
-int glcpp_get_column  (yyscan_t yyscanner);
-void glcpp_set_column (int  column_no , yyscan_t yyscanner);
-
-#define YY_NO_INPUT
-
-#define YY_USER_ACTION                                          \
-   do {                                                         \
-      yylloc->first_column = yycolumn + 1;                      \
-      yylloc->first_line = yylineno;                            \
-      yycolumn += yyleng;                                       \
-   } while(0);
-
-#define YY_USER_INIT			\
-	do {				\
-		yylineno = 1;		\
-		yycolumn = 1;		\
-		yylloc->source = 0;	\
-	} while(0)
-%}
-
-%option bison-bridge bison-locations reentrant noyywrap
-%option extra-type="glcpp_parser_t *"
-%option prefix="glcpp_"
-%option stack
-%option never-interactive
-
-%x DONE COMMENT UNREACHABLE SKIP
-
-SPACE		[[:space:]]
-NONSPACE	[^[:space:]]
-NEWLINE		[\n]
-HSPACE		[ \t]
-HASH		^{HSPACE}*#{HSPACE}*
-IDENTIFIER	[_a-zA-Z][_a-zA-Z0-9]*
-PUNCTUATION	[][(){}.&*~!/%<>^|;,=+-]
-OTHER		[^][(){}.&*~!/%<>^|;,=#[:space:]+-]+
-
-DIGITS			[0-9][0-9]*
-DECIMAL_INTEGER		[1-9][0-9]*[uU]?
-OCTAL_INTEGER		0[0-7]*[uU]?
-HEXADECIMAL_INTEGER	0[xX][0-9a-fA-F]+[uU]?
-
-%%
-	/* Implicitly switch between SKIP and INITIAL (non-skipping);
-	 * don't switch if some other state was explicitly set.
-	 */
-	glcpp_parser_t *parser = yyextra;
-	if (YY_START == 0 || YY_START == SKIP) {
-		if (parser->lexing_if || parser->skip_stack == NULL || parser->skip_stack->type == SKIP_NO_SKIP) {
-			BEGIN 0;
-		} else {
-			BEGIN SKIP;
-		}
-	}
-
-	/* Single-line comments */
-"//"[^\n]* {
-}
-
-	/* Multi-line comments */
-"/*"                    { yy_push_state(COMMENT, yyscanner); }
-<COMMENT>[^*\n]*
-<COMMENT>[^*\n]*\n      { yylineno++; yycolumn = 0; return NEWLINE; }
-<COMMENT>"*"+[^*/\n]*
-<COMMENT>"*"+[^*/\n]*\n { yylineno++; yycolumn = 0; return NEWLINE; }
-<COMMENT>"*"+"/"        {
-	yy_pop_state(yyscanner);
-	if (yyextra->space_tokens)
-		return SPACE;
-}
-
-{HASH}version {
-	yylval->str = ralloc_strdup (yyextra, yytext);
-	yyextra->space_tokens = 0;
-	return HASH_VERSION;
-}
-
-	/* glcpp doesn't handle #extension, #version, or #pragma directives.
-	 * Simply pass them through to the main compiler's lexer/parser. */
-{HASH}(extension|pragma)[^\n]+ {
-	yylval->str = ralloc_strdup (yyextra, yytext);
-	yylineno++;
-	yycolumn = 0;
-	return OTHER;
-}
-
-{HASH}line{HSPACE}+{DIGITS}{HSPACE}+{DIGITS}{HSPACE}*$ {
-	/* Eat characters until the first digit is
-	 * encountered
-	 */
-	char *ptr = yytext;
-	while (!isdigit(*ptr))
-		ptr++;
-
-	/* Subtract one from the line number because
-	 * yylineno is zero-based instead of
-	 * one-based.
-	 */
-	yylineno = strtol(ptr, &ptr, 0) - 1;
-	yylloc->source = strtol(ptr, NULL, 0);
-}
-
-{HASH}line{HSPACE}+{DIGITS}{HSPACE}*$ {
-	/* Eat characters until the first digit is
-	 * encountered
-	 */
-	char *ptr = yytext;
-	while (!isdigit(*ptr))
-		ptr++;
-
-	/* Subtract one from the line number because
-	 * yylineno is zero-based instead of
-	 * one-based.
-	 */
-	yylineno = strtol(ptr, &ptr, 0) - 1;
-}
-
-<SKIP,INITIAL>{
-{HASH}ifdef {
-	yyextra->lexing_if = 1;
-	yyextra->space_tokens = 0;
-	return HASH_IFDEF;
-}
-
-{HASH}ifndef {
-	yyextra->lexing_if = 1;
-	yyextra->space_tokens = 0;
-	return HASH_IFNDEF;
-}
-
-{HASH}if/[^_a-zA-Z0-9] {
-	yyextra->lexing_if = 1;
-	yyextra->space_tokens = 0;
-	return HASH_IF;
-}
-
-{HASH}elif {
-	yyextra->lexing_if = 1;
-	yyextra->space_tokens = 0;
-	return HASH_ELIF;
-}
-
-{HASH}else {
-	yyextra->space_tokens = 0;
-	return HASH_ELSE;
-}
-
-{HASH}endif {
-	yyextra->space_tokens = 0;
-	return HASH_ENDIF;
-}
-}
-
-<SKIP>[^\n] ;
-
-{HASH}error.* {
-	char *p;
-	for (p = yytext; !isalpha(p[0]); p++); /* skip "  #   " */
-	p += 5; /* skip "error" */
-	glcpp_error(yylloc, yyextra, "#error%s", p);
-}
-
-{HASH}define{HSPACE}+/{IDENTIFIER}"(" {
-	yyextra->space_tokens = 0;
-	return HASH_DEFINE_FUNC;
-}
-
-{HASH}define {
-	yyextra->space_tokens = 0;
-	return HASH_DEFINE_OBJ;
-}
-
-{HASH}undef {
-	yyextra->space_tokens = 0;
-	return HASH_UNDEF;
-}
-
-{HASH} {
-	yyextra->space_tokens = 0;
-	return HASH;
-}
-
-{DECIMAL_INTEGER} {
-	yylval->str = ralloc_strdup (yyextra, yytext);
-	return INTEGER_STRING;
-}
-
-{OCTAL_INTEGER} {
-	yylval->str = ralloc_strdup (yyextra, yytext);
-	return INTEGER_STRING;
-}
-
-{HEXADECIMAL_INTEGER} {
-	yylval->str = ralloc_strdup (yyextra, yytext);
-	return INTEGER_STRING;
-}
-
-"<<"  {
-	return LEFT_SHIFT;
-}
-
-">>" {
-	return RIGHT_SHIFT;
-}
-
-"<=" {
-	return LESS_OR_EQUAL;
-}
-
-">=" {
-	return GREATER_OR_EQUAL;
-}
-
-"==" {
-	return EQUAL;
-}
-
-"!=" {
-	return NOT_EQUAL;
-}
-
-"&&" {
-	return AND;
-}
-
-"||" {
-	return OR;
-}
-
-"##" {
-	return PASTE;
-}
-
-"defined" {
-	return DEFINED;
-}
-
-{IDENTIFIER} {
-	yylval->str = ralloc_strdup (yyextra, yytext);
-	return IDENTIFIER;
-}
-
-{PUNCTUATION} {
-	return yytext[0];
-}
-
-{OTHER}+ {
-	yylval->str = ralloc_strdup (yyextra, yytext);
-	return OTHER;
-}
-
-{HSPACE}+ {
-	if (yyextra->space_tokens) {
-		return SPACE;
-	}
-}
-
-<SKIP,INITIAL>\n {
-	yyextra->lexing_if = 0;
-	yylineno++;
-	yycolumn = 0;
-	return NEWLINE;
-}
-
-	/* Handle missing newline at EOF. */
-<INITIAL><<EOF>> {
-	BEGIN DONE; /* Don't keep matching this rule forever. */
-	yyextra->lexing_if = 0;
-	return NEWLINE;
-}
-
-	/* We don't actually use the UNREACHABLE start condition. We
-	only have this action here so that we can pretend to call some
-	generated functions, (to avoid "defined but not used"
-	warnings. */
-<UNREACHABLE>. {
-	unput('.');
-	yy_top_state(yyextra);
-}
-
-%%
-
-void
-glcpp_lex_set_source_string(glcpp_parser_t *parser, const char *shader)
-{
-	yy_scan_string(shader, parser->scanner);
-}
+%{

+/*

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

+#include <string.h>

+#include <ctype.h>

+

+#include "glcpp.h"

+#include "glcpp-parse.h"

+

+/* Flex annoyingly generates some functions without making them

+ * static. Let's declare them here. */

+int glcpp_get_column  (yyscan_t yyscanner);

+void glcpp_set_column (int  column_no , yyscan_t yyscanner);

+

+#ifdef _MSC_VER

+#define YY_NO_UNISTD_H

+#endif

+

+#define YY_NO_INPUT

+

+#define YY_USER_ACTION                                          \

+   do {                                                         \

+      yylloc->first_column = yycolumn + 1;                      \

+      yylloc->first_line = yylineno;                            \

+      yycolumn += yyleng;                                       \

+   } while(0);

+

+#define YY_USER_INIT			\

+	do {				\

+		yylineno = 1;		\

+		yycolumn = 1;		\

+		yylloc->source = 0;	\

+	} while(0)

+%}

+

+%option bison-bridge bison-locations reentrant noyywrap

+%option extra-type="glcpp_parser_t *"

+%option prefix="glcpp_"

+%option stack

+%option never-interactive

+

+%x DONE COMMENT UNREACHABLE SKIP

+

+SPACE		[[:space:]]

+NONSPACE	[^[:space:]]

+NEWLINE		[\n]

+HSPACE		[ \t]

+HASH		^{HSPACE}*#{HSPACE}*

+IDENTIFIER	[_a-zA-Z][_a-zA-Z0-9]*

+PUNCTUATION	[][(){}.&*~!/%<>^|;,=+-]

+OTHER		[^][(){}.&*~!/%<>^|;,=#[:space:]+-]+

+

+DIGITS			[0-9][0-9]*

+DECIMAL_INTEGER		[1-9][0-9]*[uU]?

+OCTAL_INTEGER		0[0-7]*[uU]?

+HEXADECIMAL_INTEGER	0[xX][0-9a-fA-F]+[uU]?

+

+%%

+	/* Implicitly switch between SKIP and INITIAL (non-skipping);

+	 * don't switch if some other state was explicitly set.

+	 */

+	glcpp_parser_t *parser = yyextra;

+	if (YY_START == 0 || YY_START == SKIP) {

+		if (parser->lexing_if || parser->skip_stack == NULL || parser->skip_stack->type == SKIP_NO_SKIP) {

+			BEGIN 0;

+		} else {

+			BEGIN SKIP;

+		}

+	}

+

+	/* Single-line comments */

+"//"[^\n]* {

+}

+

+	/* Multi-line comments */

+"/*"                    { yy_push_state(COMMENT, yyscanner); }

+<COMMENT>[^*\n]*

+<COMMENT>[^*\n]*\n      { yylineno++; yycolumn = 0; return NEWLINE; }

+<COMMENT>"*"+[^*/\n]*

+<COMMENT>"*"+[^*/\n]*\n { yylineno++; yycolumn = 0; return NEWLINE; }

+<COMMENT>"*"+"/"        {

+	yy_pop_state(yyscanner);

+	if (yyextra->space_tokens)

+		return SPACE;

+}

+

+{HASH}version {

+	yylval->str = ralloc_strdup (yyextra, yytext);

+	yyextra->space_tokens = 0;

+	return HASH_VERSION;

+}

+

+	/* glcpp doesn't handle #extension, #version, or #pragma directives.

+	 * Simply pass them through to the main compiler's lexer/parser. */

+{HASH}(extension|pragma)[^\n]+ {

+	yylval->str = ralloc_strdup (yyextra, yytext);

+	yylineno++;

+	yycolumn = 0;

+	return OTHER;

+}

+

+{HASH}line{HSPACE}+{DIGITS}{HSPACE}+{DIGITS}{HSPACE}*$ {

+	/* Eat characters until the first digit is

+	 * encountered

+	 */

+	char *ptr = yytext;

+	while (!isdigit(*ptr))

+		ptr++;

+

+	/* Subtract one from the line number because

+	 * yylineno is zero-based instead of

+	 * one-based.

+	 */

+	yylineno = strtol(ptr, &ptr, 0) - 1;

+	yylloc->source = strtol(ptr, NULL, 0);

+}

+

+{HASH}line{HSPACE}+{DIGITS}{HSPACE}*$ {

+	/* Eat characters until the first digit is

+	 * encountered

+	 */

+	char *ptr = yytext;

+	while (!isdigit(*ptr))

+		ptr++;

+

+	/* Subtract one from the line number because

+	 * yylineno is zero-based instead of

+	 * one-based.

+	 */

+	yylineno = strtol(ptr, &ptr, 0) - 1;

+}

+

+<SKIP,INITIAL>{

+{HASH}ifdef {

+	yyextra->lexing_if = 1;

+	yyextra->space_tokens = 0;

+	return HASH_IFDEF;

+}

+

+{HASH}ifndef {

+	yyextra->lexing_if = 1;

+	yyextra->space_tokens = 0;

+	return HASH_IFNDEF;

+}

+

+{HASH}if/[^_a-zA-Z0-9] {

+	yyextra->lexing_if = 1;

+	yyextra->space_tokens = 0;

+	return HASH_IF;

+}

+

+{HASH}elif {

+	yyextra->lexing_if = 1;

+	yyextra->space_tokens = 0;

+	return HASH_ELIF;

+}

+

+{HASH}else {

+	yyextra->space_tokens = 0;

+	return HASH_ELSE;

+}

+

+{HASH}endif {

+	yyextra->space_tokens = 0;

+	return HASH_ENDIF;

+}

+}

+

+<SKIP>[^\n] ;

+

+{HASH}error.* {

+	char *p;

+	for (p = yytext; !isalpha(p[0]); p++); /* skip "  #   " */

+	p += 5; /* skip "error" */

+	glcpp_error(yylloc, yyextra, "#error%s", p);

+}

+

+{HASH}define{HSPACE}+/{IDENTIFIER}"(" {

+	yyextra->space_tokens = 0;

+	return HASH_DEFINE_FUNC;

+}

+

+{HASH}define {

+	yyextra->space_tokens = 0;

+	return HASH_DEFINE_OBJ;

+}

+

+{HASH}undef {

+	yyextra->space_tokens = 0;

+	return HASH_UNDEF;

+}

+

+{HASH} {

+	yyextra->space_tokens = 0;

+	return HASH;

+}

+

+{DECIMAL_INTEGER} {

+	yylval->str = ralloc_strdup (yyextra, yytext);

+	return INTEGER_STRING;

+}

+

+{OCTAL_INTEGER} {

+	yylval->str = ralloc_strdup (yyextra, yytext);

+	return INTEGER_STRING;

+}

+

+{HEXADECIMAL_INTEGER} {

+	yylval->str = ralloc_strdup (yyextra, yytext);

+	return INTEGER_STRING;

+}

+

+"<<"  {

+	return LEFT_SHIFT;

+}

+

+">>" {

+	return RIGHT_SHIFT;

+}

+

+"<=" {

+	return LESS_OR_EQUAL;

+}

+

+">=" {

+	return GREATER_OR_EQUAL;

+}

+

+"==" {

+	return EQUAL;

+}

+

+"!=" {

+	return NOT_EQUAL;

+}

+

+"&&" {

+	return AND;

+}

+

+"||" {

+	return OR;

+}

+

+"##" {

+	return PASTE;

+}

+

+"defined" {

+	return DEFINED;

+}

+

+{IDENTIFIER} {

+	yylval->str = ralloc_strdup (yyextra, yytext);

+	return IDENTIFIER;

+}

+

+{PUNCTUATION} {

+	return yytext[0];

+}

+

+{OTHER}+ {

+	yylval->str = ralloc_strdup (yyextra, yytext);

+	return OTHER;

+}

+

+{HSPACE}+ {

+	if (yyextra->space_tokens) {

+		return SPACE;

+	}

+}

+

+<SKIP,INITIAL>\n {

+	yyextra->lexing_if = 0;

+	yylineno++;

+	yycolumn = 0;

+	return NEWLINE;

+}

+

+	/* Handle missing newline at EOF. */

+<INITIAL><<EOF>> {

+	BEGIN DONE; /* Don't keep matching this rule forever. */

+	yyextra->lexing_if = 0;

+	return NEWLINE;

+}

+

+	/* We don't actually use the UNREACHABLE start condition. We

+	only have this action here so that we can pretend to call some

+	generated functions, (to avoid "defined but not used"

+	warnings. */

+<UNREACHABLE>. {

+	unput('.');

+	yy_top_state(yyextra);

+}

+

+%%

+

+void

+glcpp_lex_set_source_string(glcpp_parser_t *parser, const char *shader)

+{

+	yy_scan_string(shader, parser->scanner);

+}

diff --git a/mesalib/src/glsl/glcpp/glcpp.c b/mesalib/src/glsl/glcpp/glcpp.c
index 564194caa..63eb061c2 100644
--- a/mesalib/src/glsl/glcpp/glcpp.c
+++ b/mesalib/src/glsl/glcpp/glcpp.c
@@ -1,131 +1,121 @@
-/*
- * 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 <sys/types.h>
-#include <sys/stat.h>
-#include <fcntl.h>
-#include <unistd.h>
-#include <string.h>
-#include <errno.h>
-#include "glcpp.h"
-#include "main/mtypes.h"
-#include "main/shaderobj.h"
-
-extern int yydebug;
-
-void
-_mesa_reference_shader(struct gl_context *ctx, struct gl_shader **ptr,
-                       struct gl_shader *sh)
-{
-   *ptr = sh;
-}
-
-/* Read from fd until EOF and return a string of everything read.
- */
-static char *
-load_text_fd (void *ctx, int fd)
-{
-#define CHUNK 4096
-	char *text = NULL;
-	ssize_t text_size = 0;
-	ssize_t total_read = 0;
-	ssize_t bytes;
-
-	while (1) {
-		if (total_read + CHUNK + 1 > text_size) {
-			text_size = text_size ? text_size * 2 : CHUNK + 1;
-			text = reralloc_size (ctx, text, text_size);
-			if (text == NULL) {
-				fprintf (stderr, "Out of memory\n");
-				return NULL;
-			}
-		}
-		bytes = read (fd, text + total_read, CHUNK);
-		if (bytes < 0) {
-			fprintf (stderr, "Error while reading: %s\n",
-				 strerror (errno));
-			ralloc_free (text);
-			return NULL;
-		}
-
-		if (bytes == 0) {
-			break;
-		}
-
-		total_read += bytes;
-	}
-
-	text[total_read] = '\0';
-
-	return text;
-}
-
-static char *
-load_text_file(void *ctx, const char *filename)
-{
-	char *text;
-	int fd;
-
-	if (filename == NULL || strcmp (filename, "-") == 0)
-		return load_text_fd (ctx, STDIN_FILENO);
-
-	fd = open (filename, O_RDONLY);
-	if (fd < 0) {
-		fprintf (stderr, "Failed to open file %s: %s\n",
-			 filename, strerror (errno));
-		return NULL;
-	}
-
-	text = load_text_fd (ctx, fd);
-
-	close(fd);
-
-	return text;
-}
-
-int
-main (int argc, char *argv[])
-{
-	char *filename = NULL;
-	void *ctx = ralloc(NULL, void*);
-	char *info_log = ralloc_strdup(ctx, "");
-	const char *shader;
-	int ret;
-
-	if (argc) {
-		filename = argv[1];
-	}
-
-	shader = load_text_file (ctx, filename);
-	if (shader == NULL)
-	   return 1;
-
-	ret = preprocess(ctx, &shader, &info_log, NULL, API_OPENGL);
-
-	printf("%s", shader);
-	fprintf(stderr, "%s", info_log);
-
-	ralloc_free(ctx);
-
-	return ret;
-}
+/*

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

+#include <string.h>

+#include <errno.h>

+#include "glcpp.h"

+#include "main/mtypes.h"

+#include "main/shaderobj.h"

+

+extern int yydebug;

+

+void

+_mesa_reference_shader(struct gl_context *ctx, struct gl_shader **ptr,

+                       struct gl_shader *sh)

+{

+   *ptr = sh;

+}

+

+/* Read from fp until EOF and return a string of everything read.

+ */

+static char *

+load_text_fp (void *ctx, FILE *fp)

+{

+#define CHUNK 4096

+	char *text = NULL;

+	size_t text_size = 0;

+	size_t total_read = 0;

+	size_t bytes;

+

+	while (1) {

+		if (total_read + CHUNK + 1 > text_size) {

+			text_size = text_size ? text_size * 2 : CHUNK + 1;

+			text = reralloc_size (ctx, text, text_size);

+			if (text == NULL) {

+				fprintf (stderr, "Out of memory\n");

+				return NULL;

+			}

+		}

+		bytes = fread (text + total_read, 1, CHUNK, fp);

+		total_read += bytes;

+

+		if (bytes < CHUNK) {

+			break;

+		}

+	}

+

+	text[total_read] = '\0';

+

+	return text;

+}

+

+static char *

+load_text_file(void *ctx, const char *filename)

+{

+	char *text;

+	FILE *fp;

+

+	if (filename == NULL || strcmp (filename, "-") == 0)

+		return load_text_fp (ctx, stdin);

+

+	fp = fopen (filename, "r");

+	if (fp == NULL) {

+		fprintf (stderr, "Failed to open file %s: %s\n",

+			 filename, strerror (errno));

+		return NULL;

+	}

+

+	text = load_text_fp (ctx, fp);

+

+	fclose(fp);

+

+	return text;

+}

+

+int

+main (int argc, char *argv[])

+{

+	char *filename = NULL;

+	void *ctx = ralloc(NULL, void*);

+	char *info_log = ralloc_strdup(ctx, "");

+	const char *shader;

+	int ret;

+

+	if (argc) {

+		filename = argv[1];

+	}

+

+	shader = load_text_file (ctx, filename);

+	if (shader == NULL)

+	   return 1;

+

+	ret = preprocess(ctx, &shader, &info_log, NULL, API_OPENGL);

+

+	printf("%s", shader);

+	fprintf(stderr, "%s", info_log);

+

+	ralloc_free(ctx);

+

+	return ret;

+}

diff --git a/mesalib/src/glsl/glsl_lexer.ll b/mesalib/src/glsl/glsl_lexer.ll
index e6f45f413..267ca0f1c 100644
--- a/mesalib/src/glsl/glsl_lexer.ll
+++ b/mesalib/src/glsl/glsl_lexer.ll
@@ -29,6 +29,10 @@
 

 static int classify_identifier(struct _mesa_glsl_parse_state *, const char *);

 

+#ifdef _MSC_VER

+#define YY_NO_UNISTD_H

+#endif

+

 #define YY_USER_ACTION						\

    do {								\

       yylloc->source = 0;					\

diff --git a/mesalib/src/mesa/sources.mak b/mesalib/src/mesa/sources.mak
index a8c0bbd2b..e1598869c 100644
--- a/mesalib/src/mesa/sources.mak
+++ b/mesalib/src/mesa/sources.mak
@@ -1,370 +1,371 @@
-### Lists of source files, included by Makefiles
-
-# this is part of MAIN_SOURCES
-MAIN_ES_SOURCES = \
-	main/api_exec_es1.c \
-	main/api_exec_es2.c
-
-MAIN_SOURCES = \
-	main/api_arrayelt.c \
-	main/api_exec.c \
-	main/api_loopback.c \
-	main/api_noop.c \
-	main/api_validate.c \
-	main/accum.c \
-	main/arbprogram.c \
-	main/atifragshader.c \
-	main/attrib.c \
-	main/arrayobj.c \
-	main/blend.c \
-	main/bufferobj.c \
-	main/buffers.c \
-	main/clear.c \
-	main/clip.c \
-	main/colortab.c \
-	main/condrender.c \
-	main/context.c \
-	main/convolve.c \
-	main/cpuinfo.c \
-	main/debug.c \
-	main/depth.c \
-	main/depthstencil.c \
-	main/dlist.c \
-	main/dlopen.c \
-	main/drawpix.c \
-	main/drawtex.c \
-	main/enable.c \
-	main/enums.c \
-	main/eval.c \
-	main/execmem.c \
-	main/extensions.c \
-	main/fbobject.c \
-	main/feedback.c \
-	main/ffvertex_prog.c \
-	main/fog.c \
-	main/formats.c \
-	main/framebuffer.c \
-	main/get.c \
-	main/getstring.c \
-	main/hash.c \
-	main/hint.c \
-	main/histogram.c \
-	main/image.c \
-	main/imports.c \
-	main/light.c \
-	main/lines.c \
-	main/matrix.c \
-	main/mipmap.c \
-	main/mm.c \
-	main/multisample.c \
-	main/nvprogram.c \
-	main/pack.c \
-	main/pbo.c \
-	main/pixel.c \
-	main/pixelstore.c \
-	main/pixeltransfer.c \
-	main/points.c \
-	main/polygon.c \
-	main/queryobj.c \
-	main/querymatrix.c \
-	main/rastpos.c \
-	main/readpix.c \
-	main/remap.c \
-	main/renderbuffer.c \
-	main/scissor.c \
-	main/shaderapi.c \
-	main/shaderobj.c \
-	main/shared.c \
-	main/state.c \
-	main/stencil.c \
-	main/syncobj.c \
-	main/texcompress.c \
-	main/texcompress_rgtc.c \
-	main/texcompress_s3tc.c \
-	main/texcompress_fxt1.c \
-	main/texenv.c \
-	main/texenvprogram.c \
-	main/texfetch.c \
-	main/texformat.c \
-	main/texgen.c \
-	main/texgetimage.c \
-	main/teximage.c \
-	main/texobj.c \
-	main/texpal.c \
-	main/texparam.c \
-	main/texrender.c \
-	main/texstate.c \
-	main/texstore.c \
-	main/transformfeedback.c \
-	main/uniforms.c \
-	main/varray.c \
-	main/version.c \
-	main/viewport.c \
-	main/vtxfmt.c \
-	$(MAIN_ES_SOURCES)
-
-MATH_SOURCES = \
-	math/m_debug_clip.c \
-	math/m_debug_norm.c \
-	math/m_debug_xform.c \
-	math/m_eval.c \
-	math/m_matrix.c \
-	math/m_translate.c \
-	math/m_vector.c
-
-MATH_XFORM_SOURCES = \
-	math/m_xform.c
-
-SWRAST_SOURCES = \
-	swrast/s_aaline.c \
-	swrast/s_aatriangle.c \
-	swrast/s_accum.c \
-	swrast/s_alpha.c \
-	swrast/s_atifragshader.c \
-	swrast/s_bitmap.c \
-	swrast/s_blend.c \
-	swrast/s_blit.c \
-	swrast/s_clear.c \
-	swrast/s_copypix.c \
-	swrast/s_context.c \
-	swrast/s_depth.c \
-	swrast/s_drawpix.c \
-	swrast/s_feedback.c \
-	swrast/s_fog.c \
-	swrast/s_fragprog.c \
-	swrast/s_lines.c \
-	swrast/s_logic.c \
-	swrast/s_masking.c \
-	swrast/s_points.c \
-	swrast/s_readpix.c \
-	swrast/s_span.c \
-	swrast/s_stencil.c \
-	swrast/s_texcombine.c \
-	swrast/s_texfilter.c \
-	swrast/s_triangle.c \
-	swrast/s_zoom.c
-
-SWRAST_SETUP_SOURCES = \
-	swrast_setup/ss_context.c \
-	swrast_setup/ss_triangle.c 
-
-TNL_SOURCES = \
-	tnl/t_context.c \
-	tnl/t_pipeline.c \
-	tnl/t_draw.c \
-	tnl/t_rasterpos.c \
-	tnl/t_vb_program.c \
-	tnl/t_vb_render.c \
-	tnl/t_vb_texgen.c \
-	tnl/t_vb_texmat.c \
-	tnl/t_vb_vertex.c \
-	tnl/t_vb_fog.c \
-	tnl/t_vb_light.c \
-	tnl/t_vb_normals.c \
-	tnl/t_vb_points.c \
-	tnl/t_vp_build.c \
-	tnl/t_vertex.c \
-	tnl/t_vertex_sse.c \
-	tnl/t_vertex_generic.c 
-
-VBO_SOURCES = \
-	vbo/vbo_context.c \
-	vbo/vbo_exec.c \
-	vbo/vbo_exec_api.c \
-	vbo/vbo_exec_array.c \
-	vbo/vbo_exec_draw.c \
-	vbo/vbo_exec_eval.c \
-	vbo/vbo_rebase.c \
-	vbo/vbo_split.c \
-	vbo/vbo_split_copy.c \
-	vbo/vbo_split_inplace.c \
-	vbo/vbo_save.c \
-	vbo/vbo_save_api.c \
-	vbo/vbo_save_draw.c \
-	vbo/vbo_save_loopback.c 
-
-STATETRACKER_SOURCES = \
-	state_tracker/st_atom.c \
-	state_tracker/st_atom_blend.c \
-	state_tracker/st_atom_clip.c \
-	state_tracker/st_atom_constbuf.c \
-	state_tracker/st_atom_depth.c \
-	state_tracker/st_atom_framebuffer.c \
-	state_tracker/st_atom_msaa.c \
-	state_tracker/st_atom_pixeltransfer.c \
-	state_tracker/st_atom_sampler.c \
-	state_tracker/st_atom_scissor.c \
-	state_tracker/st_atom_shader.c \
-	state_tracker/st_atom_rasterizer.c \
-	state_tracker/st_atom_stipple.c \
-	state_tracker/st_atom_texture.c \
-	state_tracker/st_atom_viewport.c \
-	state_tracker/st_cb_accum.c \
-	state_tracker/st_cb_bitmap.c \
-	state_tracker/st_cb_blit.c \
-	state_tracker/st_cb_bufferobjects.c \
-	state_tracker/st_cb_clear.c \
-	state_tracker/st_cb_condrender.c \
-	state_tracker/st_cb_flush.c \
-	state_tracker/st_cb_drawpixels.c \
-	state_tracker/st_cb_drawtex.c \
-	state_tracker/st_cb_eglimage.c \
-	state_tracker/st_cb_fbo.c \
-	state_tracker/st_cb_feedback.c \
-	state_tracker/st_cb_program.c \
-	state_tracker/st_cb_queryobj.c \
-	state_tracker/st_cb_rasterpos.c \
-	state_tracker/st_cb_readpixels.c \
-	state_tracker/st_cb_strings.c \
-	state_tracker/st_cb_texture.c \
-	state_tracker/st_cb_viewport.c \
-	state_tracker/st_cb_xformfb.c \
-	state_tracker/st_context.c \
-	state_tracker/st_debug.c \
-	state_tracker/st_draw.c \
-	state_tracker/st_draw_feedback.c \
-	state_tracker/st_extensions.c \
-	state_tracker/st_format.c \
-	state_tracker/st_gen_mipmap.c \
-	state_tracker/st_manager.c \
-	state_tracker/st_mesa_to_tgsi.c \
-	state_tracker/st_program.c \
-	state_tracker/st_texture.c
-
-PROGRAM_SOURCES = \
-	program/arbprogparse.c \
-	program/hash_table.c \
-	program/lex.yy.c \
-	program/nvfragparse.c \
-	program/nvvertparse.c \
-	program/program.c \
-	program/program_parse.tab.c \
-	program/program_parse_extra.c \
-	program/prog_cache.c \
-	program/prog_execute.c \
-	program/prog_instruction.c \
-	program/prog_noise.c \
-	program/prog_optimize.c \
-	program/prog_parameter.c \
-	program/prog_parameter_layout.c \
-	program/prog_print.c \
-	program/prog_statevars.c \
-	program/prog_uniform.c \
-	program/programopt.c \
-	program/register_allocate.c \
-	program/symbol_table.c
-
-SHADER_CXX_SOURCES = \
-	program/ir_to_mesa.cpp \
-	program/sampler.cpp
-
-ASM_C_SOURCES =	\
-	x86/common_x86.c \
-	x86/x86_xform.c \
-	x86/3dnow.c \
-	x86/sse.c \
-	x86/rtasm/x86sse.c \
-	sparc/sparc.c \
-	ppc/common_ppc.c \
-	x86-64/x86-64.c
-
-X86_SOURCES =			\
-	x86/common_x86_asm.S	\
-	x86/x86_xform2.S	\
-	x86/x86_xform3.S	\
-	x86/x86_xform4.S	\
-	x86/x86_cliptest.S	\
-	x86/mmx_blend.S		\
-	x86/3dnow_xform1.S	\
-	x86/3dnow_xform2.S	\
-	x86/3dnow_xform3.S	\
-	x86/3dnow_xform4.S	\
-	x86/3dnow_normal.S	\
-	x86/sse_xform1.S	\
-	x86/sse_xform2.S	\
-	x86/sse_xform3.S	\
-	x86/sse_xform4.S	\
-	x86/sse_normal.S	\
-	x86/read_rgba_span_x86.S
-
-X86-64_SOURCES =		\
-	x86-64/xform4.S
-
-SPARC_SOURCES =			\
-	sparc/clip.S		\
-	sparc/norm.S		\
-	sparc/xform.S
-
-COMMON_DRIVER_SOURCES =			\
-	drivers/common/driverfuncs.c	\
-	drivers/common/meta.c
-
-
-# Sources for building non-Gallium drivers
-MESA_SOURCES = \
-	$(MAIN_SOURCES)		\
-	$(MATH_SOURCES)		\
-	$(MATH_XFORM_SOURCES)	\
-	$(VBO_SOURCES)		\
-	$(TNL_SOURCES)		\
-	$(PROGRAM_SOURCES)	\
-	$(SWRAST_SOURCES)	\
-	$(SWRAST_SETUP_SOURCES)	\
-	$(COMMON_DRIVER_SOURCES)\
-	$(ASM_C_SOURCES)
-
-MESA_CXX_SOURCES = \
-	 $(SHADER_CXX_SOURCES)
-
-# Sources for building Gallium drivers
-MESA_GALLIUM_SOURCES = \
-	$(MAIN_SOURCES)		\
-	$(MATH_SOURCES)		\
-	$(VBO_SOURCES)		\
-	$(STATETRACKER_SOURCES)	\
-	$(PROGRAM_SOURCES)	\
-	ppc/common_ppc.c	\
-	x86/common_x86.c
-
-MESA_GALLIUM_CXX_SOURCES = \
-	 $(SHADER_CXX_SOURCES)
-
-# All the core C sources, for dependency checking
-ALL_SOURCES = \
-	$(MESA_SOURCES)		\
-	$(MESA_CXX_SOURCES)	\
-	$(MESA_ASM_SOURCES)	\
-	$(STATETRACKER_SOURCES)
-
-
-### Object files
-
-MESA_OBJECTS = \
-	$(MESA_SOURCES:.c=.o) \
-	$(MESA_CXX_SOURCES:.cpp=.o) \
-	$(MESA_ASM_SOURCES:.S=.o)
-
-MESA_GALLIUM_OBJECTS = \
-	$(MESA_GALLIUM_SOURCES:.c=.o) \
-	$(MESA_GALLIUM_CXX_SOURCES:.cpp=.o) \
-	$(MESA_ASM_SOURCES:.S=.o)
-
-
-COMMON_DRIVER_OBJECTS = $(COMMON_DRIVER_SOURCES:.c=.o)
-
-
-### Other archives/libraries
-
-GLSL_LIBS = \
-	$(TOP)/src/glsl/libglsl.a
-
-
-### Include directories
-
-INCLUDE_DIRS = \
-	-I$(TOP)/include \
-	-I$(TOP)/src/glsl \
-	-I$(TOP)/src/mesa \
-	-I$(TOP)/src/mapi \
-	-I$(TOP)/src/gallium/include \
-	-I$(TOP)/src/gallium/auxiliary
+### Lists of source files, included by Makefiles

+

+# this is part of MAIN_SOURCES

+MAIN_ES_SOURCES = \

+	main/api_exec_es1.c \

+	main/api_exec_es2.c

+

+MAIN_SOURCES = \

+	main/api_arrayelt.c \

+	main/api_exec.c \

+	main/api_loopback.c \

+	main/api_noop.c \

+	main/api_validate.c \

+	main/accum.c \

+	main/arbprogram.c \

+	main/atifragshader.c \

+	main/attrib.c \

+	main/arrayobj.c \

+	main/blend.c \

+	main/bufferobj.c \

+	main/buffers.c \

+	main/clear.c \

+	main/clip.c \

+	main/colortab.c \

+	main/condrender.c \

+	main/context.c \

+	main/convolve.c \

+	main/cpuinfo.c \

+	main/debug.c \

+	main/depth.c \

+	main/depthstencil.c \

+	main/dlist.c \

+	main/dlopen.c \

+	main/drawpix.c \

+	main/drawtex.c \

+	main/enable.c \

+	main/enums.c \

+	main/eval.c \

+	main/execmem.c \

+	main/extensions.c \

+	main/fbobject.c \

+	main/feedback.c \

+	main/ffvertex_prog.c \

+	main/fog.c \

+	main/formats.c \

+	main/framebuffer.c \

+	main/get.c \

+	main/getstring.c \

+	main/hash.c \

+	main/hint.c \

+	main/histogram.c \

+	main/image.c \

+	main/imports.c \

+	main/light.c \

+	main/lines.c \

+	main/matrix.c \

+	main/mipmap.c \

+	main/mm.c \

+	main/multisample.c \

+	main/nvprogram.c \

+	main/pack.c \

+	main/pbo.c \

+	main/pixel.c \

+	main/pixelstore.c \

+	main/pixeltransfer.c \

+	main/points.c \

+	main/polygon.c \

+	main/queryobj.c \

+	main/querymatrix.c \

+	main/rastpos.c \

+	main/readpix.c \

+	main/remap.c \

+	main/renderbuffer.c \

+	main/scissor.c \

+	main/shaderapi.c \

+	main/shaderobj.c \

+	main/shared.c \

+	main/state.c \

+	main/stencil.c \

+	main/syncobj.c \

+	main/texcompress.c \

+	main/texcompress_rgtc.c \

+	main/texcompress_s3tc.c \

+	main/texcompress_fxt1.c \

+	main/texenv.c \

+	main/texenvprogram.c \

+	main/texfetch.c \

+	main/texformat.c \

+	main/texgen.c \

+	main/texgetimage.c \

+	main/teximage.c \

+	main/texobj.c \

+	main/texpal.c \

+	main/texparam.c \

+	main/texrender.c \

+	main/texstate.c \

+	main/texstore.c \

+	main/transformfeedback.c \

+	main/uniforms.c \

+	main/varray.c \

+	main/version.c \

+	main/viewport.c \

+	main/vtxfmt.c \

+	$(MAIN_ES_SOURCES)

+

+MATH_SOURCES = \

+	math/m_debug_clip.c \

+	math/m_debug_norm.c \

+	math/m_debug_xform.c \

+	math/m_eval.c \

+	math/m_matrix.c \

+	math/m_translate.c \

+	math/m_vector.c

+

+MATH_XFORM_SOURCES = \

+	math/m_xform.c

+

+SWRAST_SOURCES = \

+	swrast/s_aaline.c \

+	swrast/s_aatriangle.c \

+	swrast/s_accum.c \

+	swrast/s_alpha.c \

+	swrast/s_atifragshader.c \

+	swrast/s_bitmap.c \

+	swrast/s_blend.c \

+	swrast/s_blit.c \

+	swrast/s_clear.c \

+	swrast/s_copypix.c \

+	swrast/s_context.c \

+	swrast/s_depth.c \

+	swrast/s_drawpix.c \

+	swrast/s_feedback.c \

+	swrast/s_fog.c \

+	swrast/s_fragprog.c \

+	swrast/s_lines.c \

+	swrast/s_logic.c \

+	swrast/s_masking.c \

+	swrast/s_points.c \

+	swrast/s_readpix.c \

+	swrast/s_span.c \

+	swrast/s_stencil.c \

+	swrast/s_texcombine.c \

+	swrast/s_texfilter.c \

+	swrast/s_triangle.c \

+	swrast/s_zoom.c

+

+SWRAST_SETUP_SOURCES = \

+	swrast_setup/ss_context.c \

+	swrast_setup/ss_triangle.c 

+

+TNL_SOURCES = \

+	tnl/t_context.c \

+	tnl/t_pipeline.c \

+	tnl/t_draw.c \

+	tnl/t_rasterpos.c \

+	tnl/t_vb_program.c \

+	tnl/t_vb_render.c \

+	tnl/t_vb_texgen.c \

+	tnl/t_vb_texmat.c \

+	tnl/t_vb_vertex.c \

+	tnl/t_vb_fog.c \

+	tnl/t_vb_light.c \

+	tnl/t_vb_normals.c \

+	tnl/t_vb_points.c \

+	tnl/t_vp_build.c \

+	tnl/t_vertex.c \

+	tnl/t_vertex_sse.c \

+	tnl/t_vertex_generic.c 

+

+VBO_SOURCES = \

+	vbo/vbo_context.c \

+	vbo/vbo_exec.c \

+	vbo/vbo_exec_api.c \

+	vbo/vbo_exec_array.c \

+	vbo/vbo_exec_draw.c \

+	vbo/vbo_exec_eval.c \

+	vbo/vbo_rebase.c \

+	vbo/vbo_split.c \

+	vbo/vbo_split_copy.c \

+	vbo/vbo_split_inplace.c \

+	vbo/vbo_save.c \

+	vbo/vbo_save_api.c \

+	vbo/vbo_save_draw.c \

+	vbo/vbo_save_loopback.c 

+

+STATETRACKER_SOURCES = \

+	state_tracker/st_atom.c \

+	state_tracker/st_atom_blend.c \

+	state_tracker/st_atom_clip.c \

+	state_tracker/st_atom_constbuf.c \

+	state_tracker/st_atom_depth.c \

+	state_tracker/st_atom_framebuffer.c \

+	state_tracker/st_atom_msaa.c \

+	state_tracker/st_atom_pixeltransfer.c \

+	state_tracker/st_atom_sampler.c \

+	state_tracker/st_atom_scissor.c \

+	state_tracker/st_atom_shader.c \

+	state_tracker/st_atom_rasterizer.c \

+	state_tracker/st_atom_stipple.c \

+	state_tracker/st_atom_texture.c \

+	state_tracker/st_atom_viewport.c \

+	state_tracker/st_cb_accum.c \

+	state_tracker/st_cb_bitmap.c \

+	state_tracker/st_cb_blit.c \

+	state_tracker/st_cb_bufferobjects.c \

+	state_tracker/st_cb_clear.c \

+	state_tracker/st_cb_condrender.c \

+	state_tracker/st_cb_flush.c \

+	state_tracker/st_cb_drawpixels.c \

+	state_tracker/st_cb_drawtex.c \

+	state_tracker/st_cb_eglimage.c \

+	state_tracker/st_cb_fbo.c \

+	state_tracker/st_cb_feedback.c \

+	state_tracker/st_cb_program.c \

+	state_tracker/st_cb_queryobj.c \

+	state_tracker/st_cb_rasterpos.c \

+	state_tracker/st_cb_readpixels.c \

+	state_tracker/st_cb_strings.c \

+	state_tracker/st_cb_texture.c \

+	state_tracker/st_cb_viewport.c \

+	state_tracker/st_cb_xformfb.c \

+	state_tracker/st_context.c \

+	state_tracker/st_debug.c \

+	state_tracker/st_draw.c \

+	state_tracker/st_draw_feedback.c \

+	state_tracker/st_extensions.c \

+	state_tracker/st_format.c \

+	state_tracker/st_gen_mipmap.c \

+	state_tracker/st_manager.c \

+	state_tracker/st_mesa_to_tgsi.c \

+	state_tracker/st_program.c \

+	state_tracker/st_texture.c

+

+PROGRAM_SOURCES = \

+	program/arbprogparse.c \

+	program/hash_table.c \

+	program/lex.yy.c \

+	program/nvfragparse.c \

+	program/nvvertparse.c \

+	program/program.c \

+	program/program_parse.tab.c \

+	program/program_parse_extra.c \

+	program/prog_cache.c \

+	program/prog_execute.c \

+	program/prog_instruction.c \

+	program/prog_noise.c \

+	program/prog_optimize.c \

+	program/prog_parameter.c \

+	program/prog_parameter_layout.c \

+	program/prog_print.c \

+	program/prog_statevars.c \

+	program/prog_uniform.c \

+	program/programopt.c \

+	program/register_allocate.c \

+	program/symbol_table.c

+

+

+SHADER_CXX_SOURCES = \

+	program/ir_to_mesa.cpp \

+	program/sampler.cpp

+

+ASM_C_SOURCES =	\

+	x86/common_x86.c \

+	x86/x86_xform.c \

+	x86/3dnow.c \

+	x86/sse.c \

+	x86/rtasm/x86sse.c \

+	sparc/sparc.c \

+	ppc/common_ppc.c \

+	x86-64/x86-64.c

+

+X86_SOURCES =			\

+	x86/common_x86_asm.S	\

+	x86/x86_xform2.S	\

+	x86/x86_xform3.S	\

+	x86/x86_xform4.S	\

+	x86/x86_cliptest.S	\

+	x86/mmx_blend.S		\

+	x86/3dnow_xform1.S	\

+	x86/3dnow_xform2.S	\

+	x86/3dnow_xform3.S	\

+	x86/3dnow_xform4.S	\

+	x86/3dnow_normal.S	\

+	x86/sse_xform1.S	\

+	x86/sse_xform2.S	\

+	x86/sse_xform3.S	\

+	x86/sse_xform4.S	\

+	x86/sse_normal.S	\

+	x86/read_rgba_span_x86.S

+

+X86-64_SOURCES =		\

+	x86-64/xform4.S

+

+SPARC_SOURCES =			\

+	sparc/clip.S		\

+	sparc/norm.S		\

+	sparc/xform.S

+

+COMMON_DRIVER_SOURCES =			\

+	drivers/common/driverfuncs.c	\

+	drivers/common/meta.c

+

+

+# Sources for building non-Gallium drivers

+MESA_SOURCES = \

+	$(MAIN_SOURCES)		\

+	$(MATH_SOURCES)		\

+	$(MATH_XFORM_SOURCES)	\

+	$(VBO_SOURCES)		\

+	$(TNL_SOURCES)		\

+	$(PROGRAM_SOURCES)	\

+	$(SWRAST_SOURCES)	\

+	$(SWRAST_SETUP_SOURCES)	\

+	$(COMMON_DRIVER_SOURCES)\

+	$(ASM_C_SOURCES)

+

+MESA_CXX_SOURCES = \

+	 $(SHADER_CXX_SOURCES)

+

+# Sources for building Gallium drivers

+MESA_GALLIUM_SOURCES = \

+	$(MAIN_SOURCES)		\

+	$(MATH_SOURCES)		\

+	$(VBO_SOURCES)		\

+	$(STATETRACKER_SOURCES)	\

+	$(PROGRAM_SOURCES)	\

+	ppc/common_ppc.c	\

+	x86/common_x86.c

+

+MESA_GALLIUM_CXX_SOURCES = \

+	 $(SHADER_CXX_SOURCES)

+

+# All the core C sources, for dependency checking

+ALL_SOURCES = \

+	$(MESA_SOURCES)		\

+	$(MESA_CXX_SOURCES)	\

+	$(MESA_ASM_SOURCES)	\

+	$(STATETRACKER_SOURCES)

+

+

+### Object files

+

+MESA_OBJECTS = \

+	$(MESA_SOURCES:.c=.o) \

+	$(MESA_CXX_SOURCES:.cpp=.o) \

+	$(MESA_ASM_SOURCES:.S=.o)

+

+MESA_GALLIUM_OBJECTS = \

+	$(MESA_GALLIUM_SOURCES:.c=.o) \

+	$(MESA_GALLIUM_CXX_SOURCES:.cpp=.o) \

+	$(MESA_ASM_SOURCES:.S=.o)

+

+

+COMMON_DRIVER_OBJECTS = $(COMMON_DRIVER_SOURCES:.c=.o)

+

+

+### Other archives/libraries

+

+GLSL_LIBS = \

+	$(TOP)/src/glsl/libglsl.a

+

+

+### Include directories

+

+INCLUDE_DIRS = \

+	-I$(TOP)/include \

+	-I$(TOP)/src/glsl \

+	-I$(TOP)/src/mesa \

+	-I$(TOP)/src/mapi \

+	-I$(TOP)/src/gallium/include \

+	-I$(TOP)/src/gallium/auxiliary

diff --git a/mesalib/src/mesa/state_tracker/st_cb_texture.c b/mesalib/src/mesa/state_tracker/st_cb_texture.c
index c3c4246d1..17dab2f1a 100644
--- a/mesalib/src/mesa/state_tracker/st_cb_texture.c
+++ b/mesalib/src/mesa/state_tracker/st_cb_texture.c
@@ -1,1931 +1,1938 @@
-/**************************************************************************
- * 
- * Copyright 2007 Tungsten Graphics, Inc., Cedar Park, Texas.
- * All Rights Reserved.
- * 
- * 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, sub license, 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 NON-INFRINGEMENT.
- * IN NO EVENT SHALL TUNGSTEN GRAPHICS AND/OR ITS SUPPLIERS 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/mfeatures.h"
-#include "main/bufferobj.h"
-#include "main/enums.h"
-#include "main/fbobject.h"
-#include "main/formats.h"
-#include "main/image.h"
-#include "main/imports.h"
-#include "main/macros.h"
-#include "main/mipmap.h"
-#include "main/pack.h"
-#include "main/pbo.h"
-#include "main/pixeltransfer.h"
-#include "main/texcompress.h"
-#include "main/texfetch.h"
-#include "main/texgetimage.h"
-#include "main/teximage.h"
-#include "main/texobj.h"
-#include "main/texstore.h"
-
-#include "state_tracker/st_debug.h"
-#include "state_tracker/st_context.h"
-#include "state_tracker/st_cb_fbo.h"
-#include "state_tracker/st_cb_flush.h"
-#include "state_tracker/st_cb_texture.h"
-#include "state_tracker/st_format.h"
-#include "state_tracker/st_texture.h"
-#include "state_tracker/st_gen_mipmap.h"
-#include "state_tracker/st_atom.h"
-
-#include "pipe/p_context.h"
-#include "pipe/p_defines.h"
-#include "util/u_inlines.h"
-#include "pipe/p_shader_tokens.h"
-#include "util/u_tile.h"
-#include "util/u_blit.h"
-#include "util/u_format.h"
-#include "util/u_surface.h"
-#include "util/u_sampler.h"
-#include "util/u_math.h"
-#include "util/u_box.h"
-
-#define DBG if (0) printf
-
-
-static enum pipe_texture_target
-gl_target_to_pipe(GLenum target)
-{
-   switch (target) {
-   case GL_TEXTURE_1D:
-      return PIPE_TEXTURE_1D;
-   case GL_TEXTURE_2D:
-      return PIPE_TEXTURE_2D;
-   case GL_TEXTURE_RECTANGLE_NV:
-      return PIPE_TEXTURE_RECT;
-   case GL_TEXTURE_3D:
-      return PIPE_TEXTURE_3D;
-   case GL_TEXTURE_CUBE_MAP_ARB:
-      return PIPE_TEXTURE_CUBE;
-   case GL_TEXTURE_1D_ARRAY_EXT:
-      return PIPE_TEXTURE_1D_ARRAY;
-   case GL_TEXTURE_2D_ARRAY_EXT:
-      return PIPE_TEXTURE_2D_ARRAY;
-   default:
-      assert(0);
-      return 0;
-   }
-}
-
-
-/** called via ctx->Driver.NewTextureImage() */
-static struct gl_texture_image *
-st_NewTextureImage(struct gl_context * ctx)
-{
-   DBG("%s\n", __FUNCTION__);
-   (void) ctx;
-   return (struct gl_texture_image *) ST_CALLOC_STRUCT(st_texture_image);
-}
-
-
-/** called via ctx->Driver.NewTextureObject() */
-static struct gl_texture_object *
-st_NewTextureObject(struct gl_context * ctx, GLuint name, GLenum target)
-{
-   struct st_texture_object *obj = ST_CALLOC_STRUCT(st_texture_object);
-
-   DBG("%s\n", __FUNCTION__);
-   _mesa_initialize_texture_object(&obj->base, name, target);
-
-   return &obj->base;
-}
-
-/** called via ctx->Driver.DeleteTextureObject() */
-static void 
-st_DeleteTextureObject(struct gl_context *ctx,
-                       struct gl_texture_object *texObj)
-{
-   struct st_context *st = st_context(ctx);
-   struct st_texture_object *stObj = st_texture_object(texObj);
-   if (stObj->pt)
-      pipe_resource_reference(&stObj->pt, NULL);
-   if (stObj->sampler_view) {
-      if (stObj->sampler_view->context != st->pipe) {
-         /* Take "ownership" of this texture sampler view by setting
-          * its context pointer to this context.  This avoids potential
-          * crashes when the texture object is shared among contexts
-          * and the original/owner context has already been destroyed.
-          */
-         stObj->sampler_view->context = st->pipe;
-      }
-      pipe_sampler_view_reference(&stObj->sampler_view, NULL);
-   }
-   _mesa_delete_texture_object(ctx, texObj);
-}
-
-
-/** called via ctx->Driver.FreeTexImageData() */
-static void
-st_FreeTextureImageData(struct gl_context * ctx, struct gl_texture_image *texImage)
-{
-   struct st_texture_image *stImage = st_texture_image(texImage);
-
-   DBG("%s\n", __FUNCTION__);
-
-   if (stImage->pt) {
-      pipe_resource_reference(&stImage->pt, NULL);
-   }
-
-   if (texImage->Data) {
-      _mesa_align_free(texImage->Data);
-      texImage->Data = NULL;
-   }
-}
-
-
-/**
- * From linux kernel i386 header files, copes with odd sizes better
- * than COPY_DWORDS would:
- * XXX Put this in src/mesa/main/imports.h ???
- */
-#if defined(PIPE_CC_GCC) && defined(PIPE_ARCH_X86)
-static INLINE void *
-__memcpy(void *to, const void *from, size_t n)
-{
-   int d0, d1, d2;
-   __asm__ __volatile__("rep ; movsl\n\t"
-                        "testb $2,%b4\n\t"
-                        "je 1f\n\t"
-                        "movsw\n"
-                        "1:\ttestb $1,%b4\n\t"
-                        "je 2f\n\t"
-                        "movsb\n" "2:":"=&c"(d0), "=&D"(d1), "=&S"(d2)
-                        :"0"(n / 4), "q"(n), "1"((long) to), "2"((long) from)
-                        :"memory");
-   return (to);
-}
-#else
-#define __memcpy(a,b,c) memcpy(a,b,c)
-#endif
-
-
-/**
- * The system memcpy (at least on ubuntu 5.10) has problems copying
- * to agp (writecombined) memory from a source which isn't 64-byte
- * aligned - there is a 4x performance falloff.
- *
- * The x86 __memcpy is immune to this but is slightly slower
- * (10%-ish) than the system memcpy.
- *
- * The sse_memcpy seems to have a slight cliff at 64/32 bytes, but
- * isn't much faster than x86_memcpy for agp copies.
- * 
- * TODO: switch dynamically.
- */
-static void *
-do_memcpy(void *dest, const void *src, size_t n)
-{
-   if ((((unsigned long) src) & 63) || (((unsigned long) dest) & 63)) {
-      return __memcpy(dest, src, n);
-   }
-   else
-      return memcpy(dest, src, n);
-}
-
-
-/**
- * Return default texture resource binding bitmask for the given format.
- */
-static GLuint
-default_bindings(struct st_context *st, enum pipe_format format)
-{
-   struct pipe_screen *screen = st->pipe->screen;
-   const unsigned target = PIPE_TEXTURE_2D;
-   const unsigned geom = 0x0;
-   unsigned bindings;
-
-   if (util_format_is_depth_or_stencil(format))
-      bindings = PIPE_BIND_SAMPLER_VIEW | PIPE_BIND_DEPTH_STENCIL;
-   else
-      bindings = PIPE_BIND_SAMPLER_VIEW | PIPE_BIND_RENDER_TARGET;
-
-   if (screen->is_format_supported(screen, format, target, 0, bindings, geom))
-      return bindings;
-   else
-      return PIPE_BIND_SAMPLER_VIEW;
-}
-
-
-/** Return number of image dimensions (1, 2 or 3) for a texture target. */
-static GLuint
-get_texture_dims(GLenum target)
-{
-   switch (target) {
-   case GL_TEXTURE_1D:
-   case GL_TEXTURE_1D_ARRAY_EXT:
-      return 1;
-   case GL_TEXTURE_2D:
-   case GL_TEXTURE_CUBE_MAP_ARB:
-   case GL_TEXTURE_CUBE_MAP_POSITIVE_X_ARB:
-   case GL_TEXTURE_CUBE_MAP_NEGATIVE_X_ARB:
-   case GL_TEXTURE_CUBE_MAP_POSITIVE_Y_ARB:
-   case GL_TEXTURE_CUBE_MAP_NEGATIVE_Y_ARB:
-   case GL_TEXTURE_CUBE_MAP_POSITIVE_Z_ARB:
-   case GL_TEXTURE_CUBE_MAP_NEGATIVE_Z_ARB:
-   case GL_TEXTURE_RECTANGLE_NV:
-   case GL_TEXTURE_2D_ARRAY_EXT:
-      return 2;
-   case GL_TEXTURE_3D:
-      return 3;
-   default:
-      assert(0 && "invalid texture target in get_texture_dims()");
-      return 1;
-   }
-}
-
-
-/**
- * Given the size of a mipmap image, try to compute the size of the level=0
- * mipmap image.
- *
- * Note that this isn't always accurate for odd-sized, non-POW textures.
- * For example, if level=1 and width=40 then the level=0 width may be 80 or 81.
- *
- * \return GL_TRUE for success, GL_FALSE for failure
- */
-static GLboolean
-guess_base_level_size(GLenum target,
-                      GLuint width, GLuint height, GLuint depth, GLuint level,
-                      GLuint *width0, GLuint *height0, GLuint *depth0)
-{ 
-   const GLuint dims = get_texture_dims(target);
-
-   assert(width >= 1);
-   assert(height >= 1);
-   assert(depth >= 1);
-
-   if (level > 0) {
-      /* Depending on the image's size, we can't always make a guess here */
-      if ((dims >= 1 && width == 1) ||
-          (dims >= 2 && height == 1) ||
-          (dims >= 3 && depth == 1)) {
-         /* we can't determine the image size at level=0 */
-         return GL_FALSE;
-      }
-
-      /* grow the image size until we hit level = 0 */
-      while (level > 0) {
-         if (width > 1)
-            width <<= 1;
-         if (height > 1)
-            height <<= 1;
-         if (depth > 1)
-            depth <<= 1;
-         level--;
-      }
-   }      
-
-   *width0 = width;
-   *height0 = height;
-   *depth0 = depth;
-
-   return GL_TRUE;
-}
-
-
-/**
- * Try to allocate a pipe_resource object for the given st_texture_object.
- *
- * We use the given st_texture_image as a clue to determine the size of the
- * mipmap image at level=0.
- *
- * \return GL_TRUE for success, GL_FALSE if out of memory.
- */
-static GLboolean
-guess_and_alloc_texture(struct st_context *st,
-			struct st_texture_object *stObj,
-			const struct st_texture_image *stImage)
-{
-   GLuint lastLevel, width, height, depth;
-   GLuint bindings;
-   GLuint ptWidth, ptHeight, ptDepth, ptLayers;
-   enum pipe_format fmt;
-
-   DBG("%s\n", __FUNCTION__);
-
-   assert(!stObj->pt);
-
-   if (!guess_base_level_size(stObj->base.Target,
-                              stImage->base.Width2,
-                              stImage->base.Height2,
-                              stImage->base.Depth2,
-                              stImage->level,
-                              &width, &height, &depth)) {
-      /* we can't determine the image size at level=0 */
-      stObj->width0 = stObj->height0 = stObj->depth0 = 0;
-      /* this is not an out of memory error */
-      return GL_TRUE;
-   }
-
-   /* At this point, (width x height x depth) is the expected size of
-    * the level=0 mipmap image.
-    */
-
-   /* Guess a reasonable value for lastLevel.  With OpenGL we have no
-    * idea how many mipmap levels will be in a texture until we start
-    * to render with it.  Make an educated guess here but be prepared
-    * to re-allocating a texture buffer with space for more (or fewer)
-    * mipmap levels later.
-    */
-   if ((stObj->base.MinFilter == GL_NEAREST ||
-        stObj->base.MinFilter == GL_LINEAR ||
-        stImage->base._BaseFormat == GL_DEPTH_COMPONENT ||
-        stImage->base._BaseFormat == GL_DEPTH_STENCIL_EXT) &&
-       !stObj->base.GenerateMipmap &&
-       stImage->level == 0) {
-      /* only alloc space for a single mipmap level */
-      lastLevel = 0;
-   }
-   else {
-      /* alloc space for a full mipmap */
-      GLuint l2width = util_logbase2(width);
-      GLuint l2height = util_logbase2(height);
-      GLuint l2depth = util_logbase2(depth);
-      lastLevel = MAX2(MAX2(l2width, l2height), l2depth);
-   }
-
-   /* Save the level=0 dimensions */
-   stObj->width0 = width;
-   stObj->height0 = height;
-   stObj->depth0 = depth;
-
-   fmt = st_mesa_format_to_pipe_format(stImage->base.TexFormat);
-
-   bindings = default_bindings(st, fmt);
-
-   st_gl_texture_dims_to_pipe_dims(stObj->base.Target,
-                                   width, height, depth,
-                                   &ptWidth, &ptHeight, &ptDepth, &ptLayers);
-
-   stObj->pt = st_texture_create(st,
-                                 gl_target_to_pipe(stObj->base.Target),
-                                 fmt,
-                                 lastLevel,
-                                 ptWidth,
-                                 ptHeight,
-                                 ptDepth,
-                                 ptLayers,
-                                 bindings);
-
-   DBG("%s returning %d\n", __FUNCTION__, (stObj->pt != NULL));
-
-   return stObj->pt != NULL;
-}
-
-
-/**
- * Adjust pixel unpack params and image dimensions to strip off the
- * texture border.
- * Gallium doesn't support texture borders.  They've seldem been used
- * and seldom been implemented correctly anyway.
- * \param unpackNew  returns the new pixel unpack parameters
- */
-static void
-strip_texture_border(GLint border,
-                     GLint *width, GLint *height, GLint *depth,
-                     const struct gl_pixelstore_attrib *unpack,
-                     struct gl_pixelstore_attrib *unpackNew)
-{
-   assert(border > 0);  /* sanity check */
-
-   *unpackNew = *unpack;
-
-   if (unpackNew->RowLength == 0)
-      unpackNew->RowLength = *width;
-
-   if (depth && unpackNew->ImageHeight == 0)
-      unpackNew->ImageHeight = *height;
-
-   unpackNew->SkipPixels += border;
-   if (height)
-      unpackNew->SkipRows += border;
-   if (depth)
-      unpackNew->SkipImages += border;
-
-   assert(*width >= 3);
-   *width = *width - 2 * border;
-   if (height && *height >= 3)
-      *height = *height - 2 * border;
-   if (depth && *depth >= 3)
-      *depth = *depth - 2 * border;
-}
-
-
-/**
- * Do glTexImage1/2/3D().
- */
-static void
-st_TexImage(struct gl_context * ctx,
-            GLint dims,
-            GLenum target, GLint level,
-            GLint internalFormat,
-            GLint width, GLint height, GLint depth,
-            GLint border,
-            GLenum format, GLenum type, const void *pixels,
-            const struct gl_pixelstore_attrib *unpack,
-            struct gl_texture_object *texObj,
-            struct gl_texture_image *texImage,
-            GLsizei imageSize, GLboolean compressed_src)
-{
-   struct st_context *st = st_context(ctx);
-   struct st_texture_object *stObj = st_texture_object(texObj);
-   struct st_texture_image *stImage = st_texture_image(texImage);
-   GLuint dstRowStride = 0;
-   struct gl_pixelstore_attrib unpackNB;
-   enum pipe_transfer_usage transfer_usage = 0;
-
-   DBG("%s target %s level %d %dx%dx%d border %d\n", __FUNCTION__,
-       _mesa_lookup_enum_by_nr(target), level, width, height, depth, border);
-
-   /* switch to "normal" */
-   if (stObj->surface_based) {
-      gl_format texFormat;
-
-      _mesa_clear_texture_object(ctx, texObj);
-      pipe_resource_reference(&stObj->pt, NULL);
-
-      /* oops, need to init this image again */
-      texFormat = _mesa_choose_texture_format(ctx, texObj, target, level,
-                                              internalFormat, format, type);
-
-      _mesa_init_teximage_fields(ctx, target, texImage,
-                                 width, height, depth, border,
-                                 internalFormat, texFormat);
-
-      stObj->surface_based = GL_FALSE;
-   }
-
-   /* gallium does not support texture borders, strip it off */
-   if (border) {
-      strip_texture_border(border, &width, &height, &depth, unpack, &unpackNB);
-      unpack = &unpackNB;
-      texImage->Width = width;
-      texImage->Height = height;
-      texImage->Depth = depth;
-      texImage->Border = 0;
-      border = 0;
-   }
-   else {
-      assert(texImage->Width == width);
-      assert(texImage->Height == height);
-      assert(texImage->Depth == depth);
-   }
-
-   stImage->face = _mesa_tex_target_to_face(target);
-   stImage->level = level;
-
-   _mesa_set_fetch_functions(texImage, dims);
-
-   /* Release the reference to a potentially orphaned buffer.   
-    * Release any old malloced memory.
-    */
-   if (stImage->pt) {
-      pipe_resource_reference(&stImage->pt, NULL);
-      assert(!texImage->Data);
-   }
-   else if (texImage->Data) {
-      _mesa_align_free(texImage->Data);
-   }
-
-   /*
-    * See if the new image is somehow incompatible with the existing
-    * mipmap.  If so, free the old mipmap.
-    */
-   if (stObj->pt) {
-      if (level > (GLint) stObj->pt->last_level ||
-          !st_texture_match_image(stObj->pt, &stImage->base,
-                                  stImage->face, stImage->level)) {
-         DBG("release it\n");
-         pipe_resource_reference(&stObj->pt, NULL);
-         assert(!stObj->pt);
-         pipe_sampler_view_reference(&stObj->sampler_view, NULL);
-      }
-   }
-
-   if (width == 0 || height == 0 || depth == 0) {
-      /* stop after freeing old image */
-      return;
-   }
-
-   if (!stObj->pt) {
-      if (!guess_and_alloc_texture(st, stObj, stImage)) {
-         /* Probably out of memory.
-          * Try flushing any pending rendering, then retry.
-          */
-         st_finish(st);
-         if (!guess_and_alloc_texture(st, stObj, stImage)) {
-            _mesa_error(ctx, GL_OUT_OF_MEMORY, "glTexImage");
-            return;
-         }
-      }
-   }
-
-   assert(!stImage->pt);
-
-   /* Check if this texture image can live inside the texture object's buffer.
-    * If so, store the image there.  Otherwise the image will temporarily live
-    * in its own buffer.
-    */
-   if (stObj->pt &&
-       st_texture_match_image(stObj->pt, &stImage->base,
-                              stImage->face, stImage->level)) {
-
-      pipe_resource_reference(&stImage->pt, stObj->pt);
-      assert(stImage->pt);
-   }
-
-   if (!stImage->pt)
-      DBG("XXX: Image did not fit into texture - storing in local memory!\n");
-
-   /* Pixel data may come from regular user memory or a PBO.  For the later,
-    * do bounds checking and map the PBO to read pixels data from it.
-    *
-    * XXX we should try to use a GPU-accelerated path to copy the image data
-    * from the PBO to the texture.
-    */
-   if (compressed_src) {
-      pixels = _mesa_validate_pbo_compressed_teximage(ctx, imageSize, pixels,
-						      unpack,
-						      "glCompressedTexImage");
-   }
-   else {
-      pixels = _mesa_validate_pbo_teximage(ctx, dims, width, height, 1,
-					   format, type,
-					   pixels, unpack, "glTexImage");
-   }
-
-   /* for a 1D array upload the image as a series of layer with height = 1 */
-   if (target == GL_TEXTURE_1D_ARRAY) {
-      depth = height;
-      height = 1;
-   }
-
-   /*
-    * Prepare to store the texture data.  Either map the gallium texture buffer
-    * memory or malloc space for it.
-    */
-   if (stImage->pt) {
-      /* Store the image in the gallium texture memory buffer */
-      if (format == GL_DEPTH_COMPONENT &&
-          util_format_is_depth_and_stencil(stImage->pt->format))
-         transfer_usage = PIPE_TRANSFER_READ_WRITE;
-      else
-         transfer_usage = PIPE_TRANSFER_WRITE;
-
-      texImage->Data = st_texture_image_map(st, stImage, 0,
-                                            transfer_usage, 0, 0, width, height);
-      if(stImage->transfer)
-         dstRowStride = stImage->transfer->stride;
-   }
-   else {
-      /* Allocate regular memory and store the image there temporarily.   */
-      GLuint imageSize = _mesa_format_image_size(texImage->TexFormat,
-                                                 width, height, depth);
-      dstRowStride = _mesa_format_row_stride(texImage->TexFormat, width);
-
-      texImage->Data = _mesa_align_malloc(imageSize, 16);
-   }
-
-   if (!texImage->Data) {
-      _mesa_error(ctx, GL_OUT_OF_MEMORY, "glTexImage");
-      return;
-   }
-
-   if (!pixels) {
-      /* We've allocated texture memory, but have no pixel data - all done. */
-      goto done;
-   }
-
-   DBG("Upload image %dx%dx%d row_len %x pitch %x\n",
-       width, height, depth, width, dstRowStride);
-
-   /* Copy user texture image into the texture buffer.
-    */
-   if (compressed_src) {
-      const GLuint srcRowStride =
-         _mesa_format_row_stride(texImage->TexFormat, width);
-      if (dstRowStride == srcRowStride) {
-         memcpy(texImage->Data, pixels, imageSize);
-      }
-      else {
-         char *dst = texImage->Data;
-         const char *src = pixels;
-         GLuint i, bw, bh, lines;
-         _mesa_get_format_block_size(texImage->TexFormat, &bw, &bh);
-         lines = (height + bh - 1) / bh;
-
-         for (i = 0; i < lines; ++i) {
-            memcpy(dst, src, srcRowStride);
-            dst += dstRowStride;
-            src += srcRowStride;
-         }
-      }
-   }
-   else {
-      const GLuint srcImageStride =
-         _mesa_image_image_stride(unpack, width, height, format, type);
-      GLint i;
-      const GLubyte *src = (const GLubyte *) pixels;
-
-      for (i = 0; i < depth; i++) {
-	 if (!_mesa_texstore(ctx, dims, 
-                             texImage->_BaseFormat, 
-                             texImage->TexFormat, 
-                             texImage->Data,
-                             0, 0, 0, /* dstX/Y/Zoffset */
-                             dstRowStride,
-                             texImage->ImageOffsets,
-                             width, height, 1,
-                             format, type, src, unpack)) {
-	    _mesa_error(ctx, GL_OUT_OF_MEMORY, "glTexImage");
-	 }
-
-	 if (stImage->pt && i + 1 < depth) {
-            /* unmap this slice */
-	    st_texture_image_unmap(st, stImage);
-            /* map next slice of 3D texture */
-	    texImage->Data = st_texture_image_map(st, stImage, i + 1,
-                                                  transfer_usage, 0, 0,
-                                                  width, height);
-	    src += srcImageStride;
-	 }
-      }
-   }
-
-done:
-   _mesa_unmap_teximage_pbo(ctx, unpack);
-
-   if (stImage->pt && texImage->Data) {
-      st_texture_image_unmap(st, stImage);
-      texImage->Data = NULL;
-   }
-}
-
-
-static void
-st_TexImage3D(struct gl_context * ctx,
-              GLenum target, GLint level,
-              GLint internalFormat,
-              GLint width, GLint height, GLint depth,
-              GLint border,
-              GLenum format, GLenum type, const void *pixels,
-              const struct gl_pixelstore_attrib *unpack,
-              struct gl_texture_object *texObj,
-              struct gl_texture_image *texImage)
-{
-   st_TexImage(ctx, 3, target, level, internalFormat, width, height, depth,
-               border, format, type, pixels, unpack, texObj, texImage,
-               0, GL_FALSE);
-}
-
-
-static void
-st_TexImage2D(struct gl_context * ctx,
-              GLenum target, GLint level,
-              GLint internalFormat,
-              GLint width, GLint height, GLint border,
-              GLenum format, GLenum type, const void *pixels,
-              const struct gl_pixelstore_attrib *unpack,
-              struct gl_texture_object *texObj,
-              struct gl_texture_image *texImage)
-{
-   st_TexImage(ctx, 2, target, level, internalFormat, width, height, 1, border,
-               format, type, pixels, unpack, texObj, texImage, 0, GL_FALSE);
-}
-
-
-static void
-st_TexImage1D(struct gl_context * ctx,
-              GLenum target, GLint level,
-              GLint internalFormat,
-              GLint width, GLint border,
-              GLenum format, GLenum type, const void *pixels,
-              const struct gl_pixelstore_attrib *unpack,
-              struct gl_texture_object *texObj,
-              struct gl_texture_image *texImage)
-{
-   st_TexImage(ctx, 1, target, level, internalFormat, width, 1, 1, border,
-               format, type, pixels, unpack, texObj, texImage, 0, GL_FALSE);
-}
-
-
-static void
-st_CompressedTexImage2D(struct gl_context *ctx, GLenum target, GLint level,
-                        GLint internalFormat,
-                        GLint width, GLint height, GLint border,
-                        GLsizei imageSize, const GLvoid *data,
-                        struct gl_texture_object *texObj,
-                        struct gl_texture_image *texImage)
-{
-   st_TexImage(ctx, 2, target, level, internalFormat, width, height, 1, border,
-               0, 0, data, &ctx->Unpack, texObj, texImage, imageSize, GL_TRUE);
-}
-
-
-
-/**
- * glGetTexImage() helper: decompress a compressed texture by rendering
- * a textured quad.  Store the results in the user's buffer.
- */
-static void
-decompress_with_blit(struct gl_context * ctx, GLenum target, GLint level,
-                     GLenum format, GLenum type, GLvoid *pixels,
-                     struct gl_texture_object *texObj,
-                     struct gl_texture_image *texImage)
-{
-   struct st_context *st = st_context(ctx);
-   struct pipe_context *pipe = st->pipe;
-   struct st_texture_image *stImage = st_texture_image(texImage);
-   struct st_texture_object *stObj = st_texture_object(texObj);
-   struct pipe_sampler_view *src_view =
-      st_get_texture_sampler_view(stObj, pipe);
-   const GLuint width = texImage->Width;
-   const GLuint height = texImage->Height;
-   struct pipe_surface *dst_surface;
-   struct pipe_resource *dst_texture;
-   struct pipe_transfer *tex_xfer;
-   unsigned bind = (PIPE_BIND_RENDER_TARGET | /* util_blit may choose to render */
-		    PIPE_BIND_TRANSFER_READ);
-
-   /* create temp / dest surface */
-   if (!util_create_rgba_surface(pipe, width, height, bind,
-                                 &dst_texture, &dst_surface)) {
-      _mesa_problem(ctx, "util_create_rgba_surface() failed "
-                    "in decompress_with_blit()");
-      return;
-   }
-
-   /* blit/render/decompress */
-   util_blit_pixels_tex(st->blit,
-                        src_view,      /* pipe_resource (src) */
-                        0, 0,             /* src x0, y0 */
-                        width, height,    /* src x1, y1 */
-                        dst_surface,      /* pipe_surface (dst) */
-                        0, 0,             /* dst x0, y0 */
-                        width, height,    /* dst x1, y1 */
-                        0.0,              /* z */
-                        PIPE_TEX_MIPFILTER_NEAREST);
-
-   /* map the dst_surface so we can read from it */
-   tex_xfer = pipe_get_transfer(st_context(ctx)->pipe,
-                                dst_texture, 0, 0,
-                                PIPE_TRANSFER_READ,
-                                0, 0, width, height);
-
-   pixels = _mesa_map_pbo_dest(ctx, &ctx->Pack, pixels);
-
-   /* copy/pack data into user buffer */
-   if (st_equal_formats(stImage->pt->format, format, type)) {
-      /* memcpy */
-      const uint bytesPerRow = width * util_format_get_blocksize(stImage->pt->format);
-      ubyte *map = pipe_transfer_map(pipe, tex_xfer);
-      GLuint row;
-      for (row = 0; row < height; row++) {
-         GLvoid *dest = _mesa_image_address2d(&ctx->Pack, pixels, width,
-                                              height, format, type, row, 0);
-         memcpy(dest, map, bytesPerRow);
-         map += tex_xfer->stride;
-      }
-      pipe_transfer_unmap(pipe, tex_xfer);
-   }
-   else {
-      /* format translation via floats */
-      GLuint row;
-      enum pipe_format format = util_format_linear(dst_texture->format);
-      for (row = 0; row < height; row++) {
-         const GLbitfield transferOps = 0x0; /* bypassed for glGetTexImage() */
-         GLfloat rgba[4 * MAX_WIDTH];
-         GLvoid *dest = _mesa_image_address2d(&ctx->Pack, pixels, width,
-                                              height, format, type, row, 0);
-
-         if (ST_DEBUG & DEBUG_FALLBACK)
-            debug_printf("%s: fallback format translation\n", __FUNCTION__);
-
-         /* get float[4] rgba row from surface */
-         pipe_get_tile_rgba_format(pipe, tex_xfer, 0, row, width, 1,
-                                   format, rgba);
-
-         _mesa_pack_rgba_span_float(ctx, width, (GLfloat (*)[4]) rgba, format,
-                                    type, dest, &ctx->Pack, transferOps);
-      }
-   }
-
-   _mesa_unmap_pbo_dest(ctx, &ctx->Pack);
-
-   pipe->transfer_destroy(pipe, tex_xfer);
-
-   /* destroy the temp / dest surface */
-   util_destroy_rgba_surface(dst_texture, dst_surface);
-}
-
-
-
-/**
- * Need to map texture image into memory before copying image data,
- * then unmap it.
- */
-static void
-st_get_tex_image(struct gl_context * ctx, GLenum target, GLint level,
-                 GLenum format, GLenum type, GLvoid * pixels,
-                 struct gl_texture_object *texObj,
-                 struct gl_texture_image *texImage, GLboolean compressed_dst)
-{
-   struct st_context *st = st_context(ctx);
-   struct st_texture_image *stImage = st_texture_image(texImage);
-   const GLuint dstImageStride =
-      _mesa_image_image_stride(&ctx->Pack, texImage->Width, texImage->Height,
-                               format, type);
-   GLuint depth, i;
-   GLubyte *dest;
-
-   if (stImage->pt &&
-       util_format_is_s3tc(stImage->pt->format) &&
-       !compressed_dst) {
-      /* Need to decompress the texture.
-       * We'll do this by rendering a textured quad.
-       * Note that we only expect RGBA formats (no Z/depth formats).
-       */
-      decompress_with_blit(ctx, target, level, format, type, pixels,
-                           texObj, texImage);
-      return;
-   }
-
-   /* Map */
-   if (stImage->pt) {
-      /* Image is stored in hardware format in a buffer managed by the
-       * kernel.  Need to explicitly map and unmap it.
-       */
-      texImage->Data = st_texture_image_map(st, stImage, 0,
-                                            PIPE_TRANSFER_READ, 0, 0,
-                                            stImage->base.Width,
-                                            stImage->base.Height);
-      /* compute stride in texels from stride in bytes */
-      texImage->RowStride = stImage->transfer->stride
-         * util_format_get_blockwidth(stImage->pt->format)
-         / util_format_get_blocksize(stImage->pt->format);
-   }
-   else {
-      /* Otherwise, the image should actually be stored in
-       * texImage->Data.  This is pretty confusing for
-       * everybody, I'd much prefer to separate the two functions of
-       * texImage->Data - storage for texture images in main memory
-       * and access (ie mappings) of images.  In other words, we'd
-       * create a new texImage->Map field and leave Data simply for
-       * storage.
-       */
-      assert(texImage->Data);
-   }
-
-   depth = texImage->Depth;
-   texImage->Depth = 1;
-
-   dest = (GLubyte *) pixels;
-
-   _mesa_set_fetch_functions(texImage, get_texture_dims(target));
-
-   for (i = 0; i < depth; i++) {
-      if (compressed_dst) {
-	 _mesa_get_compressed_teximage(ctx, target, level, dest,
-				       texObj, texImage);
-      }
-      else {
-	 _mesa_get_teximage(ctx, target, level, format, type, dest,
-			    texObj, texImage);
-      }
-
-      if (stImage->pt && i + 1 < depth) {
-         /* unmap this slice */
-	 st_texture_image_unmap(st, stImage);
-         /* map next slice of 3D texture */
-	 texImage->Data = st_texture_image_map(st, stImage, i + 1,
-                                               PIPE_TRANSFER_READ, 0, 0,
-                                               stImage->base.Width,
-                                               stImage->base.Height);
-	 dest += dstImageStride;
-      }
-   }
-
-   texImage->Depth = depth;
-
-   /* Unmap */
-   if (stImage->pt) {
-      st_texture_image_unmap(st, stImage);
-      texImage->Data = NULL;
-   }
-}
-
-
-static void
-st_GetTexImage(struct gl_context * ctx, GLenum target, GLint level,
-               GLenum format, GLenum type, GLvoid * pixels,
-               struct gl_texture_object *texObj,
-               struct gl_texture_image *texImage)
-{
-   st_get_tex_image(ctx, target, level, format, type, pixels, texObj, texImage,
-                    GL_FALSE);
-}
-
-
-static void
-st_GetCompressedTexImage(struct gl_context *ctx, GLenum target, GLint level,
-                         GLvoid *pixels,
-                         struct gl_texture_object *texObj,
-                         struct gl_texture_image *texImage)
-{
-   st_get_tex_image(ctx, target, level, 0, 0, pixels, texObj, texImage,
-                    GL_TRUE);
-}
-
-
-
-static void
-st_TexSubimage(struct gl_context *ctx, GLint dims, GLenum target, GLint level,
-               GLint xoffset, GLint yoffset, GLint zoffset,
-               GLint width, GLint height, GLint depth,
-               GLenum format, GLenum type, const void *pixels,
-               const struct gl_pixelstore_attrib *packing,
-               struct gl_texture_object *texObj,
-               struct gl_texture_image *texImage)
-{
-   struct st_context *st = st_context(ctx);
-   struct st_texture_image *stImage = st_texture_image(texImage);
-   GLuint dstRowStride;
-   const GLuint srcImageStride =
-      _mesa_image_image_stride(packing, width, height, format, type);
-   GLint i;
-   const GLubyte *src;
-   /* init to silence warning only: */
-   enum pipe_transfer_usage transfer_usage = PIPE_TRANSFER_WRITE;
-
-   DBG("%s target %s level %d offset %d,%d %dx%d\n", __FUNCTION__,
-       _mesa_lookup_enum_by_nr(target),
-       level, xoffset, yoffset, width, height);
-
-   pixels =
-      _mesa_validate_pbo_teximage(ctx, dims, width, height, depth, format,
-                                  type, pixels, packing, "glTexSubImage2D");
-   if (!pixels)
-      return;
-
-   /* for a 1D array upload the image as a series of layer with height = 1 */
-   if (target == GL_TEXTURE_1D_ARRAY) {
-      depth = height;
-      height = 1;
-   }
-
-   /* Map buffer if necessary.  Need to lock to prevent other contexts
-    * from uploading the buffer under us.
-    */
-   if (stImage->pt) {
-      if (format == GL_DEPTH_COMPONENT &&
-          util_format_is_depth_and_stencil(stImage->pt->format))
-         transfer_usage = PIPE_TRANSFER_READ_WRITE;
-      else
-         transfer_usage = PIPE_TRANSFER_WRITE;
-
-      texImage->Data = st_texture_image_map(st, stImage, zoffset, 
-                                            transfer_usage,
-                                            xoffset, yoffset,
-                                            width, height);
-   }
-
-   if (!texImage->Data) {
-      _mesa_error(ctx, GL_OUT_OF_MEMORY, "glTexSubImage");
-      goto done;
-   }
-
-   src = (const GLubyte *) pixels;
-   dstRowStride = stImage->transfer->stride;
-
-   for (i = 0; i < depth; i++) {
-      if (!_mesa_texstore(ctx, dims, texImage->_BaseFormat,
-                          texImage->TexFormat,
-                          texImage->Data,
-                          0, 0, 0,
-                          dstRowStride,
-                          texImage->ImageOffsets,
-                          width, height, 1,
-                          format, type, src, packing)) {
-	 _mesa_error(ctx, GL_OUT_OF_MEMORY, "glTexSubImage");
-      }
-
-      if (stImage->pt && i + 1 < depth) {
-         /* unmap this slice */
-	 st_texture_image_unmap(st, stImage);
-         /* map next slice of 3D texture */
-	 texImage->Data = st_texture_image_map(st, stImage,
-                                               zoffset + i + 1,
-                                               transfer_usage,
-                                               xoffset, yoffset,
-                                               width, height);
-	 src += srcImageStride;
-      }
-   }
-
-done:
-   _mesa_unmap_teximage_pbo(ctx, packing);
-
-   if (stImage->pt && texImage->Data) {
-      st_texture_image_unmap(st, stImage);
-      texImage->Data = NULL;
-   }
-}
-
-
-
-static void
-st_TexSubImage3D(struct gl_context *ctx, GLenum target, GLint level,
-                 GLint xoffset, GLint yoffset, GLint zoffset,
-                 GLsizei width, GLsizei height, GLsizei depth,
-                 GLenum format, GLenum type, const GLvoid *pixels,
-                 const struct gl_pixelstore_attrib *packing,
-                 struct gl_texture_object *texObj,
-                 struct gl_texture_image *texImage)
-{
-   st_TexSubimage(ctx, 3, target, level, xoffset, yoffset, zoffset,
-                  width, height, depth, format, type,
-                  pixels, packing, texObj, texImage);
-}
-
-
-static void
-st_TexSubImage2D(struct gl_context *ctx, GLenum target, GLint level,
-                 GLint xoffset, GLint yoffset,
-                 GLsizei width, GLsizei height,
-                 GLenum format, GLenum type, const GLvoid * pixels,
-                 const struct gl_pixelstore_attrib *packing,
-                 struct gl_texture_object *texObj,
-                 struct gl_texture_image *texImage)
-{
-   st_TexSubimage(ctx, 2, target, level, xoffset, yoffset, 0,
-                  width, height, 1, format, type,
-                  pixels, packing, texObj, texImage);
-}
-
-
-static void
-st_TexSubImage1D(struct gl_context *ctx, GLenum target, GLint level,
-                 GLint xoffset, GLsizei width, GLenum format, GLenum type,
-                 const GLvoid * pixels,
-                 const struct gl_pixelstore_attrib *packing,
-                 struct gl_texture_object *texObj,
-                 struct gl_texture_image *texImage)
-{
-   st_TexSubimage(ctx, 1, target, level, xoffset, 0, 0, width, 1, 1,
-                  format, type, pixels, packing, texObj, texImage);
-}
-
-
-static void
-st_CompressedTexSubImage1D(struct gl_context *ctx, GLenum target, GLint level,
-                           GLint xoffset, GLsizei width,
-                           GLenum format,
-                           GLsizei imageSize, const GLvoid *data,
-                           struct gl_texture_object *texObj,
-                           struct gl_texture_image *texImage)
-{
-   assert(0);
-}
-
-
-static void
-st_CompressedTexSubImage2D(struct gl_context *ctx, GLenum target, GLint level,
-                           GLint xoffset, GLint yoffset,
-                           GLsizei width, GLint height,
-                           GLenum format,
-                           GLsizei imageSize, const GLvoid *data,
-                           struct gl_texture_object *texObj,
-                           struct gl_texture_image *texImage)
-{
-   struct st_context *st = st_context(ctx);
-   struct st_texture_image *stImage = st_texture_image(texImage);
-   int srcBlockStride;
-   int dstBlockStride;
-   int y;
-   enum pipe_format pformat;
-
-   if (stImage->pt) {
-      pformat = stImage->pt->format;
-
-      texImage->Data = st_texture_image_map(st, stImage, 0, 
-                                            PIPE_TRANSFER_WRITE,
-                                            xoffset, yoffset,
-                                            width, height);
-      
-      srcBlockStride = util_format_get_stride(pformat, width);
-      dstBlockStride = stImage->transfer->stride;
-   } else {
-      assert(stImage->pt);
-      /* TODO find good values for block and strides */
-      /* TODO also adjust texImage->data for yoffset/xoffset */
-      return;
-   }
-
-   if (!texImage->Data) {
-      _mesa_error(ctx, GL_OUT_OF_MEMORY, "glCompressedTexSubImage");
-      return;
-   }
-
-   assert(xoffset % util_format_get_blockwidth(pformat) == 0);
-   assert(yoffset % util_format_get_blockheight(pformat) == 0);
-
-   for (y = 0; y < height; y += util_format_get_blockheight(pformat)) {
-      /* don't need to adjust for xoffset and yoffset as st_texture_image_map does that */
-      const char *src = (const char*)data + srcBlockStride * util_format_get_nblocksy(pformat, y);
-      char *dst = (char*)texImage->Data + dstBlockStride * util_format_get_nblocksy(pformat, y);
-      memcpy(dst, src, util_format_get_stride(pformat, width));
-   }
-
-   if (stImage->pt) {
-      st_texture_image_unmap(st, stImage);
-      texImage->Data = NULL;
-   }
-}
-
-
-static void
-st_CompressedTexSubImage3D(struct gl_context *ctx, GLenum target, GLint level,
-                           GLint xoffset, GLint yoffset, GLint zoffset,
-                           GLsizei width, GLint height, GLint depth,
-                           GLenum format,
-                           GLsizei imageSize, const GLvoid *data,
-                           struct gl_texture_object *texObj,
-                           struct gl_texture_image *texImage)
-{
-   assert(0);
-}
-
-
-
-/**
- * Do a CopyTexSubImage operation using a read transfer from the source,
- * a write transfer to the destination and get_tile()/put_tile() to access
- * the pixels/texels.
- *
- * Note: srcY=0=TOP of renderbuffer
- */
-static void
-fallback_copy_texsubimage(struct gl_context *ctx, GLenum target, GLint level,
-                          struct st_renderbuffer *strb,
-                          struct st_texture_image *stImage,
-                          GLenum baseFormat,
-                          GLint destX, GLint destY, GLint destZ,
-                          GLint srcX, GLint srcY,
-                          GLsizei width, GLsizei height)
-{
-   struct st_context *st = st_context(ctx);
-   struct pipe_context *pipe = st->pipe;
-   struct pipe_transfer *src_trans;
-   GLvoid *texDest;
-   enum pipe_transfer_usage transfer_usage;
-
-   if (ST_DEBUG & DEBUG_FALLBACK)
-      debug_printf("%s: fallback processing\n", __FUNCTION__);
-
-   assert(width <= MAX_WIDTH);
-
-   if (st_fb_orientation(ctx->ReadBuffer) == Y_0_TOP) {
-      srcY = strb->Base.Height - srcY - height;
-   }
-
-   src_trans = pipe_get_transfer(st_context(ctx)->pipe,
-                                 strb->texture,
-                                 0, 0,
-                                 PIPE_TRANSFER_READ,
-                                 srcX, srcY,
-                                 width, height);
-
-   if ((baseFormat == GL_DEPTH_COMPONENT ||
-        baseFormat == GL_DEPTH_STENCIL) &&
-       util_format_is_depth_and_stencil(stImage->pt->format))
-      transfer_usage = PIPE_TRANSFER_READ_WRITE;
-   else
-      transfer_usage = PIPE_TRANSFER_WRITE;
-
-   /* XXX this used to ignore destZ param */
-   texDest = st_texture_image_map(st, stImage, destZ, transfer_usage,
-                                  destX, destY, width, height);
-
-   if (baseFormat == GL_DEPTH_COMPONENT ||
-       baseFormat == GL_DEPTH_STENCIL) {
-      const GLboolean scaleOrBias = (ctx->Pixel.DepthScale != 1.0F ||
-                                     ctx->Pixel.DepthBias != 0.0F);
-      GLint row, yStep;
-
-      /* determine bottom-to-top vs. top-to-bottom order for src buffer */
-      if (st_fb_orientation(ctx->ReadBuffer) == Y_0_TOP) {
-         srcY = height - 1;
-         yStep = -1;
-      }
-      else {
-         srcY = 0;
-         yStep = 1;
-      }
-
-      /* To avoid a large temp memory allocation, do copy row by row */
-      for (row = 0; row < height; row++, srcY += yStep) {
-         uint data[MAX_WIDTH];
-         pipe_get_tile_z(pipe, src_trans, 0, srcY, width, 1, data);
-         if (scaleOrBias) {
-            _mesa_scale_and_bias_depth_uint(ctx, width, data);
-         }
-         pipe_put_tile_z(pipe, stImage->transfer, 0, row, width, 1, data);
-      }
-   }
-   else {
-      /* RGBA format */
-      GLfloat *tempSrc =
-         (GLfloat *) malloc(width * height * 4 * sizeof(GLfloat));
-
-      if (tempSrc && texDest) {
-         const GLint dims = 2;
-         const GLint dstRowStride = stImage->transfer->stride;
-         struct gl_texture_image *texImage = &stImage->base;
-         struct gl_pixelstore_attrib unpack = ctx->DefaultPacking;
-
-         if (st_fb_orientation(ctx->ReadBuffer) == Y_0_TOP) {
-            unpack.Invert = GL_TRUE;
-         }
-
-         /* get float/RGBA image from framebuffer */
-         /* XXX this usually involves a lot of int/float conversion.
-          * try to avoid that someday.
-          */
-         pipe_get_tile_rgba_format(pipe, src_trans, 0, 0, width, height,
-                                   util_format_linear(strb->texture->format),
-                                   tempSrc);
-
-         /* Store into texture memory.
-          * Note that this does some special things such as pixel transfer
-          * ops and format conversion.  In particular, if the dest tex format
-          * is actually RGBA but the user created the texture as GL_RGB we
-          * need to fill-in/override the alpha channel with 1.0.
-          */
-         _mesa_texstore(ctx, dims,
-                        texImage->_BaseFormat, 
-                        texImage->TexFormat, 
-                        texDest,
-                        0, 0, 0,
-                        dstRowStride,
-                        texImage->ImageOffsets,
-                        width, height, 1,
-                        GL_RGBA, GL_FLOAT, tempSrc, /* src */
-                        &unpack);
-      }
-      else {
-         _mesa_error(ctx, GL_OUT_OF_MEMORY, "glTexSubImage");
-      }
-
-      if (tempSrc)
-         free(tempSrc);
-   }
-
-   st_texture_image_unmap(st, stImage);
-   pipe->transfer_destroy(pipe, src_trans);
-}
-
-
-
-/**
- * If the format of the src renderbuffer and the format of the dest
- * texture are compatible (in terms of blitting), return a TGSI writemask
- * to be used during the blit.
- * If the src/dest are incompatible, return 0.
- */
-static unsigned
-compatible_src_dst_formats(struct gl_context *ctx,
-                           const struct gl_renderbuffer *src,
-                           const struct gl_texture_image *dst)
-{
-   /* Get logical base formats for the src and dest.
-    * That is, use the user-requested formats and not the actual, device-
-    * chosen formats.
-    * For example, the user may have requested an A8 texture but the
-    * driver may actually be using an RGBA texture format.  When we
-    * copy/blit to that texture, we only want to copy the Alpha channel
-    * and not the RGB channels.
-    *
-    * Similarly, when the src FBO was created an RGB format may have been
-    * requested but the driver actually chose an RGBA format.  In that case,
-    * we don't want to copy the undefined Alpha channel to the dest texture
-    * (it should be 1.0).
-    */
-   const GLenum srcFormat = _mesa_base_fbo_format(ctx, src->InternalFormat);
-   const GLenum dstFormat = _mesa_base_tex_format(ctx, dst->InternalFormat);
-
-   /**
-    * XXX when we have red-only and red/green renderbuffers we'll need
-    * to add more cases here (or implement a general-purpose routine that
-    * queries the existance of the R,G,B,A channels in the src and dest).
-    */
-   if (srcFormat == dstFormat) {
-      /* This is the same as matching_base_formats, which should
-       * always pass, as it did previously.
-       */
-      return TGSI_WRITEMASK_XYZW;
-   }
-   else if (srcFormat == GL_RGB && dstFormat == GL_RGBA) {
-      /* Make sure that A in the dest is 1.  The actual src format
-       * may be RGBA and have undefined A values.
-       */
-      return TGSI_WRITEMASK_XYZ;
-   }
-   else if (srcFormat == GL_RGBA && dstFormat == GL_RGB) {
-      /* Make sure that A in the dest is 1.  The actual dst format
-       * may be RGBA and will need A=1 to provide proper alpha values
-       * when sampled later.
-       */
-      return TGSI_WRITEMASK_XYZ;
-   }
-   else {
-      if (ST_DEBUG & DEBUG_FALLBACK)
-         debug_printf("%s failed for src %s, dst %s\n",
-                      __FUNCTION__, 
-                      _mesa_lookup_enum_by_nr(srcFormat),
-                      _mesa_lookup_enum_by_nr(dstFormat));
-
-      /* Otherwise fail.
-       */
-      return 0;
-   }
-}
-
-
-
-/**
- * Do a CopyTex[Sub]Image1/2/3D() using a hardware (blit) path if possible.
- * Note that the region to copy has already been clipped so we know we
- * won't read from outside the source renderbuffer's bounds.
- *
- * Note: srcY=0=Bottom of renderbuffer (GL convention)
- */
-static void
-st_copy_texsubimage(struct gl_context *ctx,
-                    GLenum target, GLint level,
-                    GLint destX, GLint destY, GLint destZ,
-                    GLint srcX, GLint srcY,
-                    GLsizei width, GLsizei height)
-{
-   struct gl_texture_unit *texUnit =
-      &ctx->Texture.Unit[ctx->Texture.CurrentUnit];
-   struct gl_texture_object *texObj =
-      _mesa_select_tex_object(ctx, texUnit, target);
-   struct gl_texture_image *texImage =
-      _mesa_select_tex_image(ctx, texObj, target, level);
-   struct st_texture_image *stImage = st_texture_image(texImage);
-   const GLenum texBaseFormat = texImage->_BaseFormat;
-   struct gl_framebuffer *fb = ctx->ReadBuffer;
-   struct st_renderbuffer *strb;
-   struct st_context *st = st_context(ctx);
-   struct pipe_context *pipe = st->pipe;
-   struct pipe_screen *screen = pipe->screen;
-   enum pipe_format dest_format, src_format;
-   GLboolean use_fallback = GL_TRUE;
-   GLboolean matching_base_formats;
-   GLuint format_writemask, sample_count;
-   struct pipe_surface *dest_surface = NULL;
-   GLboolean do_flip = (st_fb_orientation(ctx->ReadBuffer) == Y_0_TOP);
-
-   /* make sure finalize_textures has been called? 
-    */
-   if (0) st_validate_state(st);
-
-   /* determine if copying depth or color data */
-   if (texBaseFormat == GL_DEPTH_COMPONENT ||
-       texBaseFormat == GL_DEPTH_STENCIL) {
-      strb = st_renderbuffer(fb->_DepthBuffer);
-      if (strb->Base.Wrapped) {
-         strb = st_renderbuffer(strb->Base.Wrapped);
-      }
-   }
-   else {
-      /* texBaseFormat == GL_RGB, GL_RGBA, GL_ALPHA, etc */
-      strb = st_renderbuffer(fb->_ColorReadBuffer);
-   }
-
-   if (!strb || !strb->surface || !stImage->pt) {
-      debug_printf("%s: null strb or stImage\n", __FUNCTION__);
-      return;
-   }
-
-   sample_count = strb->surface->texture->nr_samples;
-   /* I believe this would be legal, presumably would need to do a resolve
-      for color, and for depth/stencil spec says to just use one of the
-      depth/stencil samples per pixel? Need some transfer clarifications. */
-   assert(sample_count < 2);
-
-   if (srcX < 0) {
-      width -= -srcX;
-      destX += -srcX;
-      srcX = 0;
-   }
-
-   if (srcY < 0) {
-      height -= -srcY;
-      destY += -srcY;
-      srcY = 0;
-   }
-
-   if (destX < 0) {
-      width -= -destX;
-      srcX += -destX;
-      destX = 0;
-   }
-
-   if (destY < 0) {
-      height -= -destY;
-      srcY += -destY;
-      destY = 0;
-   }
-
-   if (width < 0 || height < 0)
-      return;
-
-
-   assert(strb);
-   assert(strb->surface);
-   assert(stImage->pt);
-
-   src_format = strb->surface->format;
-   dest_format = stImage->pt->format;
-
-   /*
-    * Determine if the src framebuffer and dest texture have the same
-    * base format.  We need this to detect a case such as the framebuffer
-    * being GL_RGBA but the texture being GL_RGB.  If the actual hardware
-    * texture format stores RGBA we need to set A=1 (overriding the
-    * framebuffer's alpha values).  We can't do that with the blit or
-    * textured-quad paths.
-    */
-   matching_base_formats =
-      (_mesa_get_format_base_format(strb->Base.Format) ==
-       _mesa_get_format_base_format(texImage->TexFormat));
-   format_writemask = compatible_src_dst_formats(ctx, &strb->Base, texImage);
-
-   if (ctx->_ImageTransferState == 0x0) {
-
-      if (matching_base_formats &&
-          src_format == dest_format &&
-          !do_flip)
-      {
-         /* use surface_copy() / blit */
-         struct pipe_box src_box;
-         u_box_2d_zslice(srcX, srcY, strb->surface->u.tex.first_layer,
-                         width, height, &src_box);
-
-         /* for resource_copy_region(), y=0=top, always */
-         pipe->resource_copy_region(pipe,
-                                    /* dest */
-                                    stImage->pt,
-                                    stImage->level,
-                                    destX, destY, destZ + stImage->face,
-                                    /* src */
-                                    strb->texture,
-                                    strb->surface->u.tex.level,
-                                    &src_box);
-         use_fallback = GL_FALSE;
-      }
-      else if (format_writemask &&
-               texBaseFormat != GL_DEPTH_COMPONENT &&
-               texBaseFormat != GL_DEPTH_STENCIL &&
-               screen->is_format_supported(screen, src_format,
-                                           PIPE_TEXTURE_2D, sample_count,
-                                           PIPE_BIND_SAMPLER_VIEW,
-                                           0) &&
-               screen->is_format_supported(screen, dest_format,
-                                           PIPE_TEXTURE_2D, 0,
-                                           PIPE_BIND_RENDER_TARGET,
-                                           0)) {
-         /* draw textured quad to do the copy */
-         GLint srcY0, srcY1;
-         struct pipe_surface surf_tmpl;
-         memset(&surf_tmpl, 0, sizeof(surf_tmpl));
-         surf_tmpl.format = stImage->pt->format;
-         surf_tmpl.usage = PIPE_BIND_RENDER_TARGET;
-         surf_tmpl.u.tex.level = stImage->level;
-         surf_tmpl.u.tex.first_layer = stImage->face + destZ;
-         surf_tmpl.u.tex.last_layer = stImage->face + destZ;
-
-         dest_surface = pipe->create_surface(pipe, stImage->pt,
-                                             &surf_tmpl);
-
-         if (do_flip) {
-            srcY1 = strb->Base.Height - srcY - height;
-            srcY0 = srcY1 + height;
-         }
-         else {
-            srcY0 = srcY;
-            srcY1 = srcY0 + height;
-         }
-
-         util_blit_pixels_writemask(st->blit,
-                                    strb->texture,
-                                    strb->surface->u.tex.level,
-                                    srcX, srcY0,
-                                    srcX + width, srcY1,
-                                    strb->surface->u.tex.first_layer,
-                                    dest_surface,
-                                    destX, destY,
-                                    destX + width, destY + height,
-                                    0.0, PIPE_TEX_MIPFILTER_NEAREST,
-                                    format_writemask);
-         use_fallback = GL_FALSE;
-      }
-
-      if (dest_surface)
-         pipe_surface_reference(&dest_surface, NULL);
-   }
-
-   if (use_fallback) {
-      /* software fallback */
-      fallback_copy_texsubimage(ctx, target, level,
-                                strb, stImage, texBaseFormat,
-                                destX, destY, destZ,
-                                srcX, srcY, width, height);
-   }
-}
-
-
-
-static void
-st_CopyTexImage1D(struct gl_context * ctx, GLenum target, GLint level,
-                  GLenum internalFormat,
-                  GLint x, GLint y, GLsizei width, GLint border)
-{
-   struct gl_texture_unit *texUnit =
-      &ctx->Texture.Unit[ctx->Texture.CurrentUnit];
-   struct gl_texture_object *texObj =
-      _mesa_select_tex_object(ctx, texUnit, target);
-   struct gl_texture_image *texImage =
-      _mesa_select_tex_image(ctx, texObj, target, level);
-
-   /* Setup or redefine the texture object, texture and texture
-    * image.  Don't populate yet.  
-    */
-   ctx->Driver.TexImage1D(ctx, target, level, internalFormat,
-                          width, border,
-                          GL_RGBA, CHAN_TYPE, NULL,
-                          &ctx->DefaultPacking, texObj, texImage);
-
-   st_copy_texsubimage(ctx, target, level,
-                       0, 0, 0,  /* destX,Y,Z */
-                       x, y, width, 1);  /* src X, Y, size */
-}
-
-
-static void
-st_CopyTexImage2D(struct gl_context * ctx, GLenum target, GLint level,
-                  GLenum internalFormat,
-                  GLint x, GLint y, GLsizei width, GLsizei height,
-                  GLint border)
-{
-   struct gl_texture_unit *texUnit =
-      &ctx->Texture.Unit[ctx->Texture.CurrentUnit];
-   struct gl_texture_object *texObj =
-      _mesa_select_tex_object(ctx, texUnit, target);
-   struct gl_texture_image *texImage =
-      _mesa_select_tex_image(ctx, texObj, target, level);
-
-   /* Setup or redefine the texture object, texture and texture
-    * image.  Don't populate yet.  
-    */
-   ctx->Driver.TexImage2D(ctx, target, level, internalFormat,
-                          width, height, border,
-                          GL_RGBA, CHAN_TYPE, NULL,
-                          &ctx->DefaultPacking, texObj, texImage);
-
-   st_copy_texsubimage(ctx, target, level,
-                       0, 0, 0,  /* destX,Y,Z */
-                       x, y, width, height);  /* src X, Y, size */
-}
-
-
-static void
-st_CopyTexSubImage1D(struct gl_context * ctx, GLenum target, GLint level,
-                     GLint xoffset, GLint x, GLint y, GLsizei width)
-{
-   const GLint yoffset = 0, zoffset = 0;
-   const GLsizei height = 1;
-   st_copy_texsubimage(ctx, target, level,
-                       xoffset, yoffset, zoffset,  /* destX,Y,Z */
-                       x, y, width, height);  /* src X, Y, size */
-}
-
-
-static void
-st_CopyTexSubImage2D(struct gl_context * ctx, GLenum target, GLint level,
-                     GLint xoffset, GLint yoffset,
-                     GLint x, GLint y, GLsizei width, GLsizei height)
-{
-   const GLint zoffset = 0;
-   st_copy_texsubimage(ctx, target, level,
-                       xoffset, yoffset, zoffset,  /* destX,Y,Z */
-                       x, y, width, height);  /* src X, Y, size */
-}
-
-
-static void
-st_CopyTexSubImage3D(struct gl_context * ctx, GLenum target, GLint level,
-                     GLint xoffset, GLint yoffset, GLint zoffset,
-                     GLint x, GLint y, GLsizei width, GLsizei height)
-{
-   st_copy_texsubimage(ctx, target, level,
-                       xoffset, yoffset, zoffset,  /* destX,Y,Z */
-                       x, y, width, height);  /* src X, Y, size */
-}
-
-
-/**
- * Copy image data from stImage into the texture object 'stObj' at level
- * 'dstLevel'.
- */
-static void
-copy_image_data_to_texture(struct st_context *st,
-			   struct st_texture_object *stObj,
-                           GLuint dstLevel,
-			   struct st_texture_image *stImage)
-{
-   /* debug checks */
-   {
-      const struct gl_texture_image *dstImage =
-         stObj->base.Image[stImage->face][stImage->level];
-      assert(dstImage);
-      assert(dstImage->Width == stImage->base.Width);
-      assert(dstImage->Height == stImage->base.Height);
-      assert(dstImage->Depth == stImage->base.Depth);
-   }
-
-   if (stImage->pt) {
-      /* Copy potentially with the blitter:
-       */
-      st_texture_image_copy(st->pipe,
-                            stObj->pt, dstLevel,  /* dest texture, level */
-                            stImage->pt, stImage->level, /* src texture, level */
-                            stImage->face);
-
-      pipe_resource_reference(&stImage->pt, NULL);
-   }
-   else if (stImage->base.Data) {
-      st_texture_image_data(st,
-                            stObj->pt,
-                            stImage->face,
-                            dstLevel,
-                            stImage->base.Data,
-                            stImage->base.RowStride * 
-                            util_format_get_blocksize(stObj->pt->format),
-                            stImage->base.RowStride *
-                            stImage->base.Height *
-                            util_format_get_blocksize(stObj->pt->format));
-      _mesa_align_free(stImage->base.Data);
-      stImage->base.Data = NULL;
-   }
-
-   pipe_resource_reference(&stImage->pt, stObj->pt);
-}
-
-
-/**
- * Called during state validation.  When this function is finished,
- * the texture object should be ready for rendering.
- * \return GL_TRUE for success, GL_FALSE for failure (out of mem)
- */
-GLboolean
-st_finalize_texture(struct gl_context *ctx,
-		    struct pipe_context *pipe,
-		    struct gl_texture_object *tObj)
-{
-   struct st_context *st = st_context(ctx);
-   struct st_texture_object *stObj = st_texture_object(tObj);
-   const GLuint nr_faces = (stObj->base.Target == GL_TEXTURE_CUBE_MAP) ? 6 : 1;
-   GLuint face;
-   struct st_texture_image *firstImage;
-   enum pipe_format firstImageFormat;
-   GLuint ptWidth, ptHeight, ptDepth, ptLayers;
-
-   if (stObj->base._Complete) {
-      /* The texture is complete and we know exactly how many mipmap levels
-       * are present/needed.  This is conditional because we may be called
-       * from the st_generate_mipmap() function when the texture object is
-       * incomplete.  In that case, we'll have set stObj->lastLevel before
-       * we get here.
-       */
-      if (stObj->base.MinFilter == GL_LINEAR ||
-          stObj->base.MinFilter == GL_NEAREST)
-         stObj->lastLevel = stObj->base.BaseLevel;
-      else
-         stObj->lastLevel = stObj->base._MaxLevel;
-   }
-
-   firstImage = st_texture_image(stObj->base.Image[0][stObj->base.BaseLevel]);
-   assert(firstImage);
-
-   /* If both firstImage and stObj point to a texture which can contain
-    * all active images, favour firstImage.  Note that because of the
-    * completeness requirement, we know that the image dimensions
-    * will match.
-    */
-   if (firstImage->pt &&
-       firstImage->pt != stObj->pt &&
-       (!stObj->pt || firstImage->pt->last_level >= stObj->pt->last_level)) {
-      pipe_resource_reference(&stObj->pt, firstImage->pt);
-      pipe_sampler_view_reference(&stObj->sampler_view, NULL);
-   }
-
-   /* Find gallium format for the Mesa texture */
-   firstImageFormat = st_mesa_format_to_pipe_format(firstImage->base.TexFormat);
-
-   /* Find size of level=0 Gallium mipmap image, plus number of texture layers */
-   {
-      GLuint width, height, depth;
-      if (!guess_base_level_size(stObj->base.Target,
-                                 firstImage->base.Width2,
-                                 firstImage->base.Height2,
-                                 firstImage->base.Depth2,
-                                 stObj->base.BaseLevel,
-                                 &width, &height, &depth)) {
-         width = stObj->width0;
-         height = stObj->height0;
-         depth = stObj->depth0;
-      }
-      /* convert GL dims to Gallium dims */
-      st_gl_texture_dims_to_pipe_dims(stObj->base.Target, width, height, depth,
-                                      &ptWidth, &ptHeight, &ptDepth, &ptLayers);
-   }
-
-   /* If we already have a gallium texture, check that it matches the texture
-    * object's format, target, size, num_levels, etc.
-    */
-   if (stObj->pt) {
-      if (stObj->pt->target != gl_target_to_pipe(stObj->base.Target) ||
-          !st_sampler_compat_formats(stObj->pt->format, firstImageFormat) ||
-          stObj->pt->last_level < stObj->lastLevel ||
-          stObj->pt->width0 != ptWidth ||
-          stObj->pt->height0 != ptHeight ||
-          stObj->pt->depth0 != ptDepth ||
-          stObj->pt->array_size != ptLayers)
-      {
-         /* The gallium texture does not match the Mesa texture so delete the
-          * gallium texture now.  We'll make a new one below.
-          */
-         pipe_resource_reference(&stObj->pt, NULL);
-         pipe_sampler_view_reference(&stObj->sampler_view, NULL);
-         st->dirty.st |= ST_NEW_FRAMEBUFFER;
-      }
-   }
-
-   /* May need to create a new gallium texture:
-    */
-   if (!stObj->pt) {
-      GLuint bindings = default_bindings(st, firstImageFormat);
-
-      stObj->pt = st_texture_create(st,
-                                    gl_target_to_pipe(stObj->base.Target),
-                                    firstImageFormat,
-                                    stObj->lastLevel,
-                                    ptWidth,
-                                    ptHeight,
-                                    ptDepth,
-                                    ptLayers,
-                                    bindings);
-
-      if (!stObj->pt) {
-         _mesa_error(ctx, GL_OUT_OF_MEMORY, "glTexImage");
-         return GL_FALSE;
-      }
-   }
-
-   /* Pull in any images not in the object's texture:
-    */
-   for (face = 0; face < nr_faces; face++) {
-      GLuint level;
-      for (level = stObj->base.BaseLevel; level <= stObj->lastLevel; level++) {
-         struct st_texture_image *stImage =
-            st_texture_image(stObj->base.Image[face][level]);
-
-         /* Need to import images in main memory or held in other textures.
-          */
-         if (stImage && stObj->pt != stImage->pt) {
-            copy_image_data_to_texture(st, stObj, level, stImage);
-         }
-      }
-   }
-
-   return GL_TRUE;
-}
-
-
-/**
- * Returns pointer to a default/dummy texture.
- * This is typically used when the current shader has tex/sample instructions
- * but the user has not provided a (any) texture(s).
- */
-struct gl_texture_object *
-st_get_default_texture(struct st_context *st)
-{
-   if (!st->default_texture) {
-      static const GLenum target = GL_TEXTURE_2D;
-      GLubyte pixels[16][16][4];
-      struct gl_texture_object *texObj;
-      struct gl_texture_image *texImg;
-      GLuint i, j;
-
-      /* The ARB_fragment_program spec says (0,0,0,1) should be returned
-       * when attempting to sample incomplete textures.
-       */
-      for (i = 0; i < 16; i++) {
-         for (j = 0; j < 16; j++) {
-            pixels[i][j][0] = 0;
-            pixels[i][j][1] = 0;
-            pixels[i][j][2] = 0;
-            pixels[i][j][3] = 255;
-         }
-      }
-
-      texObj = st->ctx->Driver.NewTextureObject(st->ctx, 0, target);
-
-      texImg = _mesa_get_tex_image(st->ctx, texObj, target, 0);
-
-      _mesa_init_teximage_fields(st->ctx, target, texImg,
-                                 16, 16, 1, 0,  /* w, h, d, border */
-                                 GL_RGBA, MESA_FORMAT_RGBA8888);
-
-      st_TexImage(st->ctx, 2, target,
-                  0, GL_RGBA,    /* level, intformat */
-                  16, 16, 1, 0,  /* w, h, d, border */
-                  GL_RGBA, GL_UNSIGNED_BYTE, pixels,
-                  &st->ctx->DefaultPacking,
-                  texObj, texImg,
-                  0, 0);
-
-      texObj->MinFilter = GL_NEAREST;
-      texObj->MagFilter = GL_NEAREST;
-      texObj->_Complete = GL_TRUE;
-
-      st->default_texture = texObj;
-   }
-   return st->default_texture;
-}
-
-
-void
-st_init_texture_functions(struct dd_function_table *functions)
-{
-   functions->ChooseTextureFormat = st_ChooseTextureFormat;
-   functions->TexImage1D = st_TexImage1D;
-   functions->TexImage2D = st_TexImage2D;
-   functions->TexImage3D = st_TexImage3D;
-   functions->TexSubImage1D = st_TexSubImage1D;
-   functions->TexSubImage2D = st_TexSubImage2D;
-   functions->TexSubImage3D = st_TexSubImage3D;
-   functions->CompressedTexSubImage1D = st_CompressedTexSubImage1D;
-   functions->CompressedTexSubImage2D = st_CompressedTexSubImage2D;
-   functions->CompressedTexSubImage3D = st_CompressedTexSubImage3D;
-   functions->CopyTexImage1D = st_CopyTexImage1D;
-   functions->CopyTexImage2D = st_CopyTexImage2D;
-   functions->CopyTexSubImage1D = st_CopyTexSubImage1D;
-   functions->CopyTexSubImage2D = st_CopyTexSubImage2D;
-   functions->CopyTexSubImage3D = st_CopyTexSubImage3D;
-   functions->GenerateMipmap = st_generate_mipmap;
-
-   functions->GetTexImage = st_GetTexImage;
-
-   /* compressed texture functions */
-   functions->CompressedTexImage2D = st_CompressedTexImage2D;
-   functions->GetCompressedTexImage = st_GetCompressedTexImage;
-
-   functions->NewTextureObject = st_NewTextureObject;
-   functions->NewTextureImage = st_NewTextureImage;
-   functions->DeleteTexture = st_DeleteTextureObject;
-   functions->FreeTexImageData = st_FreeTextureImageData;
-
-   functions->TextureMemCpy = do_memcpy;
-
-   /* XXX Temporary until we can query pipe's texture sizes */
-   functions->TestProxyTexImage = _mesa_test_proxy_teximage;
-}
+/**************************************************************************

+ * 

+ * Copyright 2007 Tungsten Graphics, Inc., Cedar Park, Texas.

+ * All Rights Reserved.

+ * 

+ * 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, sub license, 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 NON-INFRINGEMENT.

+ * IN NO EVENT SHALL TUNGSTEN GRAPHICS AND/OR ITS SUPPLIERS 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/mfeatures.h"

+#include "main/bufferobj.h"

+#include "main/enums.h"

+#include "main/fbobject.h"

+#include "main/formats.h"

+#include "main/image.h"

+#include "main/imports.h"

+#include "main/macros.h"

+#include "main/mipmap.h"

+#include "main/pack.h"

+#include "main/pbo.h"

+#include "main/pixeltransfer.h"

+#include "main/texcompress.h"

+#include "main/texfetch.h"

+#include "main/texgetimage.h"

+#include "main/teximage.h"

+#include "main/texobj.h"

+#include "main/texstore.h"

+

+#include "state_tracker/st_debug.h"

+#include "state_tracker/st_context.h"

+#include "state_tracker/st_cb_fbo.h"

+#include "state_tracker/st_cb_flush.h"

+#include "state_tracker/st_cb_texture.h"

+#include "state_tracker/st_format.h"

+#include "state_tracker/st_texture.h"

+#include "state_tracker/st_gen_mipmap.h"

+#include "state_tracker/st_atom.h"

+

+#include "pipe/p_context.h"

+#include "pipe/p_defines.h"

+#include "util/u_inlines.h"

+#include "pipe/p_shader_tokens.h"

+#include "util/u_tile.h"

+#include "util/u_blit.h"

+#include "util/u_format.h"

+#include "util/u_surface.h"

+#include "util/u_sampler.h"

+#include "util/u_math.h"

+#include "util/u_box.h"

+

+#define DBG if (0) printf

+

+

+static enum pipe_texture_target

+gl_target_to_pipe(GLenum target)

+{

+   switch (target) {

+   case GL_TEXTURE_1D:

+      return PIPE_TEXTURE_1D;

+   case GL_TEXTURE_2D:

+      return PIPE_TEXTURE_2D;

+   case GL_TEXTURE_RECTANGLE_NV:

+      return PIPE_TEXTURE_RECT;

+   case GL_TEXTURE_3D:

+      return PIPE_TEXTURE_3D;

+   case GL_TEXTURE_CUBE_MAP_ARB:

+      return PIPE_TEXTURE_CUBE;

+   case GL_TEXTURE_1D_ARRAY_EXT:

+      return PIPE_TEXTURE_1D_ARRAY;

+   case GL_TEXTURE_2D_ARRAY_EXT:

+      return PIPE_TEXTURE_2D_ARRAY;

+   default:

+      assert(0);

+      return 0;

+   }

+}

+

+

+/** called via ctx->Driver.NewTextureImage() */

+static struct gl_texture_image *

+st_NewTextureImage(struct gl_context * ctx)

+{

+   DBG("%s\n", __FUNCTION__);

+   (void) ctx;

+   return (struct gl_texture_image *) ST_CALLOC_STRUCT(st_texture_image);

+}

+

+

+/** called via ctx->Driver.NewTextureObject() */

+static struct gl_texture_object *

+st_NewTextureObject(struct gl_context * ctx, GLuint name, GLenum target)

+{

+   struct st_texture_object *obj = ST_CALLOC_STRUCT(st_texture_object);

+

+   DBG("%s\n", __FUNCTION__);

+   _mesa_initialize_texture_object(&obj->base, name, target);

+

+   return &obj->base;

+}

+

+/** called via ctx->Driver.DeleteTextureObject() */

+static void 

+st_DeleteTextureObject(struct gl_context *ctx,

+                       struct gl_texture_object *texObj)

+{

+   struct st_context *st = st_context(ctx);

+   struct st_texture_object *stObj = st_texture_object(texObj);

+   if (stObj->pt)

+      pipe_resource_reference(&stObj->pt, NULL);

+   if (stObj->sampler_view) {

+      if (stObj->sampler_view->context != st->pipe) {

+         /* Take "ownership" of this texture sampler view by setting

+          * its context pointer to this context.  This avoids potential

+          * crashes when the texture object is shared among contexts

+          * and the original/owner context has already been destroyed.

+          */

+         stObj->sampler_view->context = st->pipe;

+      }

+      pipe_sampler_view_reference(&stObj->sampler_view, NULL);

+   }

+   _mesa_delete_texture_object(ctx, texObj);

+}

+

+

+/** called via ctx->Driver.FreeTexImageData() */

+static void

+st_FreeTextureImageData(struct gl_context * ctx, struct gl_texture_image *texImage)

+{

+   struct st_texture_image *stImage = st_texture_image(texImage);

+

+   DBG("%s\n", __FUNCTION__);

+

+   if (stImage->pt) {

+      pipe_resource_reference(&stImage->pt, NULL);

+   }

+

+   if (texImage->Data) {

+      _mesa_align_free(texImage->Data);

+      texImage->Data = NULL;

+   }

+}

+

+

+/**

+ * From linux kernel i386 header files, copes with odd sizes better

+ * than COPY_DWORDS would:

+ * XXX Put this in src/mesa/main/imports.h ???

+ */

+#if defined(PIPE_CC_GCC) && defined(PIPE_ARCH_X86)

+static INLINE void *

+__memcpy(void *to, const void *from, size_t n)

+{

+   int d0, d1, d2;

+   __asm__ __volatile__("rep ; movsl\n\t"

+                        "testb $2,%b4\n\t"

+                        "je 1f\n\t"

+                        "movsw\n"

+                        "1:\ttestb $1,%b4\n\t"

+                        "je 2f\n\t"

+                        "movsb\n" "2:":"=&c"(d0), "=&D"(d1), "=&S"(d2)

+                        :"0"(n / 4), "q"(n), "1"((long) to), "2"((long) from)

+                        :"memory");

+   return (to);

+}

+#else

+#define __memcpy(a,b,c) memcpy(a,b,c)

+#endif

+

+

+/**

+ * The system memcpy (at least on ubuntu 5.10) has problems copying

+ * to agp (writecombined) memory from a source which isn't 64-byte

+ * aligned - there is a 4x performance falloff.

+ *

+ * The x86 __memcpy is immune to this but is slightly slower

+ * (10%-ish) than the system memcpy.

+ *

+ * The sse_memcpy seems to have a slight cliff at 64/32 bytes, but

+ * isn't much faster than x86_memcpy for agp copies.

+ * 

+ * TODO: switch dynamically.

+ */

+static void *

+do_memcpy(void *dest, const void *src, size_t n)

+{

+   if ((((unsigned long) src) & 63) || (((unsigned long) dest) & 63)) {

+      return __memcpy(dest, src, n);

+   }

+   else

+      return memcpy(dest, src, n);

+}

+

+

+/**

+ * Return default texture resource binding bitmask for the given format.

+ */

+static GLuint

+default_bindings(struct st_context *st, enum pipe_format format)

+{

+   struct pipe_screen *screen = st->pipe->screen;

+   const unsigned target = PIPE_TEXTURE_2D;

+   const unsigned geom = 0x0;

+   unsigned bindings;

+

+   if (util_format_is_depth_or_stencil(format))

+      bindings = PIPE_BIND_SAMPLER_VIEW | PIPE_BIND_DEPTH_STENCIL;

+   else

+      bindings = PIPE_BIND_SAMPLER_VIEW | PIPE_BIND_RENDER_TARGET;

+

+   if (screen->is_format_supported(screen, format, target, 0, bindings, geom))

+      return bindings;

+   else {

+      /* Try non-sRGB. */

+      format = util_format_linear(format);

+

+      if (screen->is_format_supported(screen, format, target, 0, bindings, geom))

+         return bindings;

+      else

+         return PIPE_BIND_SAMPLER_VIEW;

+   }

+}

+

+

+/** Return number of image dimensions (1, 2 or 3) for a texture target. */

+static GLuint

+get_texture_dims(GLenum target)

+{

+   switch (target) {

+   case GL_TEXTURE_1D:

+   case GL_TEXTURE_1D_ARRAY_EXT:

+      return 1;

+   case GL_TEXTURE_2D:

+   case GL_TEXTURE_CUBE_MAP_ARB:

+   case GL_TEXTURE_CUBE_MAP_POSITIVE_X_ARB:

+   case GL_TEXTURE_CUBE_MAP_NEGATIVE_X_ARB:

+   case GL_TEXTURE_CUBE_MAP_POSITIVE_Y_ARB:

+   case GL_TEXTURE_CUBE_MAP_NEGATIVE_Y_ARB:

+   case GL_TEXTURE_CUBE_MAP_POSITIVE_Z_ARB:

+   case GL_TEXTURE_CUBE_MAP_NEGATIVE_Z_ARB:

+   case GL_TEXTURE_RECTANGLE_NV:

+   case GL_TEXTURE_2D_ARRAY_EXT:

+      return 2;

+   case GL_TEXTURE_3D:

+      return 3;

+   default:

+      assert(0 && "invalid texture target in get_texture_dims()");

+      return 1;

+   }

+}

+

+

+/**

+ * Given the size of a mipmap image, try to compute the size of the level=0

+ * mipmap image.

+ *

+ * Note that this isn't always accurate for odd-sized, non-POW textures.

+ * For example, if level=1 and width=40 then the level=0 width may be 80 or 81.

+ *

+ * \return GL_TRUE for success, GL_FALSE for failure

+ */

+static GLboolean

+guess_base_level_size(GLenum target,

+                      GLuint width, GLuint height, GLuint depth, GLuint level,

+                      GLuint *width0, GLuint *height0, GLuint *depth0)

+{ 

+   const GLuint dims = get_texture_dims(target);

+

+   assert(width >= 1);

+   assert(height >= 1);

+   assert(depth >= 1);

+

+   if (level > 0) {

+      /* Depending on the image's size, we can't always make a guess here */

+      if ((dims >= 1 && width == 1) ||

+          (dims >= 2 && height == 1) ||

+          (dims >= 3 && depth == 1)) {

+         /* we can't determine the image size at level=0 */

+         return GL_FALSE;

+      }

+

+      /* grow the image size until we hit level = 0 */

+      while (level > 0) {

+         if (width > 1)

+            width <<= 1;

+         if (height > 1)

+            height <<= 1;

+         if (depth > 1)

+            depth <<= 1;

+         level--;

+      }

+   }      

+

+   *width0 = width;

+   *height0 = height;

+   *depth0 = depth;

+

+   return GL_TRUE;

+}

+

+

+/**

+ * Try to allocate a pipe_resource object for the given st_texture_object.

+ *

+ * We use the given st_texture_image as a clue to determine the size of the

+ * mipmap image at level=0.

+ *

+ * \return GL_TRUE for success, GL_FALSE if out of memory.

+ */

+static GLboolean

+guess_and_alloc_texture(struct st_context *st,

+			struct st_texture_object *stObj,

+			const struct st_texture_image *stImage)

+{

+   GLuint lastLevel, width, height, depth;

+   GLuint bindings;

+   GLuint ptWidth, ptHeight, ptDepth, ptLayers;

+   enum pipe_format fmt;

+

+   DBG("%s\n", __FUNCTION__);

+

+   assert(!stObj->pt);

+

+   if (!guess_base_level_size(stObj->base.Target,

+                              stImage->base.Width2,

+                              stImage->base.Height2,

+                              stImage->base.Depth2,

+                              stImage->level,

+                              &width, &height, &depth)) {

+      /* we can't determine the image size at level=0 */

+      stObj->width0 = stObj->height0 = stObj->depth0 = 0;

+      /* this is not an out of memory error */

+      return GL_TRUE;

+   }

+

+   /* At this point, (width x height x depth) is the expected size of

+    * the level=0 mipmap image.

+    */

+

+   /* Guess a reasonable value for lastLevel.  With OpenGL we have no

+    * idea how many mipmap levels will be in a texture until we start

+    * to render with it.  Make an educated guess here but be prepared

+    * to re-allocating a texture buffer with space for more (or fewer)

+    * mipmap levels later.

+    */

+   if ((stObj->base.MinFilter == GL_NEAREST ||

+        stObj->base.MinFilter == GL_LINEAR ||

+        stImage->base._BaseFormat == GL_DEPTH_COMPONENT ||

+        stImage->base._BaseFormat == GL_DEPTH_STENCIL_EXT) &&

+       !stObj->base.GenerateMipmap &&

+       stImage->level == 0) {

+      /* only alloc space for a single mipmap level */

+      lastLevel = 0;

+   }

+   else {

+      /* alloc space for a full mipmap */

+      GLuint l2width = util_logbase2(width);

+      GLuint l2height = util_logbase2(height);

+      GLuint l2depth = util_logbase2(depth);

+      lastLevel = MAX2(MAX2(l2width, l2height), l2depth);

+   }

+

+   /* Save the level=0 dimensions */

+   stObj->width0 = width;

+   stObj->height0 = height;

+   stObj->depth0 = depth;

+

+   fmt = st_mesa_format_to_pipe_format(stImage->base.TexFormat);

+

+   bindings = default_bindings(st, fmt);

+

+   st_gl_texture_dims_to_pipe_dims(stObj->base.Target,

+                                   width, height, depth,

+                                   &ptWidth, &ptHeight, &ptDepth, &ptLayers);

+

+   stObj->pt = st_texture_create(st,

+                                 gl_target_to_pipe(stObj->base.Target),

+                                 fmt,

+                                 lastLevel,

+                                 ptWidth,

+                                 ptHeight,

+                                 ptDepth,

+                                 ptLayers,

+                                 bindings);

+

+   DBG("%s returning %d\n", __FUNCTION__, (stObj->pt != NULL));

+

+   return stObj->pt != NULL;

+}

+

+

+/**

+ * Adjust pixel unpack params and image dimensions to strip off the

+ * texture border.

+ * Gallium doesn't support texture borders.  They've seldem been used

+ * and seldom been implemented correctly anyway.

+ * \param unpackNew  returns the new pixel unpack parameters

+ */

+static void

+strip_texture_border(GLint border,

+                     GLint *width, GLint *height, GLint *depth,

+                     const struct gl_pixelstore_attrib *unpack,

+                     struct gl_pixelstore_attrib *unpackNew)

+{

+   assert(border > 0);  /* sanity check */

+

+   *unpackNew = *unpack;

+

+   if (unpackNew->RowLength == 0)

+      unpackNew->RowLength = *width;

+

+   if (depth && unpackNew->ImageHeight == 0)

+      unpackNew->ImageHeight = *height;

+

+   unpackNew->SkipPixels += border;

+   if (height)

+      unpackNew->SkipRows += border;

+   if (depth)

+      unpackNew->SkipImages += border;

+

+   assert(*width >= 3);

+   *width = *width - 2 * border;

+   if (height && *height >= 3)

+      *height = *height - 2 * border;

+   if (depth && *depth >= 3)

+      *depth = *depth - 2 * border;

+}

+

+

+/**

+ * Do glTexImage1/2/3D().

+ */

+static void

+st_TexImage(struct gl_context * ctx,

+            GLint dims,

+            GLenum target, GLint level,

+            GLint internalFormat,

+            GLint width, GLint height, GLint depth,

+            GLint border,

+            GLenum format, GLenum type, const void *pixels,

+            const struct gl_pixelstore_attrib *unpack,

+            struct gl_texture_object *texObj,

+            struct gl_texture_image *texImage,

+            GLsizei imageSize, GLboolean compressed_src)

+{

+   struct st_context *st = st_context(ctx);

+   struct st_texture_object *stObj = st_texture_object(texObj);

+   struct st_texture_image *stImage = st_texture_image(texImage);

+   GLuint dstRowStride = 0;

+   struct gl_pixelstore_attrib unpackNB;

+   enum pipe_transfer_usage transfer_usage = 0;

+

+   DBG("%s target %s level %d %dx%dx%d border %d\n", __FUNCTION__,

+       _mesa_lookup_enum_by_nr(target), level, width, height, depth, border);

+

+   /* switch to "normal" */

+   if (stObj->surface_based) {

+      gl_format texFormat;

+

+      _mesa_clear_texture_object(ctx, texObj);

+      pipe_resource_reference(&stObj->pt, NULL);

+

+      /* oops, need to init this image again */

+      texFormat = _mesa_choose_texture_format(ctx, texObj, target, level,

+                                              internalFormat, format, type);

+

+      _mesa_init_teximage_fields(ctx, target, texImage,

+                                 width, height, depth, border,

+                                 internalFormat, texFormat);

+

+      stObj->surface_based = GL_FALSE;

+   }

+

+   /* gallium does not support texture borders, strip it off */

+   if (border) {

+      strip_texture_border(border, &width, &height, &depth, unpack, &unpackNB);

+      unpack = &unpackNB;

+      texImage->Width = width;

+      texImage->Height = height;

+      texImage->Depth = depth;

+      texImage->Border = 0;

+      border = 0;

+   }

+   else {

+      assert(texImage->Width == width);

+      assert(texImage->Height == height);

+      assert(texImage->Depth == depth);

+   }

+

+   stImage->face = _mesa_tex_target_to_face(target);

+   stImage->level = level;

+

+   _mesa_set_fetch_functions(texImage, dims);

+

+   /* Release the reference to a potentially orphaned buffer.   

+    * Release any old malloced memory.

+    */

+   if (stImage->pt) {

+      pipe_resource_reference(&stImage->pt, NULL);

+      assert(!texImage->Data);

+   }

+   else if (texImage->Data) {

+      _mesa_align_free(texImage->Data);

+   }

+

+   /*

+    * See if the new image is somehow incompatible with the existing

+    * mipmap.  If so, free the old mipmap.

+    */

+   if (stObj->pt) {

+      if (level > (GLint) stObj->pt->last_level ||

+          !st_texture_match_image(stObj->pt, &stImage->base,

+                                  stImage->face, stImage->level)) {

+         DBG("release it\n");

+         pipe_resource_reference(&stObj->pt, NULL);

+         assert(!stObj->pt);

+         pipe_sampler_view_reference(&stObj->sampler_view, NULL);

+      }

+   }

+

+   if (width == 0 || height == 0 || depth == 0) {

+      /* stop after freeing old image */

+      return;

+   }

+

+   if (!stObj->pt) {

+      if (!guess_and_alloc_texture(st, stObj, stImage)) {

+         /* Probably out of memory.

+          * Try flushing any pending rendering, then retry.

+          */

+         st_finish(st);

+         if (!guess_and_alloc_texture(st, stObj, stImage)) {

+            _mesa_error(ctx, GL_OUT_OF_MEMORY, "glTexImage");

+            return;

+         }

+      }

+   }

+

+   assert(!stImage->pt);

+

+   /* Check if this texture image can live inside the texture object's buffer.

+    * If so, store the image there.  Otherwise the image will temporarily live

+    * in its own buffer.

+    */

+   if (stObj->pt &&

+       st_texture_match_image(stObj->pt, &stImage->base,

+                              stImage->face, stImage->level)) {

+

+      pipe_resource_reference(&stImage->pt, stObj->pt);

+      assert(stImage->pt);

+   }

+

+   if (!stImage->pt)

+      DBG("XXX: Image did not fit into texture - storing in local memory!\n");

+

+   /* Pixel data may come from regular user memory or a PBO.  For the later,

+    * do bounds checking and map the PBO to read pixels data from it.

+    *

+    * XXX we should try to use a GPU-accelerated path to copy the image data

+    * from the PBO to the texture.

+    */

+   if (compressed_src) {

+      pixels = _mesa_validate_pbo_compressed_teximage(ctx, imageSize, pixels,

+						      unpack,

+						      "glCompressedTexImage");

+   }

+   else {

+      pixels = _mesa_validate_pbo_teximage(ctx, dims, width, height, 1,

+					   format, type,

+					   pixels, unpack, "glTexImage");

+   }

+

+   /* for a 1D array upload the image as a series of layer with height = 1 */

+   if (target == GL_TEXTURE_1D_ARRAY) {

+      depth = height;

+      height = 1;

+   }

+

+   /*

+    * Prepare to store the texture data.  Either map the gallium texture buffer

+    * memory or malloc space for it.

+    */

+   if (stImage->pt) {

+      /* Store the image in the gallium texture memory buffer */

+      if (format == GL_DEPTH_COMPONENT &&

+          util_format_is_depth_and_stencil(stImage->pt->format))

+         transfer_usage = PIPE_TRANSFER_READ_WRITE;

+      else

+         transfer_usage = PIPE_TRANSFER_WRITE;

+

+      texImage->Data = st_texture_image_map(st, stImage, 0,

+                                            transfer_usage, 0, 0, width, height);

+      if(stImage->transfer)

+         dstRowStride = stImage->transfer->stride;

+   }

+   else {

+      /* Allocate regular memory and store the image there temporarily.   */

+      GLuint imageSize = _mesa_format_image_size(texImage->TexFormat,

+                                                 width, height, depth);

+      dstRowStride = _mesa_format_row_stride(texImage->TexFormat, width);

+

+      texImage->Data = _mesa_align_malloc(imageSize, 16);

+   }

+

+   if (!texImage->Data) {

+      _mesa_error(ctx, GL_OUT_OF_MEMORY, "glTexImage");

+      return;

+   }

+

+   if (!pixels) {

+      /* We've allocated texture memory, but have no pixel data - all done. */

+      goto done;

+   }

+

+   DBG("Upload image %dx%dx%d row_len %x pitch %x\n",

+       width, height, depth, width, dstRowStride);

+

+   /* Copy user texture image into the texture buffer.

+    */

+   if (compressed_src) {

+      const GLuint srcRowStride =

+         _mesa_format_row_stride(texImage->TexFormat, width);

+      if (dstRowStride == srcRowStride) {

+         memcpy(texImage->Data, pixels, imageSize);

+      }

+      else {

+         char *dst = texImage->Data;

+         const char *src = pixels;

+         GLuint i, bw, bh, lines;

+         _mesa_get_format_block_size(texImage->TexFormat, &bw, &bh);

+         lines = (height + bh - 1) / bh;

+

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

+            memcpy(dst, src, srcRowStride);

+            dst += dstRowStride;

+            src += srcRowStride;

+         }

+      }

+   }

+   else {

+      const GLuint srcImageStride =

+         _mesa_image_image_stride(unpack, width, height, format, type);

+      GLint i;

+      const GLubyte *src = (const GLubyte *) pixels;

+

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

+	 if (!_mesa_texstore(ctx, dims, 

+                             texImage->_BaseFormat, 

+                             texImage->TexFormat, 

+                             texImage->Data,

+                             0, 0, 0, /* dstX/Y/Zoffset */

+                             dstRowStride,

+                             texImage->ImageOffsets,

+                             width, height, 1,

+                             format, type, src, unpack)) {

+	    _mesa_error(ctx, GL_OUT_OF_MEMORY, "glTexImage");

+	 }

+

+	 if (stImage->pt && i + 1 < depth) {

+            /* unmap this slice */

+	    st_texture_image_unmap(st, stImage);

+            /* map next slice of 3D texture */

+	    texImage->Data = st_texture_image_map(st, stImage, i + 1,

+                                                  transfer_usage, 0, 0,

+                                                  width, height);

+	    src += srcImageStride;

+	 }

+      }

+   }

+

+done:

+   _mesa_unmap_teximage_pbo(ctx, unpack);

+

+   if (stImage->pt && texImage->Data) {

+      st_texture_image_unmap(st, stImage);

+      texImage->Data = NULL;

+   }

+}

+

+

+static void

+st_TexImage3D(struct gl_context * ctx,

+              GLenum target, GLint level,

+              GLint internalFormat,

+              GLint width, GLint height, GLint depth,

+              GLint border,

+              GLenum format, GLenum type, const void *pixels,

+              const struct gl_pixelstore_attrib *unpack,

+              struct gl_texture_object *texObj,

+              struct gl_texture_image *texImage)

+{

+   st_TexImage(ctx, 3, target, level, internalFormat, width, height, depth,

+               border, format, type, pixels, unpack, texObj, texImage,

+               0, GL_FALSE);

+}

+

+

+static void

+st_TexImage2D(struct gl_context * ctx,

+              GLenum target, GLint level,

+              GLint internalFormat,

+              GLint width, GLint height, GLint border,

+              GLenum format, GLenum type, const void *pixels,

+              const struct gl_pixelstore_attrib *unpack,

+              struct gl_texture_object *texObj,

+              struct gl_texture_image *texImage)

+{

+   st_TexImage(ctx, 2, target, level, internalFormat, width, height, 1, border,

+               format, type, pixels, unpack, texObj, texImage, 0, GL_FALSE);

+}

+

+

+static void

+st_TexImage1D(struct gl_context * ctx,

+              GLenum target, GLint level,

+              GLint internalFormat,

+              GLint width, GLint border,

+              GLenum format, GLenum type, const void *pixels,

+              const struct gl_pixelstore_attrib *unpack,

+              struct gl_texture_object *texObj,

+              struct gl_texture_image *texImage)

+{

+   st_TexImage(ctx, 1, target, level, internalFormat, width, 1, 1, border,

+               format, type, pixels, unpack, texObj, texImage, 0, GL_FALSE);

+}

+

+

+static void

+st_CompressedTexImage2D(struct gl_context *ctx, GLenum target, GLint level,

+                        GLint internalFormat,

+                        GLint width, GLint height, GLint border,

+                        GLsizei imageSize, const GLvoid *data,

+                        struct gl_texture_object *texObj,

+                        struct gl_texture_image *texImage)

+{

+   st_TexImage(ctx, 2, target, level, internalFormat, width, height, 1, border,

+               0, 0, data, &ctx->Unpack, texObj, texImage, imageSize, GL_TRUE);

+}

+

+

+

+/**

+ * glGetTexImage() helper: decompress a compressed texture by rendering

+ * a textured quad.  Store the results in the user's buffer.

+ */

+static void

+decompress_with_blit(struct gl_context * ctx, GLenum target, GLint level,

+                     GLenum format, GLenum type, GLvoid *pixels,

+                     struct gl_texture_object *texObj,

+                     struct gl_texture_image *texImage)

+{

+   struct st_context *st = st_context(ctx);

+   struct pipe_context *pipe = st->pipe;

+   struct st_texture_image *stImage = st_texture_image(texImage);

+   struct st_texture_object *stObj = st_texture_object(texObj);

+   struct pipe_sampler_view *src_view =

+      st_get_texture_sampler_view(stObj, pipe);

+   const GLuint width = texImage->Width;

+   const GLuint height = texImage->Height;

+   struct pipe_surface *dst_surface;

+   struct pipe_resource *dst_texture;

+   struct pipe_transfer *tex_xfer;

+   unsigned bind = (PIPE_BIND_RENDER_TARGET | /* util_blit may choose to render */

+		    PIPE_BIND_TRANSFER_READ);

+

+   /* create temp / dest surface */

+   if (!util_create_rgba_surface(pipe, width, height, bind,

+                                 &dst_texture, &dst_surface)) {

+      _mesa_problem(ctx, "util_create_rgba_surface() failed "

+                    "in decompress_with_blit()");

+      return;

+   }

+

+   /* blit/render/decompress */

+   util_blit_pixels_tex(st->blit,

+                        src_view,      /* pipe_resource (src) */

+                        0, 0,             /* src x0, y0 */

+                        width, height,    /* src x1, y1 */

+                        dst_surface,      /* pipe_surface (dst) */

+                        0, 0,             /* dst x0, y0 */

+                        width, height,    /* dst x1, y1 */

+                        0.0,              /* z */

+                        PIPE_TEX_MIPFILTER_NEAREST);

+

+   /* map the dst_surface so we can read from it */

+   tex_xfer = pipe_get_transfer(st_context(ctx)->pipe,

+                                dst_texture, 0, 0,

+                                PIPE_TRANSFER_READ,

+                                0, 0, width, height);

+

+   pixels = _mesa_map_pbo_dest(ctx, &ctx->Pack, pixels);

+

+   /* copy/pack data into user buffer */

+   if (st_equal_formats(stImage->pt->format, format, type)) {

+      /* memcpy */

+      const uint bytesPerRow = width * util_format_get_blocksize(stImage->pt->format);

+      ubyte *map = pipe_transfer_map(pipe, tex_xfer);

+      GLuint row;

+      for (row = 0; row < height; row++) {

+         GLvoid *dest = _mesa_image_address2d(&ctx->Pack, pixels, width,

+                                              height, format, type, row, 0);

+         memcpy(dest, map, bytesPerRow);

+         map += tex_xfer->stride;

+      }

+      pipe_transfer_unmap(pipe, tex_xfer);

+   }

+   else {

+      /* format translation via floats */

+      GLuint row;

+      enum pipe_format format = util_format_linear(dst_texture->format);

+      for (row = 0; row < height; row++) {

+         const GLbitfield transferOps = 0x0; /* bypassed for glGetTexImage() */

+         GLfloat rgba[4 * MAX_WIDTH];

+         GLvoid *dest = _mesa_image_address2d(&ctx->Pack, pixels, width,

+                                              height, format, type, row, 0);

+

+         if (ST_DEBUG & DEBUG_FALLBACK)

+            debug_printf("%s: fallback format translation\n", __FUNCTION__);

+

+         /* get float[4] rgba row from surface */

+         pipe_get_tile_rgba_format(pipe, tex_xfer, 0, row, width, 1,

+                                   format, rgba);

+

+         _mesa_pack_rgba_span_float(ctx, width, (GLfloat (*)[4]) rgba, format,

+                                    type, dest, &ctx->Pack, transferOps);

+      }

+   }

+

+   _mesa_unmap_pbo_dest(ctx, &ctx->Pack);

+

+   pipe->transfer_destroy(pipe, tex_xfer);

+

+   /* destroy the temp / dest surface */

+   util_destroy_rgba_surface(dst_texture, dst_surface);

+}

+

+

+

+/**

+ * Need to map texture image into memory before copying image data,

+ * then unmap it.

+ */

+static void

+st_get_tex_image(struct gl_context * ctx, GLenum target, GLint level,

+                 GLenum format, GLenum type, GLvoid * pixels,

+                 struct gl_texture_object *texObj,

+                 struct gl_texture_image *texImage, GLboolean compressed_dst)

+{

+   struct st_context *st = st_context(ctx);

+   struct st_texture_image *stImage = st_texture_image(texImage);

+   const GLuint dstImageStride =

+      _mesa_image_image_stride(&ctx->Pack, texImage->Width, texImage->Height,

+                               format, type);

+   GLuint depth, i;

+   GLubyte *dest;

+

+   if (stImage->pt &&

+       util_format_is_s3tc(stImage->pt->format) &&

+       !compressed_dst) {

+      /* Need to decompress the texture.

+       * We'll do this by rendering a textured quad.

+       * Note that we only expect RGBA formats (no Z/depth formats).

+       */

+      decompress_with_blit(ctx, target, level, format, type, pixels,

+                           texObj, texImage);

+      return;

+   }

+

+   /* Map */

+   if (stImage->pt) {

+      /* Image is stored in hardware format in a buffer managed by the

+       * kernel.  Need to explicitly map and unmap it.

+       */

+      texImage->Data = st_texture_image_map(st, stImage, 0,

+                                            PIPE_TRANSFER_READ, 0, 0,

+                                            stImage->base.Width,

+                                            stImage->base.Height);

+      /* compute stride in texels from stride in bytes */

+      texImage->RowStride = stImage->transfer->stride

+         * util_format_get_blockwidth(stImage->pt->format)

+         / util_format_get_blocksize(stImage->pt->format);

+   }

+   else {

+      /* Otherwise, the image should actually be stored in

+       * texImage->Data.  This is pretty confusing for

+       * everybody, I'd much prefer to separate the two functions of

+       * texImage->Data - storage for texture images in main memory

+       * and access (ie mappings) of images.  In other words, we'd

+       * create a new texImage->Map field and leave Data simply for

+       * storage.

+       */

+      assert(texImage->Data);

+   }

+

+   depth = texImage->Depth;

+   texImage->Depth = 1;

+

+   dest = (GLubyte *) pixels;

+

+   _mesa_set_fetch_functions(texImage, get_texture_dims(target));

+

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

+      if (compressed_dst) {

+	 _mesa_get_compressed_teximage(ctx, target, level, dest,

+				       texObj, texImage);

+      }

+      else {

+	 _mesa_get_teximage(ctx, target, level, format, type, dest,

+			    texObj, texImage);

+      }

+

+      if (stImage->pt && i + 1 < depth) {

+         /* unmap this slice */

+	 st_texture_image_unmap(st, stImage);

+         /* map next slice of 3D texture */

+	 texImage->Data = st_texture_image_map(st, stImage, i + 1,

+                                               PIPE_TRANSFER_READ, 0, 0,

+                                               stImage->base.Width,

+                                               stImage->base.Height);

+	 dest += dstImageStride;

+      }

+   }

+

+   texImage->Depth = depth;

+

+   /* Unmap */

+   if (stImage->pt) {

+      st_texture_image_unmap(st, stImage);

+      texImage->Data = NULL;

+   }

+}

+

+

+static void

+st_GetTexImage(struct gl_context * ctx, GLenum target, GLint level,

+               GLenum format, GLenum type, GLvoid * pixels,

+               struct gl_texture_object *texObj,

+               struct gl_texture_image *texImage)

+{

+   st_get_tex_image(ctx, target, level, format, type, pixels, texObj, texImage,

+                    GL_FALSE);

+}

+

+

+static void

+st_GetCompressedTexImage(struct gl_context *ctx, GLenum target, GLint level,

+                         GLvoid *pixels,

+                         struct gl_texture_object *texObj,

+                         struct gl_texture_image *texImage)

+{

+   st_get_tex_image(ctx, target, level, 0, 0, pixels, texObj, texImage,

+                    GL_TRUE);

+}

+

+

+

+static void

+st_TexSubimage(struct gl_context *ctx, GLint dims, GLenum target, GLint level,

+               GLint xoffset, GLint yoffset, GLint zoffset,

+               GLint width, GLint height, GLint depth,

+               GLenum format, GLenum type, const void *pixels,

+               const struct gl_pixelstore_attrib *packing,

+               struct gl_texture_object *texObj,

+               struct gl_texture_image *texImage)

+{

+   struct st_context *st = st_context(ctx);

+   struct st_texture_image *stImage = st_texture_image(texImage);

+   GLuint dstRowStride;

+   const GLuint srcImageStride =

+      _mesa_image_image_stride(packing, width, height, format, type);

+   GLint i;

+   const GLubyte *src;

+   /* init to silence warning only: */

+   enum pipe_transfer_usage transfer_usage = PIPE_TRANSFER_WRITE;

+

+   DBG("%s target %s level %d offset %d,%d %dx%d\n", __FUNCTION__,

+       _mesa_lookup_enum_by_nr(target),

+       level, xoffset, yoffset, width, height);

+

+   pixels =

+      _mesa_validate_pbo_teximage(ctx, dims, width, height, depth, format,

+                                  type, pixels, packing, "glTexSubImage2D");

+   if (!pixels)

+      return;

+

+   /* for a 1D array upload the image as a series of layer with height = 1 */

+   if (target == GL_TEXTURE_1D_ARRAY) {

+      depth = height;

+      height = 1;

+   }

+

+   /* Map buffer if necessary.  Need to lock to prevent other contexts

+    * from uploading the buffer under us.

+    */

+   if (stImage->pt) {

+      if (format == GL_DEPTH_COMPONENT &&

+          util_format_is_depth_and_stencil(stImage->pt->format))

+         transfer_usage = PIPE_TRANSFER_READ_WRITE;

+      else

+         transfer_usage = PIPE_TRANSFER_WRITE;

+

+      texImage->Data = st_texture_image_map(st, stImage, zoffset, 

+                                            transfer_usage,

+                                            xoffset, yoffset,

+                                            width, height);

+   }

+

+   if (!texImage->Data) {

+      _mesa_error(ctx, GL_OUT_OF_MEMORY, "glTexSubImage");

+      goto done;

+   }

+

+   src = (const GLubyte *) pixels;

+   dstRowStride = stImage->transfer->stride;

+

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

+      if (!_mesa_texstore(ctx, dims, texImage->_BaseFormat,

+                          texImage->TexFormat,

+                          texImage->Data,

+                          0, 0, 0,

+                          dstRowStride,

+                          texImage->ImageOffsets,

+                          width, height, 1,

+                          format, type, src, packing)) {

+	 _mesa_error(ctx, GL_OUT_OF_MEMORY, "glTexSubImage");

+      }

+

+      if (stImage->pt && i + 1 < depth) {

+         /* unmap this slice */

+	 st_texture_image_unmap(st, stImage);

+         /* map next slice of 3D texture */

+	 texImage->Data = st_texture_image_map(st, stImage,

+                                               zoffset + i + 1,

+                                               transfer_usage,

+                                               xoffset, yoffset,

+                                               width, height);

+	 src += srcImageStride;

+      }

+   }

+

+done:

+   _mesa_unmap_teximage_pbo(ctx, packing);

+

+   if (stImage->pt && texImage->Data) {

+      st_texture_image_unmap(st, stImage);

+      texImage->Data = NULL;

+   }

+}

+

+

+

+static void

+st_TexSubImage3D(struct gl_context *ctx, GLenum target, GLint level,

+                 GLint xoffset, GLint yoffset, GLint zoffset,

+                 GLsizei width, GLsizei height, GLsizei depth,

+                 GLenum format, GLenum type, const GLvoid *pixels,

+                 const struct gl_pixelstore_attrib *packing,

+                 struct gl_texture_object *texObj,

+                 struct gl_texture_image *texImage)

+{

+   st_TexSubimage(ctx, 3, target, level, xoffset, yoffset, zoffset,

+                  width, height, depth, format, type,

+                  pixels, packing, texObj, texImage);

+}

+

+

+static void

+st_TexSubImage2D(struct gl_context *ctx, GLenum target, GLint level,

+                 GLint xoffset, GLint yoffset,

+                 GLsizei width, GLsizei height,

+                 GLenum format, GLenum type, const GLvoid * pixels,

+                 const struct gl_pixelstore_attrib *packing,

+                 struct gl_texture_object *texObj,

+                 struct gl_texture_image *texImage)

+{

+   st_TexSubimage(ctx, 2, target, level, xoffset, yoffset, 0,

+                  width, height, 1, format, type,

+                  pixels, packing, texObj, texImage);

+}

+

+

+static void

+st_TexSubImage1D(struct gl_context *ctx, GLenum target, GLint level,

+                 GLint xoffset, GLsizei width, GLenum format, GLenum type,

+                 const GLvoid * pixels,

+                 const struct gl_pixelstore_attrib *packing,

+                 struct gl_texture_object *texObj,

+                 struct gl_texture_image *texImage)

+{

+   st_TexSubimage(ctx, 1, target, level, xoffset, 0, 0, width, 1, 1,

+                  format, type, pixels, packing, texObj, texImage);

+}

+

+

+static void

+st_CompressedTexSubImage1D(struct gl_context *ctx, GLenum target, GLint level,

+                           GLint xoffset, GLsizei width,

+                           GLenum format,

+                           GLsizei imageSize, const GLvoid *data,

+                           struct gl_texture_object *texObj,

+                           struct gl_texture_image *texImage)

+{

+   assert(0);

+}

+

+

+static void

+st_CompressedTexSubImage2D(struct gl_context *ctx, GLenum target, GLint level,

+                           GLint xoffset, GLint yoffset,

+                           GLsizei width, GLint height,

+                           GLenum format,

+                           GLsizei imageSize, const GLvoid *data,

+                           struct gl_texture_object *texObj,

+                           struct gl_texture_image *texImage)

+{

+   struct st_context *st = st_context(ctx);

+   struct st_texture_image *stImage = st_texture_image(texImage);

+   int srcBlockStride;

+   int dstBlockStride;

+   int y;

+   enum pipe_format pformat;

+

+   if (stImage->pt) {

+      pformat = stImage->pt->format;

+

+      texImage->Data = st_texture_image_map(st, stImage, 0, 

+                                            PIPE_TRANSFER_WRITE,

+                                            xoffset, yoffset,

+                                            width, height);

+      

+      srcBlockStride = util_format_get_stride(pformat, width);

+      dstBlockStride = stImage->transfer->stride;

+   } else {

+      assert(stImage->pt);

+      /* TODO find good values for block and strides */

+      /* TODO also adjust texImage->data for yoffset/xoffset */

+      return;

+   }

+

+   if (!texImage->Data) {

+      _mesa_error(ctx, GL_OUT_OF_MEMORY, "glCompressedTexSubImage");

+      return;

+   }

+

+   assert(xoffset % util_format_get_blockwidth(pformat) == 0);

+   assert(yoffset % util_format_get_blockheight(pformat) == 0);

+

+   for (y = 0; y < height; y += util_format_get_blockheight(pformat)) {

+      /* don't need to adjust for xoffset and yoffset as st_texture_image_map does that */

+      const char *src = (const char*)data + srcBlockStride * util_format_get_nblocksy(pformat, y);

+      char *dst = (char*)texImage->Data + dstBlockStride * util_format_get_nblocksy(pformat, y);

+      memcpy(dst, src, util_format_get_stride(pformat, width));

+   }

+

+   if (stImage->pt) {

+      st_texture_image_unmap(st, stImage);

+      texImage->Data = NULL;

+   }

+}

+

+

+static void

+st_CompressedTexSubImage3D(struct gl_context *ctx, GLenum target, GLint level,

+                           GLint xoffset, GLint yoffset, GLint zoffset,

+                           GLsizei width, GLint height, GLint depth,

+                           GLenum format,

+                           GLsizei imageSize, const GLvoid *data,

+                           struct gl_texture_object *texObj,

+                           struct gl_texture_image *texImage)

+{

+   assert(0);

+}

+

+

+

+/**

+ * Do a CopyTexSubImage operation using a read transfer from the source,

+ * a write transfer to the destination and get_tile()/put_tile() to access

+ * the pixels/texels.

+ *

+ * Note: srcY=0=TOP of renderbuffer

+ */

+static void

+fallback_copy_texsubimage(struct gl_context *ctx, GLenum target, GLint level,

+                          struct st_renderbuffer *strb,

+                          struct st_texture_image *stImage,

+                          GLenum baseFormat,

+                          GLint destX, GLint destY, GLint destZ,

+                          GLint srcX, GLint srcY,

+                          GLsizei width, GLsizei height)

+{

+   struct st_context *st = st_context(ctx);

+   struct pipe_context *pipe = st->pipe;

+   struct pipe_transfer *src_trans;

+   GLvoid *texDest;

+   enum pipe_transfer_usage transfer_usage;

+

+   if (ST_DEBUG & DEBUG_FALLBACK)

+      debug_printf("%s: fallback processing\n", __FUNCTION__);

+

+   assert(width <= MAX_WIDTH);

+

+   if (st_fb_orientation(ctx->ReadBuffer) == Y_0_TOP) {

+      srcY = strb->Base.Height - srcY - height;

+   }

+

+   src_trans = pipe_get_transfer(st_context(ctx)->pipe,

+                                 strb->texture,

+                                 0, 0,

+                                 PIPE_TRANSFER_READ,

+                                 srcX, srcY,

+                                 width, height);

+

+   if ((baseFormat == GL_DEPTH_COMPONENT ||

+        baseFormat == GL_DEPTH_STENCIL) &&

+       util_format_is_depth_and_stencil(stImage->pt->format))

+      transfer_usage = PIPE_TRANSFER_READ_WRITE;

+   else

+      transfer_usage = PIPE_TRANSFER_WRITE;

+

+   /* XXX this used to ignore destZ param */

+   texDest = st_texture_image_map(st, stImage, destZ, transfer_usage,

+                                  destX, destY, width, height);

+

+   if (baseFormat == GL_DEPTH_COMPONENT ||

+       baseFormat == GL_DEPTH_STENCIL) {

+      const GLboolean scaleOrBias = (ctx->Pixel.DepthScale != 1.0F ||

+                                     ctx->Pixel.DepthBias != 0.0F);

+      GLint row, yStep;

+

+      /* determine bottom-to-top vs. top-to-bottom order for src buffer */

+      if (st_fb_orientation(ctx->ReadBuffer) == Y_0_TOP) {

+         srcY = height - 1;

+         yStep = -1;

+      }

+      else {

+         srcY = 0;

+         yStep = 1;

+      }

+

+      /* To avoid a large temp memory allocation, do copy row by row */

+      for (row = 0; row < height; row++, srcY += yStep) {

+         uint data[MAX_WIDTH];

+         pipe_get_tile_z(pipe, src_trans, 0, srcY, width, 1, data);

+         if (scaleOrBias) {

+            _mesa_scale_and_bias_depth_uint(ctx, width, data);

+         }

+         pipe_put_tile_z(pipe, stImage->transfer, 0, row, width, 1, data);

+      }

+   }

+   else {

+      /* RGBA format */

+      GLfloat *tempSrc =

+         (GLfloat *) malloc(width * height * 4 * sizeof(GLfloat));

+

+      if (tempSrc && texDest) {

+         const GLint dims = 2;

+         const GLint dstRowStride = stImage->transfer->stride;

+         struct gl_texture_image *texImage = &stImage->base;

+         struct gl_pixelstore_attrib unpack = ctx->DefaultPacking;

+

+         if (st_fb_orientation(ctx->ReadBuffer) == Y_0_TOP) {

+            unpack.Invert = GL_TRUE;

+         }

+

+         /* get float/RGBA image from framebuffer */

+         /* XXX this usually involves a lot of int/float conversion.

+          * try to avoid that someday.

+          */

+         pipe_get_tile_rgba_format(pipe, src_trans, 0, 0, width, height,

+                                   util_format_linear(strb->texture->format),

+                                   tempSrc);

+

+         /* Store into texture memory.

+          * Note that this does some special things such as pixel transfer

+          * ops and format conversion.  In particular, if the dest tex format

+          * is actually RGBA but the user created the texture as GL_RGB we

+          * need to fill-in/override the alpha channel with 1.0.

+          */

+         _mesa_texstore(ctx, dims,

+                        texImage->_BaseFormat, 

+                        texImage->TexFormat, 

+                        texDest,

+                        0, 0, 0,

+                        dstRowStride,

+                        texImage->ImageOffsets,

+                        width, height, 1,

+                        GL_RGBA, GL_FLOAT, tempSrc, /* src */

+                        &unpack);

+      }

+      else {

+         _mesa_error(ctx, GL_OUT_OF_MEMORY, "glTexSubImage");

+      }

+

+      if (tempSrc)

+         free(tempSrc);

+   }

+

+   st_texture_image_unmap(st, stImage);

+   pipe->transfer_destroy(pipe, src_trans);

+}

+

+

+

+/**

+ * If the format of the src renderbuffer and the format of the dest

+ * texture are compatible (in terms of blitting), return a TGSI writemask

+ * to be used during the blit.

+ * If the src/dest are incompatible, return 0.

+ */

+static unsigned

+compatible_src_dst_formats(struct gl_context *ctx,

+                           const struct gl_renderbuffer *src,

+                           const struct gl_texture_image *dst)

+{

+   /* Get logical base formats for the src and dest.

+    * That is, use the user-requested formats and not the actual, device-

+    * chosen formats.

+    * For example, the user may have requested an A8 texture but the

+    * driver may actually be using an RGBA texture format.  When we

+    * copy/blit to that texture, we only want to copy the Alpha channel

+    * and not the RGB channels.

+    *

+    * Similarly, when the src FBO was created an RGB format may have been

+    * requested but the driver actually chose an RGBA format.  In that case,

+    * we don't want to copy the undefined Alpha channel to the dest texture

+    * (it should be 1.0).

+    */

+   const GLenum srcFormat = _mesa_base_fbo_format(ctx, src->InternalFormat);

+   const GLenum dstFormat = _mesa_base_tex_format(ctx, dst->InternalFormat);

+

+   /**

+    * XXX when we have red-only and red/green renderbuffers we'll need

+    * to add more cases here (or implement a general-purpose routine that

+    * queries the existance of the R,G,B,A channels in the src and dest).

+    */

+   if (srcFormat == dstFormat) {

+      /* This is the same as matching_base_formats, which should

+       * always pass, as it did previously.

+       */

+      return TGSI_WRITEMASK_XYZW;

+   }

+   else if (srcFormat == GL_RGB && dstFormat == GL_RGBA) {

+      /* Make sure that A in the dest is 1.  The actual src format

+       * may be RGBA and have undefined A values.

+       */

+      return TGSI_WRITEMASK_XYZ;

+   }

+   else if (srcFormat == GL_RGBA && dstFormat == GL_RGB) {

+      /* Make sure that A in the dest is 1.  The actual dst format

+       * may be RGBA and will need A=1 to provide proper alpha values

+       * when sampled later.

+       */

+      return TGSI_WRITEMASK_XYZ;

+   }

+   else {

+      if (ST_DEBUG & DEBUG_FALLBACK)

+         debug_printf("%s failed for src %s, dst %s\n",

+                      __FUNCTION__, 

+                      _mesa_lookup_enum_by_nr(srcFormat),

+                      _mesa_lookup_enum_by_nr(dstFormat));

+

+      /* Otherwise fail.

+       */

+      return 0;

+   }

+}

+

+

+

+/**

+ * Do a CopyTex[Sub]Image1/2/3D() using a hardware (blit) path if possible.

+ * Note that the region to copy has already been clipped so we know we

+ * won't read from outside the source renderbuffer's bounds.

+ *

+ * Note: srcY=0=Bottom of renderbuffer (GL convention)

+ */

+static void

+st_copy_texsubimage(struct gl_context *ctx,

+                    GLenum target, GLint level,

+                    GLint destX, GLint destY, GLint destZ,

+                    GLint srcX, GLint srcY,

+                    GLsizei width, GLsizei height)

+{

+   struct gl_texture_unit *texUnit =

+      &ctx->Texture.Unit[ctx->Texture.CurrentUnit];

+   struct gl_texture_object *texObj =

+      _mesa_select_tex_object(ctx, texUnit, target);

+   struct gl_texture_image *texImage =

+      _mesa_select_tex_image(ctx, texObj, target, level);

+   struct st_texture_image *stImage = st_texture_image(texImage);

+   const GLenum texBaseFormat = texImage->_BaseFormat;

+   struct gl_framebuffer *fb = ctx->ReadBuffer;

+   struct st_renderbuffer *strb;

+   struct st_context *st = st_context(ctx);

+   struct pipe_context *pipe = st->pipe;

+   struct pipe_screen *screen = pipe->screen;

+   enum pipe_format dest_format, src_format;

+   GLboolean use_fallback = GL_TRUE;

+   GLboolean matching_base_formats;

+   GLuint format_writemask, sample_count;

+   struct pipe_surface *dest_surface = NULL;

+   GLboolean do_flip = (st_fb_orientation(ctx->ReadBuffer) == Y_0_TOP);

+

+   /* make sure finalize_textures has been called? 

+    */

+   if (0) st_validate_state(st);

+

+   /* determine if copying depth or color data */

+   if (texBaseFormat == GL_DEPTH_COMPONENT ||

+       texBaseFormat == GL_DEPTH_STENCIL) {

+      strb = st_renderbuffer(fb->_DepthBuffer);

+      if (strb->Base.Wrapped) {

+         strb = st_renderbuffer(strb->Base.Wrapped);

+      }

+   }

+   else {

+      /* texBaseFormat == GL_RGB, GL_RGBA, GL_ALPHA, etc */

+      strb = st_renderbuffer(fb->_ColorReadBuffer);

+   }

+

+   if (!strb || !strb->surface || !stImage->pt) {

+      debug_printf("%s: null strb or stImage\n", __FUNCTION__);

+      return;

+   }

+

+   sample_count = strb->surface->texture->nr_samples;

+   /* I believe this would be legal, presumably would need to do a resolve

+      for color, and for depth/stencil spec says to just use one of the

+      depth/stencil samples per pixel? Need some transfer clarifications. */

+   assert(sample_count < 2);

+

+   if (srcX < 0) {

+      width -= -srcX;

+      destX += -srcX;

+      srcX = 0;

+   }

+

+   if (srcY < 0) {

+      height -= -srcY;

+      destY += -srcY;

+      srcY = 0;

+   }

+

+   if (destX < 0) {

+      width -= -destX;

+      srcX += -destX;

+      destX = 0;

+   }

+

+   if (destY < 0) {

+      height -= -destY;

+      srcY += -destY;

+      destY = 0;

+   }

+

+   if (width < 0 || height < 0)

+      return;

+

+

+   assert(strb);

+   assert(strb->surface);

+   assert(stImage->pt);

+

+   src_format = strb->surface->format;

+   dest_format = stImage->pt->format;

+

+   /*

+    * Determine if the src framebuffer and dest texture have the same

+    * base format.  We need this to detect a case such as the framebuffer

+    * being GL_RGBA but the texture being GL_RGB.  If the actual hardware

+    * texture format stores RGBA we need to set A=1 (overriding the

+    * framebuffer's alpha values).  We can't do that with the blit or

+    * textured-quad paths.

+    */

+   matching_base_formats =

+      (_mesa_get_format_base_format(strb->Base.Format) ==

+       _mesa_get_format_base_format(texImage->TexFormat));

+   format_writemask = compatible_src_dst_formats(ctx, &strb->Base, texImage);

+

+   if (ctx->_ImageTransferState == 0x0) {

+

+      if (matching_base_formats &&

+          src_format == dest_format &&

+          !do_flip)

+      {

+         /* use surface_copy() / blit */

+         struct pipe_box src_box;

+         u_box_2d_zslice(srcX, srcY, strb->surface->u.tex.first_layer,

+                         width, height, &src_box);

+

+         /* for resource_copy_region(), y=0=top, always */

+         pipe->resource_copy_region(pipe,

+                                    /* dest */

+                                    stImage->pt,

+                                    stImage->level,

+                                    destX, destY, destZ + stImage->face,

+                                    /* src */

+                                    strb->texture,

+                                    strb->surface->u.tex.level,

+                                    &src_box);

+         use_fallback = GL_FALSE;

+      }

+      else if (format_writemask &&

+               texBaseFormat != GL_DEPTH_COMPONENT &&

+               texBaseFormat != GL_DEPTH_STENCIL &&

+               screen->is_format_supported(screen, src_format,

+                                           PIPE_TEXTURE_2D, sample_count,

+                                           PIPE_BIND_SAMPLER_VIEW,

+                                           0) &&

+               screen->is_format_supported(screen, dest_format,

+                                           PIPE_TEXTURE_2D, 0,

+                                           PIPE_BIND_RENDER_TARGET,

+                                           0)) {

+         /* draw textured quad to do the copy */

+         GLint srcY0, srcY1;

+         struct pipe_surface surf_tmpl;

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

+         surf_tmpl.format = stImage->pt->format;

+         surf_tmpl.usage = PIPE_BIND_RENDER_TARGET;

+         surf_tmpl.u.tex.level = stImage->level;

+         surf_tmpl.u.tex.first_layer = stImage->face + destZ;

+         surf_tmpl.u.tex.last_layer = stImage->face + destZ;

+

+         dest_surface = pipe->create_surface(pipe, stImage->pt,

+                                             &surf_tmpl);

+

+         if (do_flip) {

+            srcY1 = strb->Base.Height - srcY - height;

+            srcY0 = srcY1 + height;

+         }

+         else {

+            srcY0 = srcY;

+            srcY1 = srcY0 + height;

+         }

+

+         util_blit_pixels_writemask(st->blit,

+                                    strb->texture,

+                                    strb->surface->u.tex.level,

+                                    srcX, srcY0,

+                                    srcX + width, srcY1,

+                                    strb->surface->u.tex.first_layer,

+                                    dest_surface,

+                                    destX, destY,

+                                    destX + width, destY + height,

+                                    0.0, PIPE_TEX_MIPFILTER_NEAREST,

+                                    format_writemask);

+         use_fallback = GL_FALSE;

+      }

+

+      if (dest_surface)

+         pipe_surface_reference(&dest_surface, NULL);

+   }

+

+   if (use_fallback) {

+      /* software fallback */

+      fallback_copy_texsubimage(ctx, target, level,

+                                strb, stImage, texBaseFormat,

+                                destX, destY, destZ,

+                                srcX, srcY, width, height);

+   }

+}

+

+

+

+static void

+st_CopyTexImage1D(struct gl_context * ctx, GLenum target, GLint level,

+                  GLenum internalFormat,

+                  GLint x, GLint y, GLsizei width, GLint border)

+{

+   struct gl_texture_unit *texUnit =

+      &ctx->Texture.Unit[ctx->Texture.CurrentUnit];

+   struct gl_texture_object *texObj =

+      _mesa_select_tex_object(ctx, texUnit, target);

+   struct gl_texture_image *texImage =

+      _mesa_select_tex_image(ctx, texObj, target, level);

+

+   /* Setup or redefine the texture object, texture and texture

+    * image.  Don't populate yet.  

+    */

+   ctx->Driver.TexImage1D(ctx, target, level, internalFormat,

+                          width, border,

+                          GL_RGBA, CHAN_TYPE, NULL,

+                          &ctx->DefaultPacking, texObj, texImage);

+

+   st_copy_texsubimage(ctx, target, level,

+                       0, 0, 0,  /* destX,Y,Z */

+                       x, y, width, 1);  /* src X, Y, size */

+}

+

+

+static void

+st_CopyTexImage2D(struct gl_context * ctx, GLenum target, GLint level,

+                  GLenum internalFormat,

+                  GLint x, GLint y, GLsizei width, GLsizei height,

+                  GLint border)

+{

+   struct gl_texture_unit *texUnit =

+      &ctx->Texture.Unit[ctx->Texture.CurrentUnit];

+   struct gl_texture_object *texObj =

+      _mesa_select_tex_object(ctx, texUnit, target);

+   struct gl_texture_image *texImage =

+      _mesa_select_tex_image(ctx, texObj, target, level);

+

+   /* Setup or redefine the texture object, texture and texture

+    * image.  Don't populate yet.  

+    */

+   ctx->Driver.TexImage2D(ctx, target, level, internalFormat,

+                          width, height, border,

+                          GL_RGBA, CHAN_TYPE, NULL,

+                          &ctx->DefaultPacking, texObj, texImage);

+

+   st_copy_texsubimage(ctx, target, level,

+                       0, 0, 0,  /* destX,Y,Z */

+                       x, y, width, height);  /* src X, Y, size */

+}

+

+

+static void

+st_CopyTexSubImage1D(struct gl_context * ctx, GLenum target, GLint level,

+                     GLint xoffset, GLint x, GLint y, GLsizei width)

+{

+   const GLint yoffset = 0, zoffset = 0;

+   const GLsizei height = 1;

+   st_copy_texsubimage(ctx, target, level,

+                       xoffset, yoffset, zoffset,  /* destX,Y,Z */

+                       x, y, width, height);  /* src X, Y, size */

+}

+

+

+static void

+st_CopyTexSubImage2D(struct gl_context * ctx, GLenum target, GLint level,

+                     GLint xoffset, GLint yoffset,

+                     GLint x, GLint y, GLsizei width, GLsizei height)

+{

+   const GLint zoffset = 0;

+   st_copy_texsubimage(ctx, target, level,

+                       xoffset, yoffset, zoffset,  /* destX,Y,Z */

+                       x, y, width, height);  /* src X, Y, size */

+}

+

+

+static void

+st_CopyTexSubImage3D(struct gl_context * ctx, GLenum target, GLint level,

+                     GLint xoffset, GLint yoffset, GLint zoffset,

+                     GLint x, GLint y, GLsizei width, GLsizei height)

+{

+   st_copy_texsubimage(ctx, target, level,

+                       xoffset, yoffset, zoffset,  /* destX,Y,Z */

+                       x, y, width, height);  /* src X, Y, size */

+}

+

+

+/**

+ * Copy image data from stImage into the texture object 'stObj' at level

+ * 'dstLevel'.

+ */

+static void

+copy_image_data_to_texture(struct st_context *st,

+			   struct st_texture_object *stObj,

+                           GLuint dstLevel,

+			   struct st_texture_image *stImage)

+{

+   /* debug checks */

+   {

+      const struct gl_texture_image *dstImage =

+         stObj->base.Image[stImage->face][stImage->level];

+      assert(dstImage);

+      assert(dstImage->Width == stImage->base.Width);

+      assert(dstImage->Height == stImage->base.Height);

+      assert(dstImage->Depth == stImage->base.Depth);

+   }

+

+   if (stImage->pt) {

+      /* Copy potentially with the blitter:

+       */

+      st_texture_image_copy(st->pipe,

+                            stObj->pt, dstLevel,  /* dest texture, level */

+                            stImage->pt, stImage->level, /* src texture, level */

+                            stImage->face);

+

+      pipe_resource_reference(&stImage->pt, NULL);

+   }

+   else if (stImage->base.Data) {

+      st_texture_image_data(st,

+                            stObj->pt,

+                            stImage->face,

+                            dstLevel,

+                            stImage->base.Data,

+                            stImage->base.RowStride * 

+                            util_format_get_blocksize(stObj->pt->format),

+                            stImage->base.RowStride *

+                            stImage->base.Height *

+                            util_format_get_blocksize(stObj->pt->format));

+      _mesa_align_free(stImage->base.Data);

+      stImage->base.Data = NULL;

+   }

+

+   pipe_resource_reference(&stImage->pt, stObj->pt);

+}

+

+

+/**

+ * Called during state validation.  When this function is finished,

+ * the texture object should be ready for rendering.

+ * \return GL_TRUE for success, GL_FALSE for failure (out of mem)

+ */

+GLboolean

+st_finalize_texture(struct gl_context *ctx,

+		    struct pipe_context *pipe,

+		    struct gl_texture_object *tObj)

+{

+   struct st_context *st = st_context(ctx);

+   struct st_texture_object *stObj = st_texture_object(tObj);

+   const GLuint nr_faces = (stObj->base.Target == GL_TEXTURE_CUBE_MAP) ? 6 : 1;

+   GLuint face;

+   struct st_texture_image *firstImage;

+   enum pipe_format firstImageFormat;

+   GLuint ptWidth, ptHeight, ptDepth, ptLayers;

+

+   if (stObj->base._Complete) {

+      /* The texture is complete and we know exactly how many mipmap levels

+       * are present/needed.  This is conditional because we may be called

+       * from the st_generate_mipmap() function when the texture object is

+       * incomplete.  In that case, we'll have set stObj->lastLevel before

+       * we get here.

+       */

+      if (stObj->base.MinFilter == GL_LINEAR ||

+          stObj->base.MinFilter == GL_NEAREST)

+         stObj->lastLevel = stObj->base.BaseLevel;

+      else

+         stObj->lastLevel = stObj->base._MaxLevel;

+   }

+

+   firstImage = st_texture_image(stObj->base.Image[0][stObj->base.BaseLevel]);

+   assert(firstImage);

+

+   /* If both firstImage and stObj point to a texture which can contain

+    * all active images, favour firstImage.  Note that because of the

+    * completeness requirement, we know that the image dimensions

+    * will match.

+    */

+   if (firstImage->pt &&

+       firstImage->pt != stObj->pt &&

+       (!stObj->pt || firstImage->pt->last_level >= stObj->pt->last_level)) {

+      pipe_resource_reference(&stObj->pt, firstImage->pt);

+      pipe_sampler_view_reference(&stObj->sampler_view, NULL);

+   }

+

+   /* Find gallium format for the Mesa texture */

+   firstImageFormat = st_mesa_format_to_pipe_format(firstImage->base.TexFormat);

+

+   /* Find size of level=0 Gallium mipmap image, plus number of texture layers */

+   {

+      GLuint width, height, depth;

+      if (!guess_base_level_size(stObj->base.Target,

+                                 firstImage->base.Width2,

+                                 firstImage->base.Height2,

+                                 firstImage->base.Depth2,

+                                 stObj->base.BaseLevel,

+                                 &width, &height, &depth)) {

+         width = stObj->width0;

+         height = stObj->height0;

+         depth = stObj->depth0;

+      }

+      /* convert GL dims to Gallium dims */

+      st_gl_texture_dims_to_pipe_dims(stObj->base.Target, width, height, depth,

+                                      &ptWidth, &ptHeight, &ptDepth, &ptLayers);

+   }

+

+   /* If we already have a gallium texture, check that it matches the texture

+    * object's format, target, size, num_levels, etc.

+    */

+   if (stObj->pt) {

+      if (stObj->pt->target != gl_target_to_pipe(stObj->base.Target) ||

+          !st_sampler_compat_formats(stObj->pt->format, firstImageFormat) ||

+          stObj->pt->last_level < stObj->lastLevel ||

+          stObj->pt->width0 != ptWidth ||

+          stObj->pt->height0 != ptHeight ||

+          stObj->pt->depth0 != ptDepth ||

+          stObj->pt->array_size != ptLayers)

+      {

+         /* The gallium texture does not match the Mesa texture so delete the

+          * gallium texture now.  We'll make a new one below.

+          */

+         pipe_resource_reference(&stObj->pt, NULL);

+         pipe_sampler_view_reference(&stObj->sampler_view, NULL);

+         st->dirty.st |= ST_NEW_FRAMEBUFFER;

+      }

+   }

+

+   /* May need to create a new gallium texture:

+    */

+   if (!stObj->pt) {

+      GLuint bindings = default_bindings(st, firstImageFormat);

+

+      stObj->pt = st_texture_create(st,

+                                    gl_target_to_pipe(stObj->base.Target),

+                                    firstImageFormat,

+                                    stObj->lastLevel,

+                                    ptWidth,

+                                    ptHeight,

+                                    ptDepth,

+                                    ptLayers,

+                                    bindings);

+

+      if (!stObj->pt) {

+         _mesa_error(ctx, GL_OUT_OF_MEMORY, "glTexImage");

+         return GL_FALSE;

+      }

+   }

+

+   /* Pull in any images not in the object's texture:

+    */

+   for (face = 0; face < nr_faces; face++) {

+      GLuint level;

+      for (level = stObj->base.BaseLevel; level <= stObj->lastLevel; level++) {

+         struct st_texture_image *stImage =

+            st_texture_image(stObj->base.Image[face][level]);

+

+         /* Need to import images in main memory or held in other textures.

+          */

+         if (stImage && stObj->pt != stImage->pt) {

+            copy_image_data_to_texture(st, stObj, level, stImage);

+         }

+      }

+   }

+

+   return GL_TRUE;

+}

+

+

+/**

+ * Returns pointer to a default/dummy texture.

+ * This is typically used when the current shader has tex/sample instructions

+ * but the user has not provided a (any) texture(s).

+ */

+struct gl_texture_object *

+st_get_default_texture(struct st_context *st)

+{

+   if (!st->default_texture) {

+      static const GLenum target = GL_TEXTURE_2D;

+      GLubyte pixels[16][16][4];

+      struct gl_texture_object *texObj;

+      struct gl_texture_image *texImg;

+      GLuint i, j;

+

+      /* The ARB_fragment_program spec says (0,0,0,1) should be returned

+       * when attempting to sample incomplete textures.

+       */

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

+         for (j = 0; j < 16; j++) {

+            pixels[i][j][0] = 0;

+            pixels[i][j][1] = 0;

+            pixels[i][j][2] = 0;

+            pixels[i][j][3] = 255;

+         }

+      }

+

+      texObj = st->ctx->Driver.NewTextureObject(st->ctx, 0, target);

+

+      texImg = _mesa_get_tex_image(st->ctx, texObj, target, 0);

+

+      _mesa_init_teximage_fields(st->ctx, target, texImg,

+                                 16, 16, 1, 0,  /* w, h, d, border */

+                                 GL_RGBA, MESA_FORMAT_RGBA8888);

+

+      st_TexImage(st->ctx, 2, target,

+                  0, GL_RGBA,    /* level, intformat */

+                  16, 16, 1, 0,  /* w, h, d, border */

+                  GL_RGBA, GL_UNSIGNED_BYTE, pixels,

+                  &st->ctx->DefaultPacking,

+                  texObj, texImg,

+                  0, 0);

+

+      texObj->MinFilter = GL_NEAREST;

+      texObj->MagFilter = GL_NEAREST;

+      texObj->_Complete = GL_TRUE;

+

+      st->default_texture = texObj;

+   }

+   return st->default_texture;

+}

+

+

+void

+st_init_texture_functions(struct dd_function_table *functions)

+{

+   functions->ChooseTextureFormat = st_ChooseTextureFormat;

+   functions->TexImage1D = st_TexImage1D;

+   functions->TexImage2D = st_TexImage2D;

+   functions->TexImage3D = st_TexImage3D;

+   functions->TexSubImage1D = st_TexSubImage1D;

+   functions->TexSubImage2D = st_TexSubImage2D;

+   functions->TexSubImage3D = st_TexSubImage3D;

+   functions->CompressedTexSubImage1D = st_CompressedTexSubImage1D;

+   functions->CompressedTexSubImage2D = st_CompressedTexSubImage2D;

+   functions->CompressedTexSubImage3D = st_CompressedTexSubImage3D;

+   functions->CopyTexImage1D = st_CopyTexImage1D;

+   functions->CopyTexImage2D = st_CopyTexImage2D;

+   functions->CopyTexSubImage1D = st_CopyTexSubImage1D;

+   functions->CopyTexSubImage2D = st_CopyTexSubImage2D;

+   functions->CopyTexSubImage3D = st_CopyTexSubImage3D;

+   functions->GenerateMipmap = st_generate_mipmap;

+

+   functions->GetTexImage = st_GetTexImage;

+

+   /* compressed texture functions */

+   functions->CompressedTexImage2D = st_CompressedTexImage2D;

+   functions->GetCompressedTexImage = st_GetCompressedTexImage;

+

+   functions->NewTextureObject = st_NewTextureObject;

+   functions->NewTextureImage = st_NewTextureImage;

+   functions->DeleteTexture = st_DeleteTextureObject;

+   functions->FreeTexImageData = st_FreeTextureImageData;

+

+   functions->TextureMemCpy = do_memcpy;

+

+   /* XXX Temporary until we can query pipe's texture sizes */

+   functions->TestProxyTexImage = _mesa_test_proxy_teximage;

+}