ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

wined3d: Construct a separate source box in wined3d_device_copy_resource(). 

Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Henri Verbeet 2021-02-10 00:24:05 +01:00 committed by Alexandre Julliard
parent 1039bf036f
commit fb9ec02e06
2 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
dlls/d3d11/tests/d3d11.c
View File

@ -28205,10 +28205,8 @@ static void test_compressed_format_compatibility(const D3D_FEATURE_LEVEL feature
expected = texture_data[k]; expected = texture_data[k];
else else
expected = initial_data[k]; expected = initial_data[k];
todo_wine_if(supported && (dst_format->block_edge != 1 ok(colour == expected, "%#x -> %#x: Got unexpected colour 0x%08x at %u, expected 0x%08x.\n",
|| k >= src_format->block_size / (sizeof(colour)))) src_format->id, dst_format->id, colour, k, expected);
ok(colour == expected, "%#x -> %#x: Got unexpected colour 0x%08x at %u, expected 0x%08x.\n",
src_format->id, dst_format->id, colour, k, expected);
if (colour != expected) if (colour != expected)
break; break;
} }

15
dlls/wined3d/device.c
View File

@ -4544,7 +4544,7 @@ void CDECL wined3d_device_copy_resource(struct wined3d_device *device,
unsigned int src_row_block_count, dst_row_block_count; unsigned int src_row_block_count, dst_row_block_count;
struct wined3d_texture *dst_texture, *src_texture; struct wined3d_texture *dst_texture, *src_texture;
unsigned int src_row_count, dst_row_count; unsigned int src_row_count, dst_row_count;
struct wined3d_box box; struct wined3d_box src_box, dst_box;
unsigned int i, j; unsigned int i, j;
TRACE("device %p, dst_resource %p, src_resource %p.\n", device, dst_resource, src_resource); TRACE("device %p, dst_resource %p, src_resource %p.\n", device, dst_resource, src_resource);
@ -4591,9 +4591,9 @@ void CDECL wined3d_device_copy_resource(struct wined3d_device *device,
if (dst_resource->type == WINED3D_RTYPE_BUFFER) if (dst_resource->type == WINED3D_RTYPE_BUFFER)
{ {
wined3d_box_set(&box, 0, 0, src_resource->size, 1, 0, 1); wined3d_box_set(&src_box, 0, 0, src_resource->size, 1, 0, 1);
wined3d_cs_emit_blt_sub_resource(device->cs, dst_resource, 0, &box, wined3d_cs_emit_blt_sub_resource(device->cs, dst_resource, 0, &src_box,
src_resource, 0, &box, WINED3D_BLT_RAW, NULL, WINED3D_TEXF_POINT); src_resource, 0, &src_box, WINED3D_BLT_RAW, NULL, WINED3D_TEXF_POINT);
return; return;
} }
@ -4611,13 +4611,14 @@ void CDECL wined3d_device_copy_resource(struct wined3d_device *device,
for (i = 0; i < dst_texture->level_count; ++i) for (i = 0; i < dst_texture->level_count; ++i)
{ {
wined3d_texture_get_level_box(dst_texture, i, &box); wined3d_texture_get_level_box(src_texture, i, &src_box);
wined3d_texture_get_level_box(dst_texture, i, &dst_box);
for (j = 0; j < dst_texture->layer_count; ++j) for (j = 0; j < dst_texture->layer_count; ++j)
{ {
unsigned int idx = j * dst_texture->level_count + i; unsigned int idx = j * dst_texture->level_count + i;
wined3d_cs_emit_blt_sub_resource(device->cs, dst_resource, idx, &box, wined3d_cs_emit_blt_sub_resource(device->cs, dst_resource, idx, &dst_box,
src_resource, idx, &box, WINED3D_BLT_RAW, NULL, WINED3D_TEXF_POINT); src_resource, idx, &src_box, WINED3D_BLT_RAW, NULL, WINED3D_TEXF_POINT);
} }
} }
} }