Stefan Dösinger : wined3d: Fix a problem in BltOverride.

Alexandre Julliard julliard at winehq.org
Thu Dec 27 08:31:29 CST 2007


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

Author: Stefan Dösinger <stefan at codeweavers.com>
Date:   Tue Dec 25 22:57:01 2007 +0100

wined3d: Fix a problem in BltOverride.

---

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

diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c
index 30d6507..f9df55e 100644
--- a/dlls/wined3d/surface.c
+++ b/dlls/wined3d/surface.c
@@ -2974,13 +2974,11 @@ static HRESULT IWineD3DSurfaceImpl_BltOverride(IWineD3DSurfaceImpl *This, RECT *
     } else if(dstSwapchain) {
         if(SrcSurface != myDevice->render_targets[0]) {
             ERR("Unexpected render target -> render target blit\n");
+            return 0;
         }
         TRACE("Blit from active render target to a swapchain\n");
         /* Handled with regular texture -> swapchain blit */
-    } else if(srcSwapchain) {
-        if(This != (IWineD3DSurfaceImpl *) myDevice->render_targets[0]) {
-            ERR("Unexpected render target -> render target blit\n");
-        }
+    } else if(srcSwapchain && This == (IWineD3DSurfaceImpl *) myDevice->render_targets[0]) {
         FIXME("Implement blit from a swapchain to the active render target\n");
         return WINED3DERR_INVALIDCALL;
     }




More information about the wine-cvs mailing list