Henri Verbeet : d3d11/tests: Introduce and use check_readback_data_u24.
Alexandre Julliard
julliard at winehq.org
Tue Apr 2 16:09:59 CDT 2019
Module: wine
Branch: master
Commit: 7bca617c6a91be96dc4e58b615393f0845eadfd8
URL: https://source.winehq.org/git/wine.git/?a=commit;h=7bca617c6a91be96dc4e58b615393f0845eadfd8
Author: Henri Verbeet <hverbeet at codeweavers.com>
Date: Tue Apr 2 21:30:47 2019 +0430
d3d11/tests: Introduce and use check_readback_data_u24.
Signed-off-by: Henri Verbeet <hverbeet at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
dlls/d3d11/tests/d3d11.c | 58 +++++++++++++++++++++++++++++++++++-------------
1 file changed, 43 insertions(+), 15 deletions(-)
diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c
index 6f43848..90bcbae 100644
--- a/dlls/d3d11/tests/d3d11.c
+++ b/dlls/d3d11/tests/d3d11.c
@@ -946,11 +946,16 @@ static WORD get_readback_u16(struct resource_readback *rb, unsigned int x, unsig
return *(WORD *)get_readback_data(rb, x, y, z, sizeof(WORD));
}
-static DWORD get_readback_color(struct resource_readback *rb, unsigned int x, unsigned int y, unsigned int z)
+static DWORD get_readback_u32(struct resource_readback *rb, unsigned int x, unsigned int y, unsigned int z)
{
return *(DWORD *)get_readback_data(rb, x, y, z, sizeof(DWORD));
}
+static DWORD get_readback_color(struct resource_readback *rb, unsigned int x, unsigned int y, unsigned int z)
+{
+ return get_readback_u32(rb, x, y, z);
+}
+
static float get_readback_float(struct resource_readback *rb, unsigned int x, unsigned int y)
{
return *(float *)get_readback_data(rb, x, y, 0, sizeof(float));
@@ -1055,6 +1060,41 @@ done:
value, expected_value, x, y, z, rb->sub_resource_idx);
}
+#define check_readback_data_u24(a, b, c, d, e) check_readback_data_u24_(__LINE__, a, b, c, d, e)
+static void check_readback_data_u24_(unsigned int line, struct resource_readback *rb,
+ const RECT *rect, unsigned int shift, DWORD expected_value, BYTE max_diff)
+{
+ unsigned int x = 0, y = 0, z = 0;
+ BOOL all_match = FALSE;
+ RECT default_rect;
+ DWORD value = 0;
+
+ if (!rect)
+ {
+ SetRect(&default_rect, 0, 0, rb->width, rb->height);
+ rect = &default_rect;
+ }
+
+ for (z = 0; z < rb->depth; ++z)
+ {
+ for (y = rect->top; y < rect->bottom; ++y)
+ {
+ for (x = rect->left; x < rect->right; ++x)
+ {
+ value = get_readback_u32(rb, x, y, z) >> shift;
+ if (abs((int)value - (int)expected_value) > max_diff)
+ goto done;
+ }
+ }
+ }
+ all_match = TRUE;
+
+done:
+ ok_(__FILE__, line)(all_match,
+ "Got 0x%06x, expected 0x%06x at (%u, %u, %u), sub-resource %u.\n",
+ value, expected_value, x, y, z, rb->sub_resource_idx);
+}
+
#define check_readback_data_color(a, b, c, d) check_readback_data_color_(__LINE__, a, b, c, d)
static void check_readback_data_color_(unsigned int line, struct resource_readback *rb,
const RECT *rect, DWORD expected_color, BYTE max_diff)
@@ -25446,10 +25486,10 @@ static void test_depth_bias(void)
struct resource_readback rb;
ID3D11DepthStencilView *dsv;
unsigned int expected_value;
- unsigned int x, y, i, j, k;
ID3D11RasterizerState *rs;
ID3D11Texture2D *texture;
unsigned int format_idx;
+ unsigned int y, i, j, k;
unsigned int shift = 0;
ID3D11Device *device;
float *depth_values;
@@ -25590,19 +25630,7 @@ static void test_depth_bias(void)
depth = min(max(0.0f, quads[i].z + bias), 1.0f);
get_texture_readback(texture, 0, &rb);
- for (y = 0; y < texture_desc.Height; ++y)
- {
- expected_value = depth * 16777215.0f + 0.5f;
- for (x = 0; x < texture_desc.Width; ++x)
- {
- u32 = get_readback_data(&rb, x, y, 0, sizeof(*u32));
- u32_value = *u32 >> shift;
- ok(abs(u32_value - expected_value) <= 1,
- "Got value %#x (%.8e), expected %#x (%.8e).\n",
- u32_value, u32_value / 16777215.0f,
- expected_value, expected_value / 16777215.0f);
- }
- }
+ check_readback_data_u24(&rb, NULL, shift, depth * 16777215.0f + 0.5f, 1);
release_resource_readback(&rb);
break;
case DXGI_FORMAT_D16_UNORM:
More information about the wine-cvs
mailing list