diff options
| author | marha <marha@users.sourceforge.net> | 2012-08-01 08:02:35 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2012-08-01 08:02:35 +0200 |
| commit | 49838240b7d4cff1ffed1bd91e495f6919061f90 (patch) | |
| tree | 70bd36783cafbf991721b06134bafdd360ccbe06 /mesalib/src/glsl/link_uniforms.cpp | |
| parent | bd27b3d008b0abf9ae2edcb127302728808533e4 (diff) | |
| download | vcxsrv-49838240b7d4cff1ffed1bd91e495f6919061f90.tar.gz vcxsrv-49838240b7d4cff1ffed1bd91e495f6919061f90.tar.bz2 vcxsrv-49838240b7d4cff1ffed1bd91e495f6919061f90.zip | |
git mesa update 1 Aug 2012
Diffstat (limited to 'mesalib/src/glsl/link_uniforms.cpp')
| -rw-r--r-- | mesalib/src/glsl/link_uniforms.cpp | 19 |
1 files changed, 15 insertions, 4 deletions
diff --git a/mesalib/src/glsl/link_uniforms.cpp b/mesalib/src/glsl/link_uniforms.cpp index d7ef5d4d2..1baa46c5d 100644 --- a/mesalib/src/glsl/link_uniforms.cpp +++ b/mesalib/src/glsl/link_uniforms.cpp @@ -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; |