Alexandre Julliard : d3d: Revert test hacks that shouldn't have been committed.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 41683615a7ee612c20f6e7889d4d48542561b5e4
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=41683615a7ee612c20f6e7889...

Author: Alexandre Julliard <julliard(a)winehq.org>
Date:   Wed Nov 13 08:16:05 2019 +0100

d3d: Revert test hacks that shouldn't have been committed.

This reverts part of commit b680571a5073e65654c8dc12328a73d3dc822491.

Signed-off-by: Alexandre Julliard <julliard(a)winehq.org>

---

 dlls/d3d10core/tests/d3d10core.c |  3 ---
 dlls/d3d11/tests/d3d11.c         | 15 +++++----------
 dlls/d3d9/tests/device.c         |  2 --
 3 files changed, 5 insertions(+), 15 deletions(-)

diff --git a/dlls/d3d10core/tests/d3d10core.c b/dlls/d3d10core/tests/d3d10core.c
index d48af86370..d291c881e3 100644
--- a/dlls/d3d10core/tests/d3d10core.c
+++ b/dlls/d3d10core/tests/d3d10core.c
@@ -15996,7 +15996,6 @@ static void test_format_compatibility(void)
             colour = get_readback_color(&rb, x, y);
             expected = test_data[i].success && x >= texel_dwords && y
                     ? bitmap_data[j - (4 + texel_dwords)] : initial_data[j];
-            if (0)
             ok(colour == expected, "Test %u: Got unexpected colour 0x%08x at (%u, %u), expected 0x%08x.\n",
                     i, colour, x, y, expected);
         }
@@ -16011,7 +16010,6 @@ static void test_format_compatibility(void)
             y = j / 4;
             colour = get_readback_color(&rb, x, y);
             expected = test_data[i].success ? bitmap_data[j] : initial_data[j];
-            if (0)
             ok(colour == expected, "Test %u: Got unexpected colour 0x%08x at (%u, %u), expected 0x%08x.\n",
                     i, colour, x, y, expected);
         }
@@ -16919,7 +16917,6 @@ static void test_generate_mips(void)
             {
                 color = get_readback_color(&rb, expected[k].pos.x, expected[k].pos.y);
                 expected_color = tests[j].expected_mips ? expected[k].color : 0;
-                if (0)
                 ok(color == expected_color, "Resource type %u, test %u: pixel (%u, %u) "
                         "has color %08x, expected %08x.\n",
                         i, j, expected[k].pos.x, expected[k].pos.y, color, expected_color);
diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c
index b85984fa07..1dbd405001 100644
--- a/dlls/d3d11/tests/d3d11.c
+++ b/dlls/d3d11/tests/d3d11.c
@@ -6105,7 +6105,6 @@ static void test_so_statistics_query(void)
         get_query_data(context, query, &data, sizeof(data));
         ok(!data.NumPrimitivesWritten, "Got unexpected NumPrimitivesWritten: %u.\n",
                 (unsigned int)data.NumPrimitivesWritten);
-        if (0)
         todo_wine_if(query_desc.Query == D3D11_QUERY_SO_STATISTICS || query_desc.Query == D3D11_QUERY_SO_STATISTICS_STREAM0)
         ok(!data.PrimitivesStorageNeeded, "Got unexpected PrimitivesStorageNeeded: %u.\n",
                 (unsigned int)data.PrimitivesStorageNeeded);
@@ -6116,7 +6115,6 @@ static void test_so_statistics_query(void)
         get_query_data(context, query, &data, sizeof(data));
         ok(!data.NumPrimitivesWritten, "Got unexpected NumPrimitivesWritten: %u.\n",
                 (unsigned int)data.NumPrimitivesWritten);
-        if (0)
         todo_wine_if(query_desc.Query == D3D11_QUERY_SO_STATISTICS || query_desc.Query == D3D11_QUERY_SO_STATISTICS_STREAM0)
         ok(!data.PrimitivesStorageNeeded, "Got unexpected PrimitivesStorageNeeded: %u.\n",
                 (unsigned int)data.PrimitivesStorageNeeded);
@@ -20221,18 +20219,18 @@ static void test_ps_cs_uav_binding(void)
     check_texture_float(ps_texture, 0.0f, 2);
     draw_quad(&test_context);
     check_texture_float(cs_texture, 1.0f, 2);
-    if (0) check_texture_float(ps_texture, 1.0f, 2);
+    check_texture_float(ps_texture, 1.0f, 2);
 
     input.x = 0.5f;
     ID3D11DeviceContext_UpdateSubresource(context, (ID3D11Resource *)cs_cb, 0, NULL, &input, 0, 0);
     ID3D11DeviceContext_Dispatch(context, 1, 1, 1);
     check_texture_float(cs_texture, 0.5f, 2);
-    if (0) check_texture_float(ps_texture, 1.0f, 2);
+    check_texture_float(ps_texture, 1.0f, 2);
     input.x = 2.0f;
     ID3D11DeviceContext_UpdateSubresource(context, (ID3D11Resource *)ps_cb, 0, NULL, &input, 0, 0);
     draw_quad(&test_context);
     check_texture_float(cs_texture, 0.5f, 2);
-    if (0) check_texture_float(ps_texture, 2.0f, 2);
+    check_texture_float(ps_texture, 2.0f, 2);
 
     input.x = 8.0f;
     ID3D11DeviceContext_UpdateSubresource(context, (ID3D11Resource *)cs_cb, 0, NULL, &input, 0, 0);
@@ -20240,10 +20238,10 @@ static void test_ps_cs_uav_binding(void)
     ID3D11DeviceContext_UpdateSubresource(context, (ID3D11Resource *)ps_cb, 0, NULL, &input, 0, 0);
     ID3D11DeviceContext_Dispatch(context, 1, 1, 1);
     check_texture_float(cs_texture, 8.0f, 2);
-    if (0) check_texture_float(ps_texture, 2.0f, 2);
+    check_texture_float(ps_texture, 2.0f, 2);
     draw_quad(&test_context);
     check_texture_float(cs_texture, 8.0f, 2);
-    if (0) check_texture_float(ps_texture, 4.0f, 2);
+    check_texture_float(ps_texture, 4.0f, 2);
 
     ID3D11ComputeShader_Release(cs);
     ID3D11PixelShader_Release(ps);
@@ -26461,7 +26459,6 @@ static void test_format_compatibility(void)
             colour = get_readback_color(&rb, x, y, 0);
             expected = test_data[i].success && x >= texel_dwords && y
                     ? bitmap_data[j - (4 + texel_dwords)] : initial_data[j];
-            if (0)
             ok(colour == expected, "Test %u: Got unexpected colour 0x%08x at (%u, %u), expected 0x%08x.\n",
                     i, colour, x, y, expected);
         }
@@ -26476,7 +26473,6 @@ static void test_format_compatibility(void)
             y = j / 4;
             colour = get_readback_color(&rb, x, y, 0);
             expected = test_data[i].success ? bitmap_data[j] : initial_data[j];
-            if (0)
             ok(colour == expected, "Test %u: Got unexpected colour 0x%08x at (%u, %u), expected 0x%08x.\n",
                     i, colour, x, y, expected);
         }
@@ -27603,7 +27599,6 @@ static void test_generate_mips(void)
             {
                 color = get_readback_color(&rb, expected[k].pos.x, expected[k].pos.y, 0);
                 expected_color = tests[j].expected_mips ? expected[k].color : 0;
-                if (0)
                 ok(color == expected_color, "Resource type %u, test %u: pixel (%u, %u) "
                         "has color %08x, expected %08x.\n",
                         i, j, expected[k].pos.x, expected[k].pos.y, color, expected_color);
diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c
index e3f42a5f69..75cddbb6db 100644
--- a/dlls/d3d9/tests/device.c
+++ b/dlls/d3d9/tests/device.c
@@ -9542,10 +9542,8 @@ static void test_vidmem_accounting(void)
     }
     vidmem_end = IDirect3DDevice9_GetAvailableTextureMem(device);
 
-    todo_wine
     ok(vidmem_start > vidmem_end, "Expected available texture memory to decrease during texture creation.\n");
     diff = vidmem_start - vidmem_end;
-    todo_wine
     ok(diff > 1024 * 1024 * 2 * i, "Expected a video memory difference of at least %u MB, got %u MB.\n",
             2 * i, diff / 1024 / 1024);