svn merge ^/branches/released .

5 files changed, 58 insertions, 32 deletions

diff --git a/mesalib/src/glsl/ast_function.cpp b/mesalib/src/glsl/ast_function.cpp
index 8247ceffd..4ac9dbbe5 100644
--- a/mesalib/src/glsl/ast_function.cpp
+++ b/mesalib/src/glsl/ast_function.cpp
@@ -107,7 +107,11 @@ match_function_by_name(exec_list *instructions, const char *name,
     * FINISHME: matching signature but shader X + N contains an _exact_

     * FINISHME: matching signature.

     */

-   if (sig == NULL && (f == NULL || state->es_shader || !f->has_user_signature()) && state->symbols->get_type(name) == NULL && (state->language_version == 110 || state->symbols->get_variable(name) == NULL)) {

+   if (sig == NULL

+       && (f == NULL || state->es_shader || !f->has_user_signature())

+       && state->symbols->get_type(name) == NULL

+       && (state->language_version == 110

+	   || state->symbols->get_variable(name) == NULL)) {

       /* The current shader doesn't contain a matching function or signature.

        * Before giving up, look for the prototype in the built-in functions.

        */

diff --git a/mesalib/src/glsl/ast_to_hir.cpp b/mesalib/src/glsl/ast_to_hir.cpp
index d7e54d823..b5cffcd47 100644
--- a/mesalib/src/glsl/ast_to_hir.cpp
+++ b/mesalib/src/glsl/ast_to_hir.cpp
@@ -940,7 +940,7 @@ ast_expression::hir(exec_list *instructions,
    };

    ir_rvalue *result = NULL;

    ir_rvalue *op[3];

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

+   const struct glsl_type *type; /* a temporary variable for switch cases */

    bool error_emitted = false;

    YYLTYPE loc;

 

@@ -954,7 +954,6 @@ ast_expression::hir(exec_list *instructions,
       result = do_assignment(instructions, state, op[0], op[1], false,

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

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

-      type = result->type;

       break;

    }

 

@@ -1078,9 +1077,7 @@ ast_expression::hir(exec_list *instructions,
       } else {

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

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

-	 type = glsl_type::bool_type;

       }

-

       break;

 

    case ast_bit_and:

@@ -1209,7 +1206,6 @@ ast_expression::hir(exec_list *instructions,
 

       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:

@@ -1218,7 +1214,6 @@ ast_expression::hir(exec_list *instructions,
 

       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:

@@ -1238,7 +1233,6 @@ ast_expression::hir(exec_list *instructions,
       result = do_assignment(instructions, state,

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

 			     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

@@ -1264,7 +1258,6 @@ ast_expression::hir(exec_list *instructions,
       result = do_assignment(instructions, state,

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

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

-      type = result->type;

       error_emitted = type->is_error();

       break;

    }

@@ -1406,7 +1399,6 @@ ast_expression::hir(exec_list *instructions,
       result = do_assignment(instructions, state,

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

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

-      type = result->type;

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

       break;

    }

@@ -1436,14 +1428,12 @@ ast_expression::hir(exec_list *instructions,
 			  op[0]->clone(ctx, NULL), temp_rhs, false,

 			  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: {

@@ -1600,7 +1590,6 @@ ast_expression::hir(exec_list *instructions,
       if (error_emitted)

 	 result->type = glsl_type::error_type;

 

-      type = result->type;

       break;

    }

 

@@ -1623,7 +1612,6 @@ ast_expression::hir(exec_list *instructions,
 

       if (var != NULL) {

 	 var->used = true;

-	 type = result->type;

       } else {

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

 			  this->primary_expression.identifier);

@@ -1634,22 +1622,18 @@ ast_expression::hir(exec_list *instructions,
    }

 

    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;

 

@@ -1664,10 +1648,42 @@ ast_expression::hir(exec_list *instructions,
        * 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);

+      exec_node *previous_tail_pred = NULL;

+      YYLTYPE previous_operand_loc = loc;

+

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

+	 /* If one of the operands of comma operator does not generate any

+	  * code, we want to emit a warning.  At each pass through the loop

+	  * previous_tail_pred will point to the last instruction in the

+	  * stream *before* processing the previous operand.  Naturally,

+	  * instructions->tail_pred will point to the last instruction in the

+	  * stream *after* processing the previous operand.  If the two

+	  * pointers match, then the previous operand had no effect.

+	  *

+	  * The warning behavior here differs slightly from GCC.  GCC will

+	  * only emit a warning if none of the left-hand operands have an

+	  * effect.  However, it will emit a warning for each.  I believe that

+	  * there are some cases in C (especially with GCC extensions) where

+	  * it is useful to have an intermediate step in a sequence have no

+	  * effect, but I don't think these cases exist in GLSL.  Either way,

+	  * it would be a giant hassle to replicate that behavior.

+	  */

+	 if (previous_tail_pred == instructions->tail_pred) {

+	    _mesa_glsl_warning(&previous_operand_loc, state,

+			       "left-hand operand of comma expression has "

+			       "no effect");

+	 }

+

+	 /* tail_pred is directly accessed instead of using the get_tail()

+	  * method for performance reasons.  get_tail() has extra code to

+	  * return NULL when the list is empty.  We don't care about that

+	  * here, so using tail_pred directly is fine.

+	  */

+	 previous_tail_pred = instructions->tail_pred;

+	 previous_operand_loc = ast->get_location();

 

-      type = result->type;

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

+      }

 

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

        */

@@ -1675,8 +1691,10 @@ ast_expression::hir(exec_list *instructions,
       break;

    }

    }

+   type = NULL; /* use result->type, not type. */

+   assert(result != NULL);

 

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

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

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

 

    return result;

diff --git a/mesalib/src/glsl/glcpp/glcpp-parse.y b/mesalib/src/glsl/glcpp/glcpp-parse.y
index c8dc34a1c..f55c51040 100644
--- a/mesalib/src/glsl/glcpp/glcpp-parse.y
+++ b/mesalib/src/glsl/glcpp/glcpp-parse.y
@@ -1563,6 +1563,7 @@ _glcpp_parser_expand_token_list (glcpp_parser_t *parser,
 	token_node_t *node_prev;

 	token_node_t *node, *last = NULL;

 	token_list_t *expansion;

+	active_list_t *active_initial = parser->active;

 

 	if (list == NULL)

 		return;

@@ -1617,7 +1618,10 @@ _glcpp_parser_expand_token_list (glcpp_parser_t *parser,
 		node = node_prev ? node_prev->next : list->head;

 	}

 

-	while (parser->active)

+	/* Remove any lingering effects of this invocation on the

+	 * active list. That is, pop until the list looks like it did

+	 * at the beginning of this function. */

+	while (parser->active && parser->active != active_initial)

 		_parser_active_list_pop (parser);

 

 	list->non_space_tail = list->tail;

diff --git a/mesalib/src/glsl/ir_validate.cpp b/mesalib/src/glsl/ir_validate.cpp
index 7757f5ecd..ce5bd4afe 100644
--- a/mesalib/src/glsl/ir_validate.cpp
+++ b/mesalib/src/glsl/ir_validate.cpp
@@ -254,7 +254,7 @@ ir_validate::visit_leave(ir_expression *ir)
 

    case ir_unop_f2i:

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

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

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

       break;

    case ir_unop_i2f:

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

@@ -269,12 +269,12 @@ ir_validate::visit_leave(ir_expression *ir)
       assert(ir->type->base_type == GLSL_TYPE_FLOAT);

       break;

    case ir_unop_i2b:

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

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

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

       break;

    case ir_unop_b2i:

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

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

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

       break;

    case ir_unop_u2f:

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

diff --git a/mesalib/src/glsl/linker.cpp b/mesalib/src/glsl/linker.cpp
index 16894757b..307c432ad 100644
--- a/mesalib/src/glsl/linker.cpp
+++ b/mesalib/src/glsl/linker.cpp
@@ -510,7 +510,7 @@ cross_validate_outputs_to_inputs(struct gl_shader_program *prog,
 	  */

 	 if (input->type != output->type) {

 	    /* There is a bit of a special case for gl_TexCoord.  This

-	     * built-in is unsized by default.  Appliations that variable

+	     * built-in is unsized by default.  Applications that variable

 	     * access it must redeclare it with a size.  There is some

 	     * language in the GLSL spec that implies the fragment shader

 	     * and vertex shader do not have to agree on this size.  Other

@@ -997,7 +997,7 @@ update_array_sizes(struct gl_shader_program *prog)
 	    /* If this is a built-in uniform (i.e., it's backed by some

 	     * fixed-function state), adjust the number of state slots to

 	     * match the new array size.  The number of slots per array entry

-	     * is not known.  It seems saft to assume that the total number of

+	     * is not known.  It seems safe to assume that the total number of

 	     * slots is an integer multiple of the number of array elements.

 	     * Determine the number of slots per array element by dividing by

 	     * the old (total) size.

@@ -1163,7 +1163,7 @@ assign_uniform_locations(struct gl_shader_program *prog)
 

 

 /**

- * Find a contiguous set of available bits in a bitmask

+ * Find a contiguous set of available bits in a bitmask.

  *

  * \param used_mask     Bits representing used (1) and unused (0) locations

  * \param needed_count  Number of contiguous bits needed.

@@ -1210,7 +1210,7 @@ assign_attribute_locations(gl_shader_program *prog, unsigned max_attribute_index
     * 1. Invalidate the location assignments for all vertex shader inputs.

     *

     * 2. Assign locations for inputs that have user-defined (via

-    *    glBindVertexAttribLocation) locatoins.

+    *    glBindVertexAttribLocation) locations.

     *

     * 3. Sort the attributes without assigned locations by number of slots

     *    required in decreasing order.  Fragmentation caused by attribute

@@ -1349,7 +1349,7 @@ assign_attribute_locations(gl_shader_program *prog, unsigned max_attribute_index
 

    qsort(to_assign, num_attr, sizeof(to_assign[0]), temp_attr::compare);

 

-   /* VERT_ATTRIB_GENERIC0 is a psdueo-alias for VERT_ATTRIB_POS.  It can only

+   /* VERT_ATTRIB_GENERIC0 is a pseudo-alias for VERT_ATTRIB_POS.  It can only

     * be explicitly assigned by via glBindAttribLocation.  Mark it as reserved

     * to prevent it from being automatically allocated below.

     */

@@ -1610,7 +1610,7 @@ link_shaders(struct gl_context *ctx, struct gl_shader_program *prog)
 	    break;

       }

 

-      /* Validate the inputs of each stage with the output of the preceeding

+      /* Validate the inputs of each stage with the output of the preceding

        * stage.

        */

       for (unsigned i = prev + 1; i < MESA_SHADER_TYPES; i++) {