summaryrefslogtreecommitdiffstats
path: root/src/compiler
diff options
context:
space:
mode:
authorDylan Baker <[email protected]>2018-04-18 10:44:44 -0700
committerDylan Baker <[email protected]>2019-05-03 10:57:17 -0700
commit113bb8d448f51f76e8be9ecf4fe9e215e281cba2 (patch)
tree3d5226fe168f0d8d29963552a9690490157eb91b /src/compiler
parentf1d5f2aff34665379d859ce6ec7ee690046795f9 (diff)
glsl: fix general_ir_test with mingw
Somewhere down in the depths of the mingw headers 'interface' is defined, change it to iface like a similar patch did. Signed-off-by: Dylan Baker <[email protected]> Reviewed-by: Eric Anholt <[email protected]>
Diffstat (limited to 'src/compiler')
-rw-r--r--src/compiler/glsl/tests/general_ir_test.cpp14
1 files changed, 7 insertions, 7 deletions
diff --git a/src/compiler/glsl/tests/general_ir_test.cpp b/src/compiler/glsl/tests/general_ir_test.cpp
index 57917f33734..c8bc16b7ad0 100644
--- a/src/compiler/glsl/tests/general_ir_test.cpp
+++ b/src/compiler/glsl/tests/general_ir_test.cpp
@@ -34,7 +34,7 @@ TEST(ir_variable_constructor, interface)
glsl_struct_field(glsl_type::vec(4), "v")
};
- const glsl_type *const interface =
+ const glsl_type *const iface =
glsl_type::get_interface_instance(f,
ARRAY_SIZE(f),
GLSL_INTERFACE_PACKING_STD140,
@@ -44,12 +44,12 @@ TEST(ir_variable_constructor, interface)
static const char name[] = "named_instance";
ir_variable *const v =
- new(mem_ctx) ir_variable(interface, name, ir_var_uniform);
+ new(mem_ctx) ir_variable(iface, 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());
+ EXPECT_EQ(iface, v->type);
+ EXPECT_EQ(iface, v->get_interface_type());
}
TEST(ir_variable_constructor, interface_array)
@@ -60,7 +60,7 @@ TEST(ir_variable_constructor, interface_array)
glsl_struct_field(glsl_type::vec(4), "v")
};
- const glsl_type *const interface =
+ const glsl_type *const iface =
glsl_type::get_interface_instance(f,
ARRAY_SIZE(f),
GLSL_INTERFACE_PACKING_STD140,
@@ -68,7 +68,7 @@ TEST(ir_variable_constructor, interface_array)
"simple_interface");
const glsl_type *const interface_array =
- glsl_type::get_array_instance(interface, 2);
+ glsl_type::get_array_instance(iface, 2);
static const char name[] = "array_instance";
@@ -78,5 +78,5 @@ TEST(ir_variable_constructor, interface_array)
EXPECT_STREQ(name, v->name);
EXPECT_NE(name, v->name);
EXPECT_EQ(interface_array, v->type);
- EXPECT_EQ(interface, v->get_interface_type());
+ EXPECT_EQ(iface, v->get_interface_type());
}