KonstantinSeurer
/
mesa
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

glsl: Use the without_array predicate to simplify some code 

Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
Reviewed-by: Matt Turner <mattst88@gmail.com> [v1]
Reviewed-by: Timothy Arceri <t_arceri@yahoo.com.au>
This commit is contained in:
Ian Romanick 2014-07-19 14:41:04 -07:00
parent 22f7a46d74
commit 6305caea52
4 changed files with 12 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/glsl/ast_to_hir.cpp
View File

@ -5203,8 +5203,7 @@ ast_process_structure_or_interface_block(exec_list *instructions,
"in uniform blocks or structures.");
}
if (field_type->is_matrix() ||
(field_type->is_array() && field_type->fields.array->is_matrix())) {
if (field_type->without_array()->is_matrix()) {
fields[i].row_major = block_row_major;
if (qual->flags.q.row_major)
fields[i].row_major = true;

3
src/glsl/glsl_types.cpp
View File

@ -872,8 +872,7 @@ glsl_type::std140_size(bool row_major) const
* and <R> rows, the matrix is stored identically to a row of <S>*<R>
* row vectors with <C> components each, according to rule (4).
*/
if (this->is_matrix() || (this->is_array() &&
this->fields.array->is_matrix())) {
if (this->without_array()->is_matrix()) {
const struct glsl_type *element_type;
const struct glsl_type *vec_type;
unsigned int array_len;

23
src/glsl/link_uniforms.cpp
View File

@ -59,10 +59,8 @@ values_for_type(const glsl_type *type)
void
program_resource_visitor::process(const glsl_type *type, const char *name)
{
assert(type->is_record()
|| (type->is_array() && type->fields.array->is_record())
|| type->is_interface()
|| (type->is_array() && type->fields.array->is_interface()));
assert(type->without_array()->is_record()
|| type->without_array()->is_interface());
char *name_copy = ralloc_strdup(NULL, name);
recursion(type, &name_copy, strlen(name), false, NULL);
@ -136,7 +134,7 @@ program_resource_visitor::process(ir_variable *var)
*/
recursion(var->type, &name, strlen(name), false, NULL);
ralloc_free(name);
} else if (t->is_record() || (t->is_array() && t->fields.array->is_record())) {
} else if (t->without_array()->is_record()) {
char *name = ralloc_strdup(NULL, var->name);
recursion(var->type, &name, strlen(name), false, NULL);
ralloc_free(name);
@ -299,10 +297,8 @@ private:
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()));
assert(!type->is_interface());
assert(!(type->is_array() && type->fields.array->is_interface()));
assert(!type->without_array()->is_record());
assert(!type->without_array()->is_interface());
(void) row_major;
@ -514,10 +510,8 @@ private:
virtual void visit_field(const glsl_type *type, const char *name,
bool row_major, const glsl_type *record_type)
{
assert(!type->is_record());
assert(!(type->is_array() && type->fields.array->is_record()));
assert(!type->is_interface());
assert(!(type->is_array() && type->fields.array->is_interface()));
assert(!type->without_array()->is_record());
assert(!type->without_array()->is_interface());
(void) row_major;
@ -590,8 +584,7 @@ private:
this->uniforms[id].array_stride = 0;
}
if (type->is_matrix() ||
(type->is_array() && type->fields.array->is_matrix())) {
if (type->without_array()->is_matrix()) {
this->uniforms[id].matrix_stride = 16;
this->uniforms[id].row_major = ubo_row_major;
} else {

6
src/glsl/link_varyings.cpp
View File

@ -1068,10 +1068,8 @@ private:
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()));
assert(!type->is_interface());
assert(!(type->is_array() && type->fields.array->is_interface()));
assert(!type->without_array()->is_record());
assert(!type->without_array()->is_interface());
(void) row_major;