Module: Mesa Branch: master Commit: f22b7933e2e9c31b3730f5b1d9c060d2e1377d20 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=f22b7933e2e9c31b3730f5b1d9c060d2e1377d20
Author: Timothy Arceri <t_arc...@yahoo.com.au> Date: Fri Oct 9 22:00:20 2015 +1100 glsl: allow for AoA in calculating offset to ubo start region Reviewed-by: Samuel Iglesias Gonsálvez <sigles...@igalia.com> --- src/glsl/lower_ubo_reference.cpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/glsl/lower_ubo_reference.cpp b/src/glsl/lower_ubo_reference.cpp index 96fb91b..1fbb09d 100644 --- a/src/glsl/lower_ubo_reference.cpp +++ b/src/glsl/lower_ubo_reference.cpp @@ -397,7 +397,7 @@ lower_ubo_reference_visitor::setup_for_load_or_store(ir_variable *var, if (deref_array->array->type->is_double()) array_stride *= 2; *matrix_columns = deref_array->array->type->matrix_columns; - } else if (deref_array->type->is_interface()) { + } else if (deref_array->type->without_array()->is_interface()) { /* We're processing an array dereference of an interface instance * array. The thing being dereferenced *must* be a variable * dereference because interfaces cannot be embedded in other @@ -406,7 +406,6 @@ lower_ubo_reference_visitor::setup_for_load_or_store(ir_variable *var, * interface instance array will have the same offsets relative to * the base of the block that backs them. */ - assert(deref_array->array->as_dereference_variable()); deref = deref_array->array->as_dereference(); break; } else { _______________________________________________ mesa-commit mailing list mesa-commit@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/mesa-commit