glsl: Fix handling of function calls inside nested loops.

[mesa.git] / src / glsl / hir_field_selection.cpp

diff --git a/src/glsl/hir_field_selection.cpp b/src/glsl/hir_field_selection.cpp
index db1e06932f4596f15bc0e1e2a37164ce562d8116..1e92c89aef4c8076aeb97328bc30925c7375d2ac 100644 (file)
--- a/src/glsl/hir_field_selection.cpp
+++ b/src/glsl/hir_field_selection.cpp
@@ -22,13 +22,12 @@
  */
 
 #include "ir.h"
-#include "main/imports.h"
-#include "symbol_table.h"
+#include "program/symbol_table.h"
 #include "glsl_parser_extras.h"
 #include "ast.h"
 #include "glsl_types.h"
 
-struct ir_rvalue *
+ir_rvalue *
 _mesa_ast_field_selection_to_hir(const ast_expression *expr,
                                 exec_list *instructions,
                                 struct _mesa_glsl_parse_state *state)
@@ -48,33 +47,19 @@ _mesa_ast_field_selection_to_hir(const ast_expression *expr,
    YYLTYPE loc = expr->get_location();
    if (op->type->is_error()) {
       /* silently propagate the error */
-   } else if (op->type->is_vector()) {
-      ir_swizzle *swiz = ir_swizzle::create(op,
-                                           expr->primary_expression.identifier,
-                                           op->type->vector_elements);
-      if (swiz != NULL) {
-        result = swiz;
-      } else {
-        /* FINISHME: Logging of error messages should be moved into
-         * FINISHME: ir_swizzle::create.  This allows the generation of more
-         * FINISHME: specific error messages.
-         */
-        _mesa_glsl_error(& loc, state, "Invalid swizzle / mask `%s'",
-                         expr->primary_expression.identifier);
-      }
-   } else if (op->type->base_type == GLSL_TYPE_STRUCT) {
+   } else if (op->type->base_type == GLSL_TYPE_STRUCT
+              || op->type->base_type == GLSL_TYPE_INTERFACE) {
       result = new(ctx) ir_dereference_record(op,
                                              expr->primary_expression.identifier);
 
       if (result->type->is_error()) {
-        _mesa_glsl_error(& loc, state, "Cannot access field `%s' of "
+        _mesa_glsl_error(& loc, state, "cannot access field `%s' of "
                          "structure",
                          expr->primary_expression.identifier);
       }
    } else if (expr->subexpressions[1] != NULL) {
       /* Handle "method calls" in GLSL 1.20 - namely, array.length() */
-      if (state->language_version < 120)
-        _mesa_glsl_error(&loc, state, "Methods not supported in GLSL 1.10.");
+      state->check_version(120, 300, &loc, "methods not supported");
 
       ast_expression *call = expr->subexpressions[1];
       assert(call->oper == ast_function_call);
@@ -82,22 +67,56 @@ _mesa_ast_field_selection_to_hir(const ast_expression *expr,
       const char *method;
       method = call->subexpressions[0]->primary_expression.identifier;
 
-      if (op->type->is_array() && strcmp(method, "length") == 0) {
-        if (!call->expressions.is_empty())
-           _mesa_glsl_error(&loc, state, "length method takes no arguments.");
+      if (strcmp(method, "length") == 0) {
+         if (!call->expressions.is_empty())
+            _mesa_glsl_error(&loc, state, "length method takes no arguments");
 
-        if (op->type->array_size() == 0)
-           _mesa_glsl_error(&loc, state, "length called on unsized array.");
+         if (op->type->is_array()) {
+            if (op->type->is_unsized_array())
+               _mesa_glsl_error(&loc, state, "length called on unsized array");
 
-        result = new(ctx) ir_constant(op->type->array_size());
+            result = new(ctx) ir_constant(op->type->array_size());
+         } else if (op->type->is_vector()) {
+            if (state->ARB_shading_language_420pack_enable) {
+               /* .length() returns int. */
+               result = new(ctx) ir_constant((int) op->type->vector_elements);
+            } else {
+               _mesa_glsl_error(&loc, state, "length method on matrix only available"
+                                             "with ARB_shading_language_420pack");
+            }
+         } else if (op->type->is_matrix()) {
+            if (state->ARB_shading_language_420pack_enable) {
+               /* .length() returns int. */
+               result = new(ctx) ir_constant((int) op->type->matrix_columns);
+            } else {
+               _mesa_glsl_error(&loc, state, "length method on matrix only available"
+                                             "with ARB_shading_language_420pack");
+            }
+         }
       } else {
-        _mesa_glsl_error(&loc, state, "Unknown method: `%s'.", method);
+        _mesa_glsl_error(&loc, state, "unknown method: `%s'", method);
+      }
+   } else if (op->type->is_vector() ||
+              (state->ARB_shading_language_420pack_enable &&
+               op->type->is_scalar())) {
+      ir_swizzle *swiz = ir_swizzle::create(op,
+                                           expr->primary_expression.identifier,
+                                           op->type->vector_elements);
+      if (swiz != NULL) {
+        result = swiz;
+      } else {
+        /* FINISHME: Logging of error messages should be moved into
+         * FINISHME: ir_swizzle::create.  This allows the generation of more
+         * FINISHME: specific error messages.
+         */
+        _mesa_glsl_error(& loc, state, "invalid swizzle / mask `%s'",
+                         expr->primary_expression.identifier);
       }
    } else {
-      _mesa_glsl_error(& loc, state, "Cannot access field `%s' of "
-                      "non-structure / non-vector.",
+      _mesa_glsl_error(& loc, state, "cannot access field `%s' of "
+                      "non-structure / non-vector",
                       expr->primary_expression.identifier);
    }
 
-   return result ? result : ir_call::get_error_instruction(ctx);
+   return result ? result : ir_rvalue::error_value(ctx);
 }