glsl: add matrix layout information to interface block types

Graphics / Mesa 3D Graphics Library / Mesa - Iago Toral Quiroga [igalia.com] - 24 October 2016 08:49 UTC

So far we have been checking that interface block definitions had matching matrix layouts by comparing the definitions of their fields, however, this does not cover the case where the interface blocks are defined with mismatching matrix layouts but don't define any field with a matrix type. In this case Mesa will not fail to link because none of the fields will inherit the mismatching layout qualifier.

This patch fixes the problem in the same way we fixed it for packing layout information: we add the the layout information to the interface type and then we check it matches during the uniform block linking process.

v2: Fix unit tests so they pass the new parameter to glsl_type::get_interface_instance()

Fixes: dEQP-GLES31.functional.shaders.linkage.uniform.block.layout_qualifier_mismatch_3

Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=98245

537dce0 glsl: add matrix layout information to interface block types
src/compiler/glsl/ast_to_hir.cpp | 2 ++
src/compiler/glsl/builtin_variables.cpp | 1 +
src/compiler/glsl/link_uniform_blocks.cpp | 5 +++++
src/compiler/glsl/linker.cpp | 6 ++++--
src/compiler/glsl/tests/general_ir_test.cpp | 2 ++
src/compiler/glsl/tests/varyings_test.cpp | 1 +
src/compiler/glsl_types.cpp | 24 +++++++++++++++---------
src/compiler/glsl_types.h | 13 ++++++++++++-
src/mesa/main/mtypes.h | 1 +
9 files changed, 43 insertions(+), 12 deletions(-)

Upstream: cgit.freedesktop.org

  • Share