78b70ceae1
Ever since the addition of interface blocks with instance names, we have
had an implicit invariant:
var->type->is_interface() ==
(var->type == var->interface_type)
The odd use of == here is intentional because !var->type->is_interface()
implies var->type != var->interface_type.
Further, if var->type->is_array() is true, we have a related implicit
invariant:
var->type->fields.array->is_interface() ==
(var->type->fields.array == var->interface_type)
However, the ir_variable constructor doesn't maintain either invariant.
That seems kind of silly... and I tripped over it while writing some
other code. This patch makes the constructor do the right thing, and it
introduces some tests to verify that behavior.
v2: Add general-ir-test to .gitignore. Update the description of the
ir_variable invariant for arrays in the commit message. Both suggested
by Paul.
Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
Reviewed-by: Paul Berry <stereotype441@gmail.com>
90 lines
2.9 KiB
C++
90 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 "ralloc.h"
|
|
#include "ir.h"
|
|
|
|
TEST(ir_variable_constructor, interface)
|
|
{
|
|
void *mem_ctx = ralloc_context(NULL);
|
|
|
|
static const glsl_struct_field f[] = {
|
|
{
|
|
glsl_type::vec(4),
|
|
"v",
|
|
false
|
|
}
|
|
};
|
|
|
|
const glsl_type *const interface =
|
|
glsl_type::get_interface_instance(f,
|
|
ARRAY_SIZE(f),
|
|
GLSL_INTERFACE_PACKING_STD140,
|
|
"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_type::vec(4),
|
|
"v",
|
|
false
|
|
}
|
|
};
|
|
|
|
const glsl_type *const interface =
|
|
glsl_type::get_interface_instance(f,
|
|
ARRAY_SIZE(f),
|
|
GLSL_INTERFACE_PACKING_STD140,
|
|
"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());
|
|
}
|