Matteo Bruni : wined3d: Don' t take the upload path for blits to formats requiring conversion.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: a55d384264fae9741ed3eb901bafe6ff19c75a52
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=a55d384264fae9741ed3eb901b...

Author: Matteo Bruni <mbruni(a)codeweavers.com>
Date:   Wed Sep  6 01:39:19 2017 +0200

wined3d: Don't take the upload path for blits to formats requiring conversion.

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 | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c
index 11438c4..608447f 100644
--- a/dlls/wined3d/surface.c
+++ b/dlls/wined3d/surface.c
@@ -3716,6 +3716,8 @@ HRESULT wined3d_surface_blt(struct wined3d_surface *dst_surface, const RECT *dst
             TRACE("Not doing upload because of scaling.\n");
         else if (convert)
             TRACE("Not doing upload because of format conversion.\n");
+        else if (dst_texture->resource.format->convert)
+            TRACE("Not doing upload because the destination format needs conversion.\n");
         else
         {
             POINT dst_point = {dst_rect->left, dst_rect->top};