Alexander Dorofeyev : wined3d: Fix regression of colorfill and texture to swapchain codepaths in BltOverride .

[Alexandre Julliard]

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

Author: Alexander Dorofeyev <alexd4(a)inbox.lv>
Date:   Sun Dec 30 18:04:27 2007 -0800

wined3d: Fix regression of colorfill and texture to swapchain codepaths in BltOverride.

---

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

diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c
index 24cc14d..489f72e 100644
--- a/dlls/wined3d/surface.c
+++ b/dlls/wined3d/surface.c
@@ -2972,12 +2972,10 @@ static HRESULT IWineD3DSurfaceImpl_BltOverride(IWineD3DSurfaceImpl *This, RECT *
         FIXME("Implement hardware blit between two different swapchains\n");
         return WINED3DERR_INVALIDCALL;
     } else if(dstSwapchain) {
-        if(SrcSurface != myDevice->render_targets[0]) {
-            ERR("Unexpected render target -> render target blit\n");
-            return 0;
+        if(SrcSurface == myDevice->render_targets[0]) {
+            TRACE("Blit from active render target to a swapchain\n");
+            /* Handled with regular texture -> swapchain blit */
         }
-        TRACE("Blit from active render target to a swapchain\n");
-        /* Handled with regular texture -> swapchain blit */
     } else if(srcSwapchain && This == (IWineD3DSurfaceImpl *) myDevice->render_targets[0]) {
         FIXME("Implement blit from a swapchain to the active render target\n");
         return WINED3DERR_INVALIDCALL;