fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2025-12-21 22:20:14 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

glsl: Only flag RowMajor on matrix-type variables.

Browse source 
We were only propagating it to the API when the variable was a matrix type,
but we were still tripping over it in lower_ubo_reference when it was set on a
vector.

Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
This commit is contained in:
Eric Anholt 2012-07-23 14:31:42 -07:00
parent ffb2d43059
commit 86e0045578
1 changed files with 9 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/glsl/ast_to_hir.cpp
View file

@ -4054,11 +4054,15 @@ ast_uniform_block::hir(exec_list *instructions,
ubo_var->Type = var->type;
ubo_var->Buffer = ubo - state->uniform_blocks;
ubo_var->Offset = 0; /* Assigned at link time. */
ubo_var->RowMajor = block_row_major;
if (decl_list->type->qualifier.flags.q.row_major)
ubo_var->RowMajor = true;
else if (decl_list->type->qualifier.flags.q.column_major)
ubo_var->RowMajor = false;
if (var->type->is_matrix() ||
(var->type->is_array() && var->type->fields.array->is_matrix())) {
ubo_var->RowMajor = block_row_major;
if (decl_list->type->qualifier.flags.q.row_major)
ubo_var->RowMajor = true;
else if (decl_list->type->qualifier.flags.q.column_major)
ubo_var->RowMajor = false;
}
/* From the GL_ARB_uniform_buffer_object spec:
*