diff options
| author | Ian Romanick <ian.d.romanick@intel.com> | 2010-03-09 15:55:16 -0800 |
|---|---|---|
| committer | Ian Romanick <ian.d.romanick@intel.com> | 2010-03-09 15:55:16 -0800 |
| commit | a2dd22fb194bdffa14a2466ae5667f3be63430d3 (patch) | |
| tree | c3515c48efddadc8d7b83a0951bca4ea48c95d2e /ast_to_hir.cpp | |
| parent | cb36f8aaeeb09660843316270a781948f773d90b (diff) | |
Convert is_glsl_type_vector to glsl_type::is_vector
Diffstat (limited to 'ast_to_hir.cpp')
| -rw-r--r-- | ast_to_hir.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/ast_to_hir.cpp b/ast_to_hir.cpp index 8feeab6267..1de5824591 100644 --- a/ast_to_hir.cpp +++ b/ast_to_hir.cpp @@ -136,7 +136,7 @@ arithmetic_result_type(const struct glsl_type *type_a, * operation is done component-wise resulting in the same size * vector." */ - if (is_glsl_type_vector(type_a) && is_glsl_type_vector(type_b)) { + if (type_a->is_vector() && type_b->is_vector()) { if (type_a->vector_elements == type_b->vector_elements) return type_a; else @@ -261,8 +261,8 @@ modulus_result_type(const struct glsl_type *type_a, * wise to the vector, resulting in the same type as the vector. If both * are vectors of the same size, the result is computed component-wise." */ - if (is_glsl_type_vector(type_a)) { - if (!is_glsl_type_vector(type_b) + if (type_a->is_vector()) { + if (!type_b->is_vector() || (type_a->vector_elements == type_b->vector_elements)) return type_a; } else |