wine/vkd3d
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/vkd3d.git synced 2025-09-12 18:50:22 -07:00
Code Issues Packages Projects Releases Wiki Activity

tests: Remove NULL rect handling from d3d11_runner_probe_vec4().

Browse Source 
Signed-off-by: Zebediah Figura <zfigura@codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Zebediah Figura
2022-03-19 12:35:35 -05:00
committed by Alexandre Julliard
parent 099df706f0
commit 71db328d38
1 changed files with 2 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
tests/shader_runner_d3d11.c
View File

@@ -494,8 +494,6 @@ static void d3d11_runner_draw_quad(struct shader_runner *r)
struct resource_readback struct resource_readback
{ {
uint64_t width;
unsigned int height;
ID3D11Resource *resource; ID3D11Resource *resource;
D3D11_MAPPED_SUBRESOURCE map_desc; D3D11_MAPPED_SUBRESOURCE map_desc;
}; };
@@ -516,9 +514,6 @@ static void init_readback(struct d3d11_shader_runner *runner, struct resource_re
ID3D11DeviceContext_CopyResource(runner->immediate_context, rb->resource, (ID3D11Resource *)runner->rt); ID3D11DeviceContext_CopyResource(runner->immediate_context, rb->resource, (ID3D11Resource *)runner->rt);
hr = ID3D11DeviceContext_Map(runner->immediate_context, rb->resource, 0, D3D11_MAP_READ, 0, &rb->map_desc); hr = ID3D11DeviceContext_Map(runner->immediate_context, rb->resource, 0, D3D11_MAP_READ, 0, &rb->map_desc);
ok(hr == S_OK, "Failed to map texture, hr %#lx.\n", hr); ok(hr == S_OK, "Failed to map texture, hr %#lx.\n", hr);
rb->width = texture_desc.Width;
rb->height = texture_desc.Height;
} }
static void release_readback(struct d3d11_shader_runner *runner, struct resource_readback *rb) static void release_readback(struct d3d11_shader_runner *runner, struct resource_readback *rb)
@@ -535,17 +530,13 @@ static const struct vec4 *get_readback_vec4(struct resource_readback *rb, unsign
static void check_readback_data_vec4(struct resource_readback *rb, static void check_readback_data_vec4(struct resource_readback *rb,
const RECT *rect, const struct vec4 *expected, unsigned int max_diff) const RECT *rect, const struct vec4 *expected, unsigned int max_diff)
{ {
RECT r = {0, 0, rb->width, rb->height};
unsigned int x = 0, y = 0; unsigned int x = 0, y = 0;
struct vec4 got = {0}; struct vec4 got = {0};
bool all_match = true; bool all_match = true;
if (rect) for (y = rect->top; y < rect->bottom; ++y)
r = *rect;
for (y = r.top; y < r.bottom; ++y)
{ {
for (x = r.left; x < r.right; ++x) for (x = rect->left; x < rect->right; ++x)
{ {
got = *get_readback_vec4(rb, x, y); got = *get_readback_vec4(rb, x, y);
if (!compare_vec4(&got, expected, max_diff)) if (!compare_vec4(&got, expected, max_diff))