KonstantinSeurer
/
mesa
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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>
This commit is contained in:
Eric Anholt 2012-07-23 14:11:38 -07:00
parent 300315fe69
commit ffb2d43059
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/glsl/glsl_types.cpp
View File

@ -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