From 0bafde717d01fddf885b36c4f807e00548356fe0 Mon Sep 17 00:00:00 2001 From: Karol Herbst Date: Wed, 11 Dec 2019 17:52:17 +0100 Subject: [PATCH] nir/tests: MSVC build fix Fixes: 11f736a6f9c "nir/tests: add serializer tests" Signed-off-by: Karol Herbst Reviewed-by: Eric Engestrom --- src/compiler/nir/tests/serialize_tests.cpp | 25 ++++++++++------------ 1 file changed, 11 insertions(+), 14 deletions(-) diff --git a/src/compiler/nir/tests/serialize_tests.cpp b/src/compiler/nir/tests/serialize_tests.cpp index 1a5218a323f..f10646a6a47 100644 --- a/src/compiler/nir/tests/serialize_tests.cpp +++ b/src/compiler/nir/tests/serialize_tests.cpp @@ -106,27 +106,24 @@ class nir_serialize_all_but_one_test : public nir_serialize_test {}; } // namespace -INSTANTIATE_TEST_CASE_P( - nir_serialize_all_test, - nir_serialize_all_test, - ::testing::Values( #if NIR_MAX_VEC_COMPONENTS == 16 - 1, 2, 3, 4, 8, 16 +#define COMPONENTS 2, 3, 4, 8, 16 #else - 1, 2, 3, 4 +#define COMPONENTS 2, 3, 4 #endif -)); + + +INSTANTIATE_TEST_CASE_P( + nir_serialize_all_test, + nir_serialize_all_test, + ::testing::Values(1, COMPONENTS) +); INSTANTIATE_TEST_CASE_P( nir_serialize_all_but_one_test, nir_serialize_all_but_one_test, - ::testing::Values( -#if NIR_MAX_VEC_COMPONENTS == 16 - 2, 3, 4, 8, 16 -#else - 2, 3, 4 -#endif -)); + ::testing::Values(COMPONENTS) +); TEST_P(nir_serialize_all_test, alu_single_value_src_swizzle) { -- 2.30.2