fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2025-12-25 13:00:09 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

ir_constant_expression: Add support for matrix multiplication.

Browse source 
Also handles matrix/vector and vector/matrix multiplication.

Fixes piglit tests const-matrix-multiply-01.frag,
const-matrix-multiply-02.frag, and const-vec-mat.frag.
This commit is contained in:
Kenneth Graunke 2010-07-05 23:19:56 -07:00 • committed by Ian Romanick
parent 37b3f9d0ed
commit cf80a4d177
1 changed files with 25 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
src/glsl/ir_constant_expression.cpp
View file

@ -362,6 +362,7 @@ ir_constant_visitor::visit(ir_expression *ir)
break;
case ir_binop_mul:
/* Check for equal types, or unequal types involving scalars */
if ((op[0]->type == op[1]->type && !op[0]->type->is_matrix())
|| op0_scalar || op1_scalar) {
for (unsigned c = 0, c0 = 0, c1 = 0;
@ -382,9 +383,30 @@ ir_constant_visitor::visit(ir_expression *ir)
assert(0);
}
}
} else
/* FINISHME: Support vector/matrix and matrix multiplication. */
return;
} else {
assert(op[0]->type->is_matrix() || op[1]->type->is_matrix());
/* Multiply an N-by-M matrix with an M-by-P matrix. Since either
* matrix can be a GLSL vector, either N or P can be 1.
*
* For vec*mat, the vector is treated as a row vector. This
* means the vector is a 1-row x M-column matrix.
*
* For mat*vec, the vector is treated as a column vector. Since
* matrix_columns is 1 for vectors, this just works.
*/
const unsigned n = op[0]->type->is_vector()
? 1 : op[0]->type->vector_elements;
const unsigned m = op[1]->type->vector_elements;
const unsigned p = op[1]->type->matrix_columns;
for (unsigned j = 0; j < p; j++) {
for (unsigned i = 0; i < n; i++) {
for (unsigned k = 0; k < m; k++) {
data.f[i+n*j] += op[0]->value.f[i+n*k]*op[1]->value.f[k+m*j];
}
}
}
}
break;
case ir_binop_div: