diff options
| -rw-r--r-- | src/glsl/link_uniforms.cpp | 14 | ||||
| -rw-r--r-- | src/glsl/linker.h | 4 | ||||
| -rw-r--r-- | src/mesa/program/ir_to_mesa.cpp | 8 |
3 files changed, 19 insertions, 7 deletions
diff --git a/src/glsl/link_uniforms.cpp b/src/glsl/link_uniforms.cpp index c5661bb2f47..90d46da0721 100644 --- a/src/glsl/link_uniforms.cpp +++ b/src/glsl/link_uniforms.cpp @@ -73,7 +73,7 @@ uniform_field_visitor::process(ir_variable *var) recursion(var->type, &name, strlen(name), false); ralloc_free(name); } else { - this->visit_field(t, var->name); + this->visit_field(t, var->name, false); } } @@ -109,7 +109,7 @@ uniform_field_visitor::recursion(const glsl_type *t, char **name, t->fields.structure[i].row_major); } } else { - this->visit_field(t, *name); + this->visit_field(t, *name, row_major); } } @@ -159,11 +159,14 @@ public: unsigned num_shader_uniform_components; private: - virtual void visit_field(const glsl_type *type, const char *name) + virtual void visit_field(const glsl_type *type, const char *name, + bool row_major) { assert(!type->is_record()); assert(!(type->is_array() && type->fields.array->is_record())); + (void) row_major; + /* Count the number of samplers regardless of whether the uniform is * already in the hash table. The hash table prevents adding the same * uniform for multiple shader targets, but in this case we want to @@ -263,11 +266,14 @@ public: int ubo_byte_offset; private: - virtual void visit_field(const glsl_type *type, const char *name) + virtual void visit_field(const glsl_type *type, const char *name, + bool row_major) { assert(!type->is_record()); assert(!(type->is_array() && type->fields.array->is_record())); + (void) row_major; + unsigned id; bool found = this->map->get(id, name); assert(found); diff --git a/src/glsl/linker.h b/src/glsl/linker.h index e69098afdc3..0ad217f841c 100644 --- a/src/glsl/linker.h +++ b/src/glsl/linker.h @@ -90,8 +90,10 @@ protected: * * \param type Type of the field. * \param name Fully qualified name of the field. + * \param row_major For a matrix type, is it stored row-major. */ - virtual void visit_field(const glsl_type *type, const char *name) = 0; + virtual void visit_field(const glsl_type *type, const char *name, + bool row_major) = 0; private: /** diff --git a/src/mesa/program/ir_to_mesa.cpp b/src/mesa/program/ir_to_mesa.cpp index 03a1dc402c3..b197ad34437 100644 --- a/src/mesa/program/ir_to_mesa.cpp +++ b/src/mesa/program/ir_to_mesa.cpp @@ -2389,7 +2389,8 @@ public: } private: - virtual void visit_field(const glsl_type *type, const char *name); + virtual void visit_field(const glsl_type *type, const char *name, + bool row_major); struct gl_shader_program *shader_program; struct gl_program_parameter_list *params; @@ -2397,10 +2398,13 @@ private: }; void -add_uniform_to_shader::visit_field(const glsl_type *type, const char *name) +add_uniform_to_shader::visit_field(const glsl_type *type, const char *name, + bool row_major) { unsigned int size; + (void) row_major; + if (type->is_vector() || type->is_scalar()) { size = type->vector_elements; } else { |