diff options
| author | Eric Anholt <eric@anholt.net> | 2012-07-23 14:11:38 -0700 |
|---|---|---|
| committer | Eric Anholt <eric@anholt.net> | 2012-08-07 13:54:50 -0700 |
| commit | ffb2d430596258aaeaf3b7ae7f295036ea4094d5 (patch) | |
| tree | 683965ca98192074aa70473bcdf9b4b2bd9cf4df /src/glsl | |
| parent | 300315fe69ba275dda8a4786783c2bdd007d0758 (diff) | |
| download | external_mesa3d-ffb2d430596258aaeaf3b7ae7f295036ea4094d5.zip external_mesa3d-ffb2d430596258aaeaf3b7ae7f295036ea4094d5.tar.gz external_mesa3d-ffb2d430596258aaeaf3b7ae7f295036ea4094d5.tar.bz2 | |
glsl: Fix calculation of std140 offset alignment for mat2s.
We were getting the base offset of a vec2, not of a vec2[2] like the quoted
spec text says we should.
v2: Fix swapped then/else cases.
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
Diffstat (limited to 'src/glsl')
| -rw-r--r-- | src/glsl/glsl_types.cpp | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/src/glsl/glsl_types.cpp b/src/glsl/glsl_types.cpp index 3d78660..2aa51f0 100644 --- a/src/glsl/glsl_types.cpp +++ b/src/glsl/glsl_types.cpp @@ -694,14 +694,19 @@ glsl_type::std140_base_alignment(bool row_major) const * row vectors with <C> components each, according to rule (4). */ if (this->is_matrix()) { - const struct glsl_type *vec_type; + const struct glsl_type *vec_type, *array_type; + int c = this->matrix_columns; + int r = this->vector_elements; + if (row_major) { - vec_type = get_instance(GLSL_TYPE_FLOAT, this->vector_elements, 1); + vec_type = get_instance(GLSL_TYPE_FLOAT, c, 1); + array_type = glsl_type::get_array_instance(vec_type, r); } else { - vec_type = get_instance(GLSL_TYPE_FLOAT, this->matrix_columns, 1); + vec_type = get_instance(GLSL_TYPE_FLOAT, r, 1); + array_type = glsl_type::get_array_instance(vec_type, c); } - return vec_type->std140_base_alignment(false); + return array_type->std140_base_alignment(false); } /* (9) If the member is a structure, the base alignment of the |