OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use glsl_type::row_type and glsl_type::column type in arithmetic_result_type

Browse Source 
This substantially clarifies the code for matching matrix types.  It
also eliminates some uses of glsl_type member data.
This commit is contained in:
Ian Romanick
2010-03-25 13:06:58 -07:00
parent 80b5ed6e63
commit c1bd3a1a61
1 changed files with 24 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
ast_to_hir.cpp
View File

@@ -183,24 +183,39 @@ arithmetic_result_type(const struct glsl_type *type_a,
return (type_a == type_b) ? type_a : glsl_error_type; return (type_a == type_b) ? type_a : glsl_error_type;
} else { } else {
if (type_a->is_matrix() && type_b->is_matrix()) { if (type_a->is_matrix() && type_b->is_matrix()) {
if (type_a->vector_elements == type_b->matrix_rows) { /* Matrix multiply. The columns of A must match the rows of B. Given
return glsl_type::get_instance(type_a->base_type, * the other previously tested constraints, this means the vector type
type_b->matrix_rows, * of a row from A must be the same as the vector type of a column from
type_a->vector_elements); * B.
*/
if (type_a->row_type() == type_b->column_type()) {
/* The resulting matrix has the number of columns of matrix B and
* the number of rows of matrix A. We get the row count of A by
* looking at the size of a vector that makes up a column. The
* transpose (size of a row) is done for B.
*/
return
glsl_type::get_instance(type_a->base_type,
type_a->column_type()->vector_elements,
type_b->row_type()->vector_elements);
} }
} else if (type_a->is_matrix()) { } else if (type_a->is_matrix()) {
/* A is a matrix and B is a column vector. Columns of A must match /* A is a matrix and B is a column vector. Columns of A must match
* rows of B. * rows of B. Given the other previously tested constraints, this
* means the vector type of a row from A must be the same as the
* vector the type of B.
*/ */
if (type_a->vector_elements == type_b->vector_elements) if (type_a->row_type() == type_b)
return type_b; return type_b;
} else { } else {
assert(type_b->is_matrix()); assert(type_b->is_matrix());
/* A is a row vector and B is a matrix. Columns of A must match /* A is a row vector and B is a matrix. Columns of A must match rows
* rows of B. * of B. Given the other previously tested constraints, this means
* the type of A must be the same as the vector type of a column from
* B.
*/ */
if (type_a->vector_elements == type_b->matrix_rows) if (type_a == type_b->column_type())
return type_a; return type_a;
} }
} }