Matteo Bruni : wined3d: Clean up fallback paths in wined3d_surface_blt().
Module: wine Branch: master Commit: b3bf2c4f26d2b3aeadc784c86bceced3465fc8ab URL: https://source.winehq.org/git/wine.git/?a=commit;h=b3bf2c4f26d2b3aeadc784c86... Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Tue Aug 13 22:02:11 2019 +0200 wined3d: Clean up fallback paths in wined3d_surface_blt(). Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/surface.c | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 99ee1a4..23dc229 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -2939,14 +2939,14 @@ HRESULT texture2d_blt(struct wined3d_texture *dst_texture, unsigned int dst_sub_ if (!device->d3d_initialized) { - WARN("D3D not initialized, using fallback.\n"); + WARN("D3D not initialized, using CPU blit fallback.\n"); goto cpu; } if (flags & ~simple_blit) { - WARN_(d3d_perf)("Using fallback for complex blit (%#x).\n", flags); - goto fallback; + WARN_(d3d_perf)("Using CPU fallback for complex blit (%#x).\n", flags); + goto cpu; } src_swapchain = src_texture->swapchain; @@ -2960,7 +2960,9 @@ HRESULT texture2d_blt(struct wined3d_texture *dst_texture, unsigned int dst_sub_ if (src_swapchain && dst_swapchain && src_swapchain != dst_swapchain) { FIXME("Using fallback for cross-swapchain blit.\n"); - goto fallback; + if (SUCCEEDED(wined3d_texture_blt_special(dst_texture, dst_sub_resource_idx, &dst_rect, + src_texture, src_sub_resource_idx, &src_rect, flags, fx, filter))) + return WINED3D_OK; } scale = src_box->right - src_box->left != dst_box->right - dst_box->left @@ -3121,12 +3123,6 @@ HRESULT texture2d_blt(struct wined3d_texture *dst_texture, unsigned int dst_sub_ return WINED3D_OK; -fallback: - /* Special cases for render targets. */ - if (SUCCEEDED(wined3d_texture_blt_special(dst_texture, dst_sub_resource_idx, &dst_rect, - src_texture, src_sub_resource_idx, &src_rect, flags, fx, filter))) - return WINED3D_OK; - cpu: return surface_cpu_blt(dst_texture, dst_sub_resource_idx, dst_box, src_texture, src_sub_resource_idx, src_box, flags, fx, filter);
participants (1)
-
Alexandre Julliard