Michael Stefaniuc : d3d10core/tests: Make use of todo_wine_if().
Alexandre Julliard
julliard at winehq.org
Fri Aug 5 16:20:07 CDT 2016
Module: wine
Branch: master
Commit: e75df0210465f483521489717bf5bc9ae80f2fea
URL: http://source.winehq.org/git/wine.git/?a=commit;h=e75df0210465f483521489717bf5bc9ae80f2fea
Author: Michael Stefaniuc <mstefani at redhat.de>
Date: Thu Aug 4 23:42:03 2016 +0200
d3d10core/tests: Make use of todo_wine_if().
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, 2 insertions(+), 12 deletions(-)
diff --git a/dlls/d3d10core/tests/device.c b/dlls/d3d10core/tests/device.c
index f3c4ac8..e574005 100644
--- a/dlls/d3d10core/tests/device.c
+++ b/dlls/d3d10core/tests/device.c
@@ -4648,11 +4648,7 @@ float4 main(float4 color : COLOR) : SV_TARGET
ID3D10Device_RSGetScissorRects(device, &count, tmp_rect);
for (i = 0; i < D3D10_VIEWPORT_AND_SCISSORRECT_OBJECT_COUNT_PER_PIPELINE; ++i)
{
- 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 %s in slot %u.\n",
- wine_dbgstr_rect(&tmp_rect[i]), i);
- else
+ todo_wine_if(!i)
ok(!tmp_rect[i].left && !tmp_rect[i].top && !tmp_rect[i].right && !tmp_rect[i].bottom,
"Got unexpected scissor rect %s in slot %u.\n",
wine_dbgstr_rect(&tmp_rect[i]), i);
@@ -4664,13 +4660,7 @@ float4 main(float4 color : COLOR) : SV_TARGET
ID3D10Device_RSGetViewports(device, &count, tmp_viewport);
for (i = 0; i < D3D10_VIEWPORT_AND_SCISSORRECT_OBJECT_COUNT_PER_PIPELINE; ++i)
{
- if (!i)
- todo_wine ok(!tmp_viewport[i].TopLeftX && !tmp_viewport[i].TopLeftY && !tmp_viewport[i].Width
- && !tmp_viewport[i].Height && !tmp_viewport[i].MinDepth && !tmp_viewport[i].MaxDepth,
- "Got unexpected viewport {%d, %d, %u, %u, %.8e, %.8e} in slot %u.\n",
- tmp_viewport[i].TopLeftX, tmp_viewport[i].TopLeftY, tmp_viewport[i].Width,
- tmp_viewport[i].Height, tmp_viewport[i].MinDepth, tmp_viewport[i].MaxDepth, i);
- else
+ todo_wine_if(!i)
ok(!tmp_viewport[i].TopLeftX && !tmp_viewport[i].TopLeftY && !tmp_viewport[i].Width
&& !tmp_viewport[i].Height && !tmp_viewport[i].MinDepth && !tmp_viewport[i].MaxDepth,
"Got unexpected viewport {%d, %d, %u, %u, %.8e, %.8e} in slot %u.\n",
More information about the wine-cvs
mailing list