fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-05 09:38:07 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

glsl: Correct the marking of InputsRead/OutputsWritten on in/out matrices.

Browse source 
If you used a constant array index to access the matrix, we'd flag a
bunch of wrong inputs/outputs as being used because the index was
multiplied by matrix columns and the actual used index was left out.

Fixes glsl-mat-attribute.
(cherry picked from commit b13a2e640f)
This commit is contained in:
Eric Anholt 2010-12-09 14:31:43 -08:00 • committed by Ian Romanick
parent 9d1c6dd79b
commit 84e7dd0114
1 changed files with 15 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
src/glsl/ir_set_program_inouts.cpp
View file

@ -66,7 +66,7 @@ public:
};
static void
mark(struct gl_program *prog, ir_variable *var, int index)
mark(struct gl_program *prog, ir_variable *var, int offset, int len)
{
/* As of GLSL 1.20, varyings can only be floats, floating-point
* vectors or matrices, or arrays of them. For Mesa programs using
@ -75,25 +75,12 @@ mark(struct gl_program *prog, ir_variable *var, int index)
* something doing a more clever packing would use something other
* than InputsRead/OutputsWritten.
*/
const glsl_type *element_type;
int element_size;
if (var->type->is_array())
element_type = var->type->fields.array;
else
element_type = var->type;
if (element_type->is_matrix())
element_size = element_type->matrix_columns;
else
element_size = 1;
index *= element_size;
for (int i = 0; i < element_size; i++) {
for (int i = 0; i < len; i++) {
if (var->mode == ir_var_in)
prog->InputsRead |= BITFIELD64_BIT(var->location + index + i);
prog->InputsRead |= BITFIELD64_BIT(var->location + offset + i);
else
prog->OutputsWritten |= BITFIELD64_BIT(var->location + index + i);
prog->OutputsWritten |= BITFIELD64_BIT(var->location + offset + i);
}
}
@ -106,10 +93,11 @@ ir_set_program_inouts_visitor::visit(ir_dereference_variable *ir)
if (ir->type->is_array()) {
for (unsigned int i = 0; i < ir->type->length; i++) {
mark(this->prog, ir->var, i);
mark(this->prog, ir->var, i,
ir->type->length * ir->type->fields.array->matrix_columns);
}
} else {
mark(this->prog, ir->var, 0);
mark(this->prog, ir->var, 0, ir->type->matrix_columns);
}
return visit_continue;
@ -128,7 +116,14 @@ ir_set_program_inouts_visitor::visit_enter(ir_dereference_array *ir)
var = (ir_variable *)hash_table_find(this->ht, deref_var->var);
if (index && var) {
mark(this->prog, var, index->value.i[0]);
int width = 1;
if (deref_var->type->is_array() &&
deref_var->type->fields.array->is_matrix()) {
width = deref_var->type->fields.array->matrix_columns;
}
mark(this->prog, var, index->value.i[0] * width, width);
return visit_continue_with_parent;
}