Axel Davy : d3d9/tests: Fix test_3dc_formats getPixelColor check.

Alexandre Julliard julliard at wine.codeweavers.com
Thu Jan 8 16:12:13 CST 2015


Module: wine
Branch: master
Commit: b83825509e64b4b8523add72988f7723a75f780b
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=b83825509e64b4b8523add72988f7723a75f780b

Author: Axel Davy <axel.davy at ens.fr>
Date:   Wed Jan  7 14:21:49 2015 +0100

d3d9/tests: Fix test_3dc_formats getPixelColor check.

getPixelColor should be called before Present, because the device
swapchain was created with discard mode.

---

 dlls/d3d9/tests/visual.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c
index a656a0d..0c10ffa 100644
--- a/dlls/d3d9/tests/visual.c
+++ b/dlls/d3d9/tests/visual.c
@@ -16798,8 +16798,6 @@ static void test_3dc_formats(void)
     hr = IDirect3DDevice9_EndScene(device);
     ok(SUCCEEDED(hr), "Failed to end scene, hr %#x.\n", hr);
 
-    hr = IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL);
-    ok(SUCCEEDED(hr), "Failed to present, hr %#x.\n", hr);
     for (i = 0; i < 4; ++i)
     {
         color = getPixelColor(device, expected_colors[i].position.x, expected_colors[i].position.y);
@@ -16808,6 +16806,8 @@ static void test_3dc_formats(void)
                 expected_colors[i].amd, expected_colors[i].nvidia, color, i);
     }
 
+    hr = IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL);
+    ok(SUCCEEDED(hr), "Failed to present, hr %#x.\n", hr);
     IDirect3DTexture9_Release(ati2n_texture);
     IDirect3DTexture9_Release(ati1n_texture);
     refcount = IDirect3DDevice9_Release(device);




More information about the wine-cvs mailing list