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

glsl: Assign array and matrix stride values according to std140 layout. 

Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
This commit is contained in:
Eric Anholt 2012-06-22 14:34:33 -07:00
parent 551bdf25bc
commit bbd1d6124d
1 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/glsl/link_uniforms.cpp
View File

@ -328,10 +328,21 @@ private:
this->uniforms[id].offset = this->ubo_byte_offset;
this->ubo_byte_offset += type->std140_size(ubo_var->RowMajor);
this->uniforms[id].array_stride = 0;
this->uniforms[id].matrix_stride = 0;
this->uniforms[id].row_major = base_type->is_matrix() &&
ubo_var->RowMajor;
if (type->is_array()) {
this->uniforms[id].array_stride =
align(type->fields.array->std140_size(ubo_var->RowMajor), 16);
} else {
this->uniforms[id].array_stride = 0;
}
if (type->is_matrix() ||
(type->is_array() && type->fields.array->is_matrix())) {
this->uniforms[id].matrix_stride = 16;
this->uniforms[id].row_major = ubo_var->RowMajor;
} else {
this->uniforms[id].matrix_stride = 0;
this->uniforms[id].row_major = false;
}
} else {
this->uniforms[id].block_index = -1;
this->uniforms[id].offset = -1;