[PATCH 1/5] wined3d: Avoid duplicated code in wined3d_surface_blt (try 2).
Stefan Dösinger
stefan at codeweavers.com
Mon Oct 7 17:27:06 CDT 2013
Try 2: Also replace a similar call in the SFLAG_INSYSMEM optimization
path.
---
dlls/wined3d/surface.c | 4 ++--
1 file 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)
--
1.8.1.5
More information about the wine-patches
mailing list