diff options
| -rw-r--r-- | src/compiler/glsl/ast_to_hir.cpp | 2 | ||||
| -rw-r--r-- | src/compiler/glsl/ir_print_visitor.cpp | 2 | ||||
| -rw-r--r-- | src/compiler/glsl/link_varyings.cpp | 2 | ||||
| -rw-r--r-- | src/compiler/glsl/tests/uniform_initializer_utils.cpp | 2 | ||||
| -rw-r--r-- | src/mesa/state_tracker/st_glsl_to_tgsi.cpp | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/src/compiler/glsl/ast_to_hir.cpp b/src/compiler/glsl/ast_to_hir.cpp index 88fff861cc5..a4a687f687d 100644 --- a/src/compiler/glsl/ast_to_hir.cpp +++ b/src/compiler/glsl/ast_to_hir.cpp @@ -4712,7 +4712,7 @@ ast_declarator_list::hir(exec_list *instructions, "invalid type `%s' in empty declaration", type_name); } else { - if (decl_type->base_type == GLSL_TYPE_ARRAY) { + if (decl_type->is_array()) { /* From Section 13.22 (Array Declarations) of the GLSL ES 3.2 * spec: * diff --git a/src/compiler/glsl/ir_print_visitor.cpp b/src/compiler/glsl/ir_print_visitor.cpp index 1c84c1be16e..0a39459c925 100644 --- a/src/compiler/glsl/ir_print_visitor.cpp +++ b/src/compiler/glsl/ir_print_visitor.cpp @@ -145,7 +145,7 @@ ir_print_visitor::unique_name(ir_variable *var) static void print_type(FILE *f, const glsl_type *t) { - if (t->base_type == GLSL_TYPE_ARRAY) { + if (t->is_array()) { fprintf(f, "(array "); print_type(f, t->fields.array); fprintf(f, " %u)", t->length); diff --git a/src/compiler/glsl/link_varyings.cpp b/src/compiler/glsl/link_varyings.cpp index f0df3d60a5c..e6947692aff 100644 --- a/src/compiler/glsl/link_varyings.cpp +++ b/src/compiler/glsl/link_varyings.cpp @@ -1678,7 +1678,7 @@ varying_matches::compute_packing_order(const ir_variable *var) { const glsl_type *element_type = var->type; - while (element_type->base_type == GLSL_TYPE_ARRAY) { + while (element_type->is_array()) { element_type = element_type->fields.array; } diff --git a/src/compiler/glsl/tests/uniform_initializer_utils.cpp b/src/compiler/glsl/tests/uniform_initializer_utils.cpp index 2a1a16839b8..9a66ebafbcd 100644 --- a/src/compiler/glsl/tests/uniform_initializer_utils.cpp +++ b/src/compiler/glsl/tests/uniform_initializer_utils.cpp @@ -214,7 +214,7 @@ verify_data(gl_constant_value *storage, unsigned storage_array_size, ir_constant *val, unsigned red_zone_size, unsigned int boolean_true) { - if (val->type->base_type == GLSL_TYPE_ARRAY) { + if (val->type->is_array()) { const glsl_type *const element_type = val->array_elements[0]->type; for (unsigned i = 0; i < storage_array_size; i++) { diff --git a/src/mesa/state_tracker/st_glsl_to_tgsi.cpp b/src/mesa/state_tracker/st_glsl_to_tgsi.cpp index 96c08a64f31..9a19167faa0 100644 --- a/src/mesa/state_tracker/st_glsl_to_tgsi.cpp +++ b/src/mesa/state_tracker/st_glsl_to_tgsi.cpp @@ -4246,7 +4246,7 @@ glsl_to_tgsi_visitor::visit(ir_texture *ir) component = this->result; if (ir->offset) { ir->offset->accept(this); - if (ir->offset->type->base_type == GLSL_TYPE_ARRAY) { + if (ir->offset->type->is_array()) { const glsl_type *elt_type = ir->offset->type->fields.array; for (i = 0; i < ir->offset->type->length; i++) { offset[i] = this->result; |