commit 0bafde717d01fddf885b36c4f807e00548356fe0
author Karol Herbst <kherbst@redhat.com> Wed Dec 11 17:52:17 2019 +0100
committer Karol Herbst <karolherbst@gmail.com> Wed Dec 11 17:12:48 2019 +0000
tree 7c71afd47f3fe39473ca02c1d76f48748569ada5
parent ab5570820071d97c4adfe8cd8a90083f3784fa5e

nir/tests: MSVC build fix

Fixes: 11f736a6f9c "nir/tests: add serializer tests"
Signed-off-by: Karol Herbst <kherbst@redhat.com>
Reviewed-by: Eric Engestrom <eric.engestrom@intel.com>

src/compiler/nir/tests/serialize_tests.cpp

diff --git a/src/compiler/nir/tests/serialize_tests.cpp b/src/compiler/nir/tests/serialize_tests.cpp
index 1a5218a..f10646a 100644
--- a/src/compiler/nir/tests/serialize_tests.cpp
+++ b/src/compiler/nir/tests/serialize_tests.cpp
@@ -106,27 +106,24 @@
 
 } // namespace
 
+#if NIR_MAX_VEC_COMPONENTS == 16
+#define COMPONENTS 2, 3, 4, 8, 16
+#else
+#define COMPONENTS 2, 3, 4
+#endif
+
+
 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
-#else
-      1, 2, 3, 4
-#endif
-));
+   ::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)
 {