From 0b0dc03a31e13aa1cb4e0a6479dbd09cef612d44 Mon Sep 17 00:00:00 2001 From: Paul Berry Date: Wed, 31 Jul 2013 09:43:16 -0700 Subject: [PATCH] glsl: Use count_attribute_slots() in ir_set_program_inouts. Reviewed-by: Ian Romanick Reviewed-by: Kenneth Graunke --- src/glsl/ir_set_program_inouts.cpp | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/src/glsl/ir_set_program_inouts.cpp b/src/glsl/ir_set_program_inouts.cpp index ef95cbeaeb7..351f65bd59d 100644 --- a/src/glsl/ir_set_program_inouts.cpp +++ b/src/glsl/ir_set_program_inouts.cpp @@ -110,14 +110,8 @@ ir_set_program_inouts_visitor::visit(ir_dereference_variable *ir) if (!is_shader_inout(ir->var)) return visit_continue; - if (ir->type->is_array()) { - mark(this->prog, ir->var, 0, - ir->type->length * ir->type->fields.array->matrix_columns, - this->shader_type == GL_FRAGMENT_SHADER); - } else { - mark(this->prog, ir->var, 0, ir->type->matrix_columns, - this->shader_type == GL_FRAGMENT_SHADER); - } + mark(this->prog, ir->var, 0, ir->type->count_attribute_slots(), + this->shader_type == GL_FRAGMENT_SHADER); return visit_continue; } -- 2.30.2