diff options
| author | Ian Romanick <[email protected]> | 2010-03-09 15:58:52 -0800 |
|---|---|---|
| committer | Ian Romanick <[email protected]> | 2010-03-09 15:58:52 -0800 |
| commit | fce1150156edc8b51f5cf077679c0fdb5d582aba (patch) | |
| tree | b30b302d97103b30ad794816327d58c7b5daf2c4 /ast_to_hir.cpp | |
| parent | a2dd22fb194bdffa14a2466ae5667f3be63430d3 (diff) | |
Convert is_glsl_type_matrix to glsl_type::is_matrix
Diffstat (limited to 'ast_to_hir.cpp')
| -rw-r--r-- | ast_to_hir.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/ast_to_hir.cpp b/ast_to_hir.cpp index 1de58245913..5811d73586a 100644 --- a/ast_to_hir.cpp +++ b/ast_to_hir.cpp @@ -169,14 +169,14 @@ arithmetic_result_type(const struct glsl_type *type_a, * more detail how vectors and matrices are operated on." */ if (! multiply) { - if (is_glsl_type_matrix(type_a) && is_glsl_type_matrix(type_b) + if (type_a->is_matrix() && type_b->is_matrix() && (type_a->vector_elements == type_b->vector_elements) && (type_a->matrix_rows == type_b->matrix_rows)) return type_a; else return glsl_error_type; } else { - if (is_glsl_type_matrix(type_a) && is_glsl_type_matrix(type_b)) { + if (type_a->is_matrix() && type_b->is_matrix()) { if (type_a->vector_elements == type_b->matrix_rows) { char type_name[7]; const struct glsl_type *t; @@ -199,14 +199,14 @@ arithmetic_result_type(const struct glsl_type *type_a, _mesa_symbol_table_find_symbol(state->symbols, 0, type_name); return (t != NULL) ? t : glsl_error_type; } - } else if (is_glsl_type_matrix(type_a)) { + } else if (type_a->is_matrix()) { /* A is a matrix and B is a column vector. Columns of A must match * rows of B. */ if (type_a->vector_elements == type_b->vector_elements) return type_b; } else { - assert(is_glsl_type_matrix(type_b)); + assert(type_b->is_matrix()); /* A is a row vector and B is a matrix. Columns of A must match * rows of B. |