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

wined3d: Allow copying between different texture types. 

Signed-off-by: Józef Kucia <jkucia@codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Józef Kucia 2018-08-15 11:09:51 +02:00 committed by Alexandre Julliard
parent 64be197458
commit 2aa5b0011a
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
dlls/wined3d/device.c
View File

@ -4090,14 +4090,6 @@ HRESULT CDECL wined3d_device_copy_sub_resource_region(struct wined3d_device *dev
return WINED3DERR_INVALIDCALL; return WINED3DERR_INVALIDCALL;
} }
if (src_resource->type != dst_resource->type)
{
WARN("Resource types (%s / %s) don't match.\n",
debug_d3dresourcetype(dst_resource->type),
debug_d3dresourcetype(src_resource->type));
return WINED3DERR_INVALIDCALL;
}
if (src_resource->format->typeless_id != dst_resource->format->typeless_id if (src_resource->format->typeless_id != dst_resource->format->typeless_id
|| (!src_resource->format->typeless_id && src_resource->format->id != dst_resource->format->id)) || (!src_resource->format->typeless_id && src_resource->format->id != dst_resource->format->id))
{ {
@ -4109,6 +4101,14 @@ HRESULT CDECL wined3d_device_copy_sub_resource_region(struct wined3d_device *dev
if (dst_resource->type == WINED3D_RTYPE_BUFFER) if (dst_resource->type == WINED3D_RTYPE_BUFFER)
{ {
if (src_resource->type != WINED3D_RTYPE_BUFFER)
{
WARN("Resource types (%s / %s) don't match.\n",
debug_d3dresourcetype(dst_resource->type),
debug_d3dresourcetype(src_resource->type));
return WINED3DERR_INVALIDCALL;
}
if (dst_sub_resource_idx) if (dst_sub_resource_idx)
{ {
WARN("Invalid dst_sub_resource_idx %u.\n", dst_sub_resource_idx); WARN("Invalid dst_sub_resource_idx %u.\n", dst_sub_resource_idx);