Matteo Bruni : wined3d: Setup target if offscreen rendering setting changed .

[Alexandre Julliard]

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

Author: Matteo Bruni 
Date:   Mon Jun 28 21:13:56 2010 +0200

wined3d: Setup target if offscreen rendering setting changed.

---

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

diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c
index 949e137..2ddb02b 100644
--- a/dlls/wined3d/context.c
+++ b/dlls/wined3d/context.c
@@ -2242,8 +2242,8 @@ static void context_setup_target(IWineD3DDeviceImpl *device,
     const struct StateEntry *StateTable = device->StateTable;

if (!target) return;
-    else if (context->current_rt == target) return;
     render_offscreen = surface_is_offscreen(target);
+    if (context->current_rt == target && render_offscreen == old_render_offscreen) return;

context_set_render_offscreen(context, StateTable, render_offscreen);

diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c
index 6f99dc1..2245f0c 100644
--- a/dlls/wined3d/swapchain.c
+++ b/dlls/wined3d/swapchain.c
@@ -334,9 +334,6 @@ static HRESULT WINAPI IWineD3DSwapChainImpl_Present(IWineD3DSwapChain *iface, CO
         surface_load_location(This->back_buffers[0], SFLAG_INTEXTURE, NULL);
         surface_modify_location(This->back_buffers[0], SFLAG_INDRAWABLE, FALSE);
         This->render_to_fbo = TRUE;
-
-        /* Force the context manager to update the render target configuration next draw. */
-        context->current_rt = NULL;
     }

if(This->render_to_fbo)