Józef Kucia : wined3d: Allow copies between compatible formats in wined3d_device_copy_resource() .
Module: wine Branch: master Commit: 61658f445b33da374d81c52ab81e2f4f81c378c6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=61658f445b33da374d81c52ab8... Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Nov 16 01:01:03 2017 +0330 wined3d: Allow copies between compatible formats in wined3d_device_copy_resource(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/device.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 342905c..1995a50 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4029,9 +4029,10 @@ void CDECL wined3d_device_copy_resource(struct wined3d_device *device, return; } - if (src_resource->format->id != dst_resource->format->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)) { - WARN("Resource formats (%s / %s) don't match.\n", + WARN("Resource formats %s and %s are incompatible.\n", debug_d3dformat(dst_resource->format->id), debug_d3dformat(src_resource->format->id)); return;
participants (1)
-
Alexandre Julliard