=?UTF-8?Q?Stefan=20D=C3=B6singer=20?=: wined3d: Avoid duplicated code in wined3d_surface_blt.

Alexandre Julliard julliard at winehq.org
Tue Oct 8 15:41:07 CDT 2013


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

Author: Stefan Dösinger <stefan at codeweavers.com>
Date:   Tue Oct  8 00:27:06 2013 +0200

wined3d: Avoid duplicated code in wined3d_surface_blt.

---

 dlls/wined3d/surface.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c
index 9d7accd..cc5a7a5 100644
--- a/dlls/wined3d/surface.c
+++ b/dlls/wined3d/surface.c
@@ -6610,7 +6610,7 @@ HRESULT CDECL wined3d_surface_blt(struct wined3d_surface *dst_surface, const REC
     if (dst_surface->flags & SFLAG_CONVERTED)
     {
         WARN_(d3d_perf)("Converted surface, using CPU blit.\n");
-        return surface_cpu_blt(dst_surface, &dst_rect, src_surface, &src_rect, flags, fx, filter);
+        goto cpu;
     }
 
     if (flags & ~simple_blit)
@@ -6687,7 +6687,7 @@ HRESULT CDECL wined3d_surface_blt(struct wined3d_surface *dst_surface, const REC
             else if (convert)
                 TRACE("Not doing sysmem blit because of format conversion.\n");
             else
-                return surface_cpu_blt(dst_surface, &dst_rect, src_surface, &src_rect, flags, fx, filter);
+                goto cpu;
         }
 
         if (flags & WINEDDBLT_COLORFILL)




More information about the wine-cvs mailing list