linker: Limit attribute allocation to MAX_VERTEX_ATTRIBS

[mesa.git] / glsl_types.cpp

diff --git a/glsl_types.cpp b/glsl_types.cpp
index a293ce728602a90a674fdeb35686b7b6d98646b0..2b7c5bce30ff6de9b05ecaacf81cec8d7116a815 100644 (file)
--- a/glsl_types.cpp
+++ b/glsl_types.cpp
@@ -90,6 +90,15 @@ generate_ARB_texture_rectangle_types(glsl_symbol_table *symtab, bool warn)
 }
 
 
+static void
+generate_EXT_texture_array_types(glsl_symbol_table *symtab, bool warn)
+{
+   add_types_to_symbol_table(symtab, builtin_EXT_texture_array_types,
+                            Elements(builtin_EXT_texture_array_types),
+                            warn);
+}
+
+
 void
 _mesa_glsl_initialize_types(struct _mesa_glsl_parse_state *state)
 {
@@ -112,6 +121,12 @@ _mesa_glsl_initialize_types(struct _mesa_glsl_parse_state *state)
       generate_ARB_texture_rectangle_types(state->symbols,
                                           state->ARB_texture_rectangle_warn);
    }
+
+   if (state->EXT_texture_array_enable && state->language_version < 130) {
+      // These are already included in 130; don't create twice.
+      generate_EXT_texture_array_types(state->symbols,
+                                      state->EXT_texture_array_warn);
+   }
 }
 
 
@@ -171,10 +186,10 @@ glsl_type::generate_constructor(glsl_symbol_table *symtab) const
 
    for (unsigned i = 0; i < length; i++) {
       ir_dereference *const lhs = (this->base_type == GLSL_TYPE_ARRAY)
-        ? new ir_dereference(retval, new ir_constant(i))
-        : new ir_dereference(retval, fields.structure[i].name);
+        ? (ir_dereference *) new ir_dereference_array(retval, new ir_constant(i))
+        : (ir_dereference *) new ir_dereference_record(retval, fields.structure[i].name);
 
-      ir_dereference *const rhs = new ir_dereference(declarations[i]);
+      ir_dereference *const rhs = new ir_dereference_variable(declarations[i]);
       ir_instruction *const assign = new ir_assignment(lhs, rhs, NULL);
 
       sig->body.push_tail(assign);
@@ -182,7 +197,7 @@ glsl_type::generate_constructor(glsl_symbol_table *symtab) const
 
    free(declarations);
 
-   ir_dereference *const retref = new ir_dereference(retval);
+   ir_dereference *const retref = new ir_dereference_variable(retval);
    ir_instruction *const inst = new ir_return(retref);
    sig->body.push_tail(inst);
 
@@ -250,15 +265,16 @@ generate_vec_body_from_scalar(exec_list *instructions,
    /* Generate a single assignment of the parameter to __retval.x and return
     * __retval.xxxx for however many vector components there are.
     */
-   ir_dereference *const lhs_ref = new ir_dereference(declarations[16]);
-   ir_dereference *const rhs = new ir_dereference(declarations[0]);
+   ir_dereference *const lhs_ref =
+      new ir_dereference_variable(declarations[16]);
+   ir_dereference *const rhs = new ir_dereference_variable(declarations[0]);
 
    ir_swizzle *lhs = new ir_swizzle(lhs_ref, 0, 0, 0, 0, 1);
 
    inst = new ir_assignment(lhs, rhs, NULL);
    instructions->push_tail(inst);
 
-   ir_dereference *const retref = new ir_dereference(declarations[16]);
+   ir_dereference *const retref = new ir_dereference_variable(declarations[16]);
 
    ir_swizzle *retval = new ir_swizzle(retref, 0, 0, 0, 0,
                                        declarations[16]->type->vector_elements);
@@ -283,8 +299,9 @@ generate_vec_body_from_N_scalars(exec_list *instructions,
     * __retval.x and return __retval.
     */
    for (unsigned i = 0; i < vec_type->vector_elements; i++) {
-      ir_dereference *const lhs_ref = new ir_dereference(declarations[16]);
-      ir_dereference *const rhs = new ir_dereference(declarations[i]);
+      ir_dereference *const lhs_ref =
+        new ir_dereference_variable(declarations[16]);
+      ir_dereference *const rhs = new ir_dereference_variable(declarations[i]);
 
       ir_swizzle *lhs = new ir_swizzle(lhs_ref, i, 0, 0, 0, 1);
 
@@ -292,7 +309,7 @@ generate_vec_body_from_N_scalars(exec_list *instructions,
       instructions->push_tail(inst);
    }
 
-   ir_dereference *retval = new ir_dereference(declarations[16]);
+   ir_dereference *retval = new ir_dereference_variable(declarations[16]);
 
    inst = new ir_return(retval);
    instructions->push_tail(inst);
@@ -334,19 +351,18 @@ generate_mat_body_from_scalar(exec_list *instructions,
 
    instructions->push_tail(column);
 
-   ir_dereference *const lhs_ref = new ir_dereference(column);
-   ir_dereference *const rhs = new ir_dereference(declarations[0]);
+   ir_dereference *const lhs_ref = new ir_dereference_variable(column);
+   ir_dereference *const rhs = new ir_dereference_variable(declarations[0]);
 
    ir_swizzle *lhs = new ir_swizzle(lhs_ref, 0, 0, 0, 0, 1);
 
    inst = new ir_assignment(lhs, rhs, NULL);
    instructions->push_tail(inst);
 
-   const float z = 0.0f;
-   ir_constant *const zero = new ir_constant(glsl_type::float_type, &z);
+   ir_constant *const zero = new ir_constant(0.0f);
 
    for (unsigned i = 1; i < column_type->vector_elements; i++) {
-      ir_dereference *const lhs_ref = new ir_dereference(column);
+      ir_dereference *const lhs_ref = new ir_dereference_variable(column);
 
       ir_swizzle *lhs = new ir_swizzle(lhs_ref, i, 0, 0, 0, 1);
 
@@ -357,7 +373,7 @@ generate_mat_body_from_scalar(exec_list *instructions,
 
    for (unsigned i = 0; i < row_type->vector_elements; i++) {
       static const unsigned swiz[] = { 1, 1, 1, 0, 1, 1, 1 };
-      ir_dereference *const rhs_ref = new ir_dereference(column);
+      ir_dereference *const rhs_ref = new ir_dereference_variable(column);
 
       /* This will be .xyyy when i=0, .yxyy when i=1, etc.
        */
@@ -365,14 +381,15 @@ generate_mat_body_from_scalar(exec_list *instructions,
                                        swiz[5 - i], swiz[6 - i],
                                       column_type->vector_elements);
 
-      ir_constant *const idx = new ir_constant(glsl_type::int_type, &i);
-      ir_dereference *const lhs = new ir_dereference(declarations[16], idx);
+      ir_constant *const idx = new ir_constant(int(i));
+      ir_dereference *const lhs =
+        new ir_dereference_array(declarations[16], idx);
 
       inst = new ir_assignment(lhs, rhs, NULL);
       instructions->push_tail(inst);
    }
 
-   ir_dereference *const retval = new ir_dereference(declarations[16]);
+   ir_dereference *const retval = new ir_dereference_variable(declarations[16]);
    inst = new ir_return(retval);
    instructions->push_tail(inst);
 }
@@ -395,22 +412,23 @@ generate_mat_body_from_N_scalars(exec_list *instructions,
     */
    for (unsigned i = 0; i < column_type->vector_elements; i++) {
       for (unsigned j = 0; j < row_type->vector_elements; j++) {
-        ir_constant *row_index = new ir_constant(glsl_type::int_type, &i);
+        ir_constant *row_index = new ir_constant(int(i));
         ir_dereference *const row_access =
-           new ir_dereference(declarations[16], row_index);
+           new ir_dereference_array(declarations[16], row_index);
 
         ir_swizzle *component_access = new ir_swizzle(row_access,
                                                       j, 0, 0, 0, 1);
 
         const unsigned param = (i * row_type->vector_elements) + j;
-        ir_dereference *const rhs = new ir_dereference(declarations[param]);
+        ir_dereference *const rhs =
+           new ir_dereference_variable(declarations[param]);
 
         inst = new ir_assignment(component_access, rhs, NULL);
         instructions->push_tail(inst);
       }
    }
 
-   ir_dereference *retval = new ir_dereference(declarations[16]);
+   ir_dereference *retval = new ir_dereference_variable(declarations[16]);
 
    inst = new ir_return(retval);
    instructions->push_tail(inst);
@@ -699,3 +717,46 @@ glsl_type::field_type(const char *name) const
 
    return error_type;
 }
+
+
+int
+glsl_type::field_index(const char *name) const
+{
+   if (this->base_type != GLSL_TYPE_STRUCT)
+      return -1;
+
+   for (unsigned i = 0; i < this->length; i++) {
+      if (strcmp(name, this->fields.structure[i].name) == 0)
+        return i;
+   }
+
+   return -1;
+}
+
+
+unsigned
+glsl_type::component_slots() const
+{
+   switch (this->base_type) {
+   case GLSL_TYPE_UINT:
+   case GLSL_TYPE_INT:
+   case GLSL_TYPE_FLOAT:
+   case GLSL_TYPE_BOOL:
+      return this->components();
+
+   case GLSL_TYPE_STRUCT: {
+      unsigned size = 0;
+
+      for (unsigned i = 0; i < this->length; i++)
+        size += this->fields.structure[i].type->component_slots();
+
+      return size;
+   }
+
+   case GLSL_TYPE_ARRAY:
+      return this->length * this->fields.array->component_slots();
+
+   default:
+      return 0;
+   }
+}