Michael Stefaniuc : d3d10core/tests: Use wine_dbgstr_rect() to print RECTs.

Alexandre Julliard julliard at winehq.org
Fri Jun 10 09:05:46 CDT 2016


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

Author: Michael Stefaniuc <mstefani at redhat.de>
Date:   Fri Jun 10 09:41:32 2016 +0200

d3d10core/tests: Use wine_dbgstr_rect() to print RECTs.

Signed-off-by: Michael Stefaniuc <mstefani at redhat.de>
Signed-off-by: Henri Verbeet <hverbeet at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>

---

 dlls/d3d10core/tests/device.c | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/dlls/d3d10core/tests/device.c b/dlls/d3d10core/tests/device.c
index 771dc39..dd97781 100644
--- a/dlls/d3d10core/tests/device.c
+++ b/dlls/d3d10core/tests/device.c
@@ -3143,8 +3143,7 @@ float4 main(float4 color : COLOR) : SV_TARGET
     for (i = 0; i < D3D10_VIEWPORT_AND_SCISSORRECT_OBJECT_COUNT_PER_PIPELINE; ++i)
     {
         ok(!tmp_rect[i].left && !tmp_rect[i].top && !tmp_rect[i].right && !tmp_rect[i].bottom,
-                "Got unexpected scissor rect {%d, %d, %d, %d} in slot %u.\n",
-                tmp_rect[i].left, tmp_rect[i].top, tmp_rect[i].right, tmp_rect[i].bottom, i);
+                "Got unexpected scissor rect %s in slot %u.\n", wine_dbgstr_rect(&tmp_rect[i]), i);
     }
     ID3D10Device_RSGetViewports(device, &count, NULL);
     todo_wine ok(!count, "Got unexpected viewport count %u.\n", count);
@@ -3542,8 +3541,7 @@ float4 main(float4 color : COLOR) : SV_TARGET
                 && tmp_rect[i].top == i * 2
                 && tmp_rect[i].right == i + 1
                 && tmp_rect[i].bottom == (i + 1) * 2,
-                "Got unexpected scissor rect {%d, %d, %d, %d} in slot %u.\n",
-                tmp_rect[i].left, tmp_rect[i].top, tmp_rect[i].right, tmp_rect[i].bottom, i);
+                "Got unexpected scissor rect %s in slot %u.\n", wine_dbgstr_rect(&tmp_rect[i]), i);
     }
     ID3D10Device_RSGetViewports(device, &count, NULL);
     todo_wine ok(count == D3D10_VIEWPORT_AND_SCISSORRECT_OBJECT_COUNT_PER_PIPELINE,
@@ -3680,12 +3678,12 @@ float4 main(float4 color : COLOR) : SV_TARGET
     {
         if (!i)
             todo_wine ok(!tmp_rect[i].left && !tmp_rect[i].top && !tmp_rect[i].right && !tmp_rect[i].bottom,
-                    "Got unexpected scissor rect {%d, %d, %d, %d} in slot %u.\n",
-                    tmp_rect[i].left, tmp_rect[i].top, tmp_rect[i].right, tmp_rect[i].bottom, i);
+                    "Got unexpected scissor rect %s in slot %u.\n",
+                    wine_dbgstr_rect(&tmp_rect[i]), i);
         else
             ok(!tmp_rect[i].left && !tmp_rect[i].top && !tmp_rect[i].right && !tmp_rect[i].bottom,
-                    "Got unexpected scissor rect {%d, %d, %d, %d} in slot %u.\n",
-                    tmp_rect[i].left, tmp_rect[i].top, tmp_rect[i].right, tmp_rect[i].bottom, i);
+                    "Got unexpected scissor rect %s in slot %u.\n",
+                    wine_dbgstr_rect(&tmp_rect[i]), i);
     }
     ID3D10Device_RSGetViewports(device, &count, NULL);
     todo_wine ok(!count, "Got unexpected viewport count %u.\n", count);




More information about the wine-cvs mailing list