nir/tests: MSVC build fix

Fixes: 11f736a6f9c "nir/tests: add serializer tests"
Signed-off-by: Karol Herbst <[email protected]>
Reviewed-by: Eric Engestrom <[email protected]>

1 files 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)
 {