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

Use glsl_type::get_instance instead of symbol table look-up

Browse Source
This commit is contained in:
Ian Romanick
2010-03-24 17:45:14 -07:00
parent e4fca97afd
commit d2b6bc651a
1 changed files with 3 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
ast_to_hir.cpp
View File

@@ -192,25 +192,9 @@ arithmetic_result_type(const struct glsl_type *type_a,
} 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) { if (type_a->vector_elements == type_b->matrix_rows) {
char type_name[7]; return glsl_type::get_instance(type_a->base_type,
const struct glsl_type *t; type_b->matrix_rows,
type_a->vector_elements);
type_name[0] = 'm';
type_name[1] = 'a';
type_name[2] = 't';
if (type_a->matrix_rows == type_b->vector_elements) {
type_name[3] = '0' + type_a->matrix_rows;
type_name[4] = '\0';
} else {
type_name[3] = '0' + type_a->matrix_rows;
type_name[4] = 'x';
type_name[5] = '0' + type_b->vector_elements;
type_name[6] = '\0';
}
t = state->symbols->get_type(type_name);
return (t != NULL) ? t : glsl_error_type;
} }
} 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