537dce06ec
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
Reviewed-by: Nicolai Hähnle <nicolai.haehnle@amd.com> (v1)
83 lines
2.9 KiB
C++
83 lines
2.9 KiB
C++
/*
|
|
* Copyright © 2013 Intel Corporation
|
|
*
|
|
* Permission is hereby granted, free of charge, to any person obtaining a
|
|
* copy of this software and associated documentation files (the "Software"),
|
|
* to deal in the Software without restriction, including without limitation
|
|
* the rights to use, copy, modify, merge, publish, distribute, sublicense,
|
|
* and/or sell copies of the Software, and to permit persons to whom the
|
|
* Software is furnished to do so, subject to the following conditions:
|
|
*
|
|
* The above copyright notice and this permission notice (including the next
|
|
* paragraph) shall be included in all copies or substantial portions of the
|
|
* Software.
|
|
*
|
|
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
|
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
|
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
|
|
* THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
|
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
|
|
* FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
|
|
* DEALINGS IN THE SOFTWARE.
|
|
*/
|
|
#include <gtest/gtest.h>
|
|
#include "main/compiler.h"
|
|
#include "main/mtypes.h"
|
|
#include "main/macros.h"
|
|
#include "ir.h"
|
|
|
|
TEST(ir_variable_constructor, interface)
|
|
{
|
|
void *mem_ctx = ralloc_context(NULL);
|
|
|
|
static const glsl_struct_field f[] = {
|
|
glsl_struct_field(glsl_type::vec(4), "v")
|
|
};
|
|
|
|
const glsl_type *const interface =
|
|
glsl_type::get_interface_instance(f,
|
|
ARRAY_SIZE(f),
|
|
GLSL_INTERFACE_PACKING_STD140,
|
|
false,
|
|
"simple_interface");
|
|
|
|
static const char name[] = "named_instance";
|
|
|
|
ir_variable *const v =
|
|
new(mem_ctx) ir_variable(interface, name, ir_var_uniform);
|
|
|
|
EXPECT_STREQ(name, v->name);
|
|
EXPECT_NE(name, v->name);
|
|
EXPECT_EQ(interface, v->type);
|
|
EXPECT_EQ(interface, v->get_interface_type());
|
|
}
|
|
|
|
TEST(ir_variable_constructor, interface_array)
|
|
{
|
|
void *mem_ctx = ralloc_context(NULL);
|
|
|
|
static const glsl_struct_field f[] = {
|
|
glsl_struct_field(glsl_type::vec(4), "v")
|
|
};
|
|
|
|
const glsl_type *const interface =
|
|
glsl_type::get_interface_instance(f,
|
|
ARRAY_SIZE(f),
|
|
GLSL_INTERFACE_PACKING_STD140,
|
|
false,
|
|
"simple_interface");
|
|
|
|
const glsl_type *const interface_array =
|
|
glsl_type::get_array_instance(interface, 2);
|
|
|
|
static const char name[] = "array_instance";
|
|
|
|
ir_variable *const v =
|
|
new(mem_ctx) ir_variable(interface_array, name, ir_var_uniform);
|
|
|
|
EXPECT_STREQ(name, v->name);
|
|
EXPECT_NE(name, v->name);
|
|
EXPECT_EQ(interface_array, v->type);
|
|
EXPECT_EQ(interface, v->get_interface_type());
|
|
}
|