[PATCH 3/5] wined3d: Get rid of some redundant else statements in IWineD3DSurfaceImpl_BltOverride().

Henri Verbeet hverbeet at codeweavers.com
Thu Sep 1 13:20:55 CDT 2011


---
 dlls/wined3d/surface.c |   13 ++++++++++---
 1 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c
index 619bc92..b8ff92d 100644
--- a/dlls/wined3d/surface.c
+++ b/dlls/wined3d/surface.c
@@ -5411,14 +5411,21 @@ static HRESULT IWineD3DSurfaceImpl_BltOverride(struct wined3d_surface *dst_surfa
 
         TRACE("Unsupported blit between buffers on the same swapchain\n");
         return WINED3DERR_INVALIDCALL;
-    } else if(dstSwapchain && dstSwapchain == srcSwapchain) {
+    }
+
+    if (dstSwapchain && dstSwapchain == srcSwapchain)
+    {
         FIXME("Implement hardware blit between two surfaces on the same swapchain\n");
         return WINED3DERR_INVALIDCALL;
-    } else if(dstSwapchain && srcSwapchain) {
+    }
+
+    if (dstSwapchain && srcSwapchain)
+    {
         FIXME("Implement hardware blit between two different swapchains\n");
         return WINED3DERR_INVALIDCALL;
     }
-    else if (dstSwapchain)
+
+    if (dstSwapchain)
     {
         /* Handled with regular texture -> swapchain blit */
         if (src_surface == device->fb.render_targets[0])
-- 
1.7.3.4




More information about the wine-patches mailing list