[PATCH v2 08/12] vkd3d: Fix MSVC build in tests/d3d12.c

[Hans-Kristian Arntzen]

Signed-off-by: Hans-Kristian Arntzen <post at arntzen-software.no>
---
 tests/d3d12.c | 28 ++++++++++++++++------------
 1 file changed, 16 insertions(+), 12 deletions(-)

diff --git a/tests/d3d12.c b/tests/d3d12.c
index 9c608c1..186cc07 100644
--- a/tests/d3d12.c
+++ b/tests/d3d12.c
@@ -18,6 +18,10 @@
 
 #include "d3d12_crosstest.h"
 
+#ifndef M_PI
+#define M_PI 3.14159265358979323846264338327950288
+#endif
+
 static PFN_D3D12_CREATE_VERSIONED_ROOT_SIGNATURE_DESERIALIZER pfn_D3D12CreateVersionedRootSignatureDeserializer;
 static PFN_D3D12_SERIALIZE_VERSIONED_ROOT_SIGNATURE pfn_D3D12SerializeVersionedRootSignature;
 
@@ -585,7 +589,7 @@ static void check_sub_resource_vec4_(unsigned int line, ID3D12Resource *texture,
     struct resource_readback rb;
     unsigned int x = 0, y;
     bool all_match = true;
-    struct vec4 got = {};
+    struct vec4 got = {0};
 
     get_texture_readback_with_command_list(texture, sub_resource_idx, &rb, queue, command_list);
     for (y = 0; y < rb.height; ++y)
@@ -614,7 +618,7 @@ static void check_sub_resource_uvec4_(unsigned int line, ID3D12Resource *texture
         const struct uvec4 *expected_value)
 {
     struct resource_readback rb;
-    struct uvec4 value = {};
+    struct uvec4 value = {0};
     unsigned int x = 0, y;
     bool all_match = true;
 
@@ -6365,7 +6369,7 @@ static void test_draw_uav_only(void)
         0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00004001, 0x00000001, 0x0100003e,
     };
     static const D3D12_SHADER_BYTECODE ps = {ps_code, sizeof(ps_code)};
-    static const float zero[4] = {};
+    static const float zero[4] = {0};
 
     memset(&desc, 0, sizeof(desc));
     desc.no_render_target = true;
@@ -8723,11 +8727,11 @@ static void test_shader_instructions(void)
         {&ps_loop_ret, {{2.0f, 1.0f}}, {{1.0f, 1.0f, 1.0f, 1.0f}}},
         {&ps_loop_ret, {{8.0f, 7.0f}}, {{1.0f, 1.0f, 1.0f, 1.0f}}},
 
-        {&ps_breakc_nz, {}, {{0.0f, 1.0f, 0.0f, 1.0f}}},
-        {&ps_breakc_z,  {}, {{0.0f, 1.0f, 0.0f, 1.0f}}},
+        {&ps_breakc_nz, {{0}}, {{0.0f, 1.0f, 0.0f, 1.0f}}},
+        {&ps_breakc_z,  {{0}}, {{0.0f, 1.0f, 0.0f, 1.0f}}},
 
-        {&ps_continue,     {}, {{254.0f}}, true},
-        {&ps_continuec_nz, {}, {{509.0f}}},
+        {&ps_continue,     {{0}}, {{254.0f}}, true},
+        {&ps_continuec_nz, {{0}}, {{509.0f}}},
 
         {&ps_retc_nz, {{  0.0f}}, {{1.0f}}},
         {&ps_retc_nz, {{ 10.0f}}, {{1.0f}}},
@@ -9603,9 +9607,9 @@ static void test_compute_shader_instructions(void)
         {&cs_atomic_iadd_tgsm_raw, {0xffffffff}, {-1}, {1, 1}, {0, 0}},
         {&cs_atomic_iadd_tgsm_raw, {0xffffffff}, {-1}, {4, 4}, {3, 3}},
 
-        {&cs_atomic_iadd_const, {}, {}, {0x00000000, 0x00000000}, {0xffffffff, 0xffffffff}},
-        {&cs_atomic_iadd_const, {}, {}, {0x00000001, 0x00000001}, {0x00000000, 0x00000000}},
-        {&cs_atomic_iadd_const, {}, {}, {0xffffffff, 0xffffffff}, {0xfffffffe, 0xfffffffe}},
+        {&cs_atomic_iadd_const, {0}, {0}, {0x00000000, 0x00000000}, {0xffffffff, 0xffffffff}},
+        {&cs_atomic_iadd_const, {0}, {0}, {0x00000001, 0x00000001}, {0x00000000, 0x00000000}},
+        {&cs_atomic_iadd_const, {0}, {0}, {0xffffffff, 0xffffffff}, {0xfffffffe, 0xfffffffe}},
     };
 
     if (!init_compute_test_context(&context))
@@ -11687,7 +11691,7 @@ static void test_immediate_constant_buffer(void)
     ID3D12GraphicsCommandList *command_list;
     struct test_context_desc desc;
     struct test_context context;
-    unsigned int index[4] = {};
+    unsigned int index[4] = {0};
     ID3D12CommandQueue *queue;
     ID3D12Resource *cb;
     unsigned int i;
@@ -20841,7 +20845,7 @@ static void test_cs_uav_store(void)
         0x00000001, 0x00000001, 0x00000000, 0x00000000, 0x01000016, 0x0100003e,
     };
     static const D3D12_SHADER_BYTECODE cs_group_index = {cs_group_index_code, sizeof(cs_group_index_code)};
-    static const float zero[4] = {};
+    static const float zero[4] = {0};
     static const struct
     {
         const D3D12_SHADER_BYTECODE *shader;
-- 
2.23.0