ir_reader: Remove s_list::length() method.

Most code now relies on the pattern matcher rather than this function,
and for the only remaining case, not using this saves an iteration.

diff --git a/src/glsl/ir_reader.cpp b/src/glsl/ir_reader.cpp
index 00146d8c15e569c3f8e917d4b0ae6bfd1bcb43ff..98906c4ad7319323058345872ab0d5dffe39cf8e 100644 (file)
--- a/src/glsl/ir_reader.cpp
+++ b/src/glsl/ir_reader.cpp
@@ -754,13 +754,7 @@ read_constant(_mesa_glsl_parse_state *st, s_list *list)
    }
 
    if (type->is_array()) {
-      const unsigned elements_supplied = values->length();
-      if (elements_supplied != type->length) {
-        ir_read_error(st, values, "expected exactly %u array elements, "
-                      "given %u", type->length, elements_supplied);
-        return NULL;
-      }
-
+      unsigned elements_supplied = 0;
       exec_list elements;
       foreach_iter(exec_list_iterator, it, values->subexpressions) {
         s_expression *expr = (s_expression *) it.get();
@@ -774,6 +768,13 @@ read_constant(_mesa_glsl_parse_state *st, s_list *list)
         if (ir_elt == NULL)
            return NULL;
         elements.push_tail(ir_elt);
+        elements_supplied++;
+      }
+
+      if (elements_supplied != type->length) {
+        ir_read_error(st, values, "expected exactly %u array elements, "
+                      "given %u", type->length, elements_supplied);
+        return NULL;
       }
       return new(ctx) ir_constant(type, &elements);
    }

diff --git a/src/glsl/s_expression.cpp b/src/glsl/s_expression.cpp
index a00bfa73ed164162971670b5da72d52417a06a73..852a049d43fd31bafa16720b2802c0f6579145fc 100644 (file)
--- a/src/glsl/s_expression.cpp
+++ b/src/glsl/s_expression.cpp
@@ -38,16 +38,6 @@ s_list::s_list()
 {
 }
 
-unsigned
-s_list::length() const
-{
-   unsigned i = 0;
-   foreach_iter(exec_list_iterator, it, this->subexpressions) {
-      i++;
-   }
-   return i;
-}
-
 static s_expression *
 read_atom(void *ctx, const char *& src)
 {

diff --git a/src/glsl/s_expression.h b/src/glsl/s_expression.h
index c444ba4338dc355b74a8baa78c2b8cf2b29f1b65..795f3fccea78a4f0b7b416add8061a5fc0dbc3d6 100644 (file)
--- a/src/glsl/s_expression.h
+++ b/src/glsl/s_expression.h
@@ -139,7 +139,6 @@ public:
    s_list();
 
    virtual bool is_list() const { return true; }
-   unsigned length() const;
 
    void print();