[PATCH 4/5] d3d8/tests: Use the new readback helpers in test_pointsize().
Matteo Bruni
mbruni at codeweavers.com
Mon Oct 12 16:17:07 CDT 2015
Signed-off-by: Matteo Bruni <mbruni at codeweavers.com>
---
dlls/d3d8/tests/visual.c | 29 +++++++++++++++++------------
1 file changed, 17 insertions(+), 12 deletions(-)
diff --git a/dlls/d3d8/tests/visual.c b/dlls/d3d8/tests/visual.c
index 772fd96..2748445 100644
--- a/dlls/d3d8/tests/visual.c
+++ b/dlls/d3d8/tests/visual.c
@@ -7197,31 +7197,36 @@ static void test_pointsize(void)
}
else
{
- color = getPixelColor(device, 64 - size / 2 + 1, 64 - size / 2 + 1);
+ struct surface_readback rb;
+
+ get_rt_readback(rt, &rb);
+ color = get_readback_color(&rb, 64 - size / 2 + 1, 64 - size / 2 + 1);
ok(color_match(color, 0x00ff0000, 0),
"Got unexpected color 0x%08x (case %u, %u, size %u).\n", color, i, j, size);
- color = getPixelColor(device, 64 + size / 2 - 1, 64 - size / 2 + 1);
+ color = get_readback_color(&rb, 64 + size / 2 - 1, 64 - size / 2 + 1);
ok(color_match(color, 0x00ffff00, 0),
"Got unexpected color 0x%08x (case %u, %u, size %u).\n", color, i, j, size);
- color = getPixelColor(device, 64 - size / 2 + 1, 64 + size / 2 - 1);
+ color = get_readback_color(&rb, 64 - size / 2 + 1, 64 + size / 2 - 1);
ok(color_match(color, 0x00000000, 0),
"Got unexpected color 0x%08x (case %u, %u, size %u).\n", color, i, j, size);
- color = getPixelColor(device, 64 + size / 2 - 1, 64 + size / 2 - 1);
+ color = get_readback_color(&rb, 64 + size / 2 - 1, 64 + size / 2 - 1);
ok(color_match(color, 0x0000ff00, 0),
"Got unexpected color 0x%08x (case %u, %u, size %u).\n", color, i, j, size);
- color = getPixelColor(device, 64 - size / 2 - 1, 64 - size / 2 - 1);
- ok(color_match(color, 0x0000ffff, 0),
+ color = get_readback_color(&rb, 64 - size / 2 - 1, 64 - size / 2 - 1);
+ ok(color_match(color, 0xff00ffff, 0),
"Got unexpected color 0x%08x (case %u, %u, size %u).\n", color, i, j, size);
- color = getPixelColor(device, 64 + size / 2 + 1, 64 - size / 2 - 1);
- ok(color_match(color, 0x0000ffff, 0),
+ color = get_readback_color(&rb, 64 + size / 2 + 1, 64 - size / 2 - 1);
+ ok(color_match(color, 0xff00ffff, 0),
"Got unexpected color 0x%08x (case %u, %u, size %u).\n", color, i, j, size);
- color = getPixelColor(device, 64 - size / 2 - 1, 64 + size / 2 + 1);
- ok(color_match(color, 0x0000ffff, 0),
+ color = get_readback_color(&rb, 64 - size / 2 - 1, 64 + size / 2 + 1);
+ ok(color_match(color, 0xff00ffff, 0),
"Got unexpected color 0x%08x (case %u, %u, size %u).\n", color, i, j, size);
- color = getPixelColor(device, 64 + size / 2 + 1, 64 + size / 2 + 1);
- ok(color_match(color, 0x0000ffff, 0),
+ color = get_readback_color(&rb, 64 + size / 2 + 1, 64 + size / 2 + 1);
+ ok(color_match(color, 0xff00ffff, 0),
"Got unexpected color 0x%08x (case %u, %u, size %u).\n", color, i, j, size);
+
+ release_surface_readback(&rb);
}
}
IDirect3DDevice8_SetVertexShader(device, 0);
--
2.4.9
More information about the wine-patches
mailing list