glsl: Apply implicit conversions to structure constructor parameters.

[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 e2efff60d3434027ee85889832dc9d745271653d..3c33127b5f88b004ec03996fc7faa50b78abc876 100644 (file)
--- a/src/glsl/hir_field_selection.cpp
+++ b/src/glsl/hir_field_selection.cpp
@@ -22,18 +22,17 @@
  */
 
 #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)
 {
-   void *ctx = talloc_parent(state);
+   void *ctx = state;
    ir_rvalue *result = NULL;
    ir_rvalue *op;
 
@@ -71,6 +70,28 @@ _mesa_ast_field_selection_to_hir(const ast_expression *expr,
                          "structure",
                          expr->primary_expression.identifier);
       }
+   } else if (expr->subexpressions[1] != NULL) {
+      /* Handle "method calls" in GLSL 1.20 - namely, array.length() */
+      if (state->language_version < 120)
+        _mesa_glsl_error(&loc, state, "Methods not supported in GLSL 1.10.");
+
+      ast_expression *call = expr->subexpressions[1];
+      assert(call->oper == ast_function_call);
+
+      const char *method;
+      method = call->subexpressions[0]->primary_expression.identifier;
+
+      if (op->type->is_array() && strcmp(method, "length") == 0) {
+        if (!call->expressions.is_empty())
+           _mesa_glsl_error(&loc, state, "length method takes no arguments.");
+
+        if (op->type->array_size() == 0)
+           _mesa_glsl_error(&loc, state, "length called on unsized array.");
+
+        result = new(ctx) ir_constant(op->type->array_size());
+      } else {
+        _mesa_glsl_error(&loc, state, "Unknown method: `%s'.", method);
+      }
    } else {
       _mesa_glsl_error(& loc, state, "Cannot access field `%s' of "
                       "non-structure / non-vector.",