Vitaliy Margolen : wined3d: Activate context before applying fbo state.

Alexandre Julliard julliard at wine.codeweavers.com
Tue Aug 14 07:12:53 CDT 2007


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

Author: Vitaliy Margolen <wine-patches at kievinfo.com>
Date:   Mon Aug 13 08:11:21 2007 -0600

wined3d: Activate context before applying fbo state.

---

 dlls/wined3d/device.c |    7 ++-----
 1 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c
index 11679af..bc936b6 100644
--- a/dlls/wined3d/device.c
+++ b/dlls/wined3d/device.c
@@ -4415,16 +4415,13 @@ static HRESULT WINAPI IWineD3DDeviceImpl_Clear(IWineD3DDevice *iface, DWORD Coun
     /* This is for offscreen rendering as well as for multithreading, thus activate the set render target
      * and not the last active one.
      */
+    ActivateContext(This, This->render_targets[0], CTXUSAGE_CLEAR);
+    ENTER_GL();
 
     if (wined3d_settings.offscreen_rendering_mode == ORM_FBO) {
-        ENTER_GL();
         apply_fbo_state(iface);
-        LEAVE_GL();
     }
 
-    ActivateContext(This, This->render_targets[0], CTXUSAGE_CLEAR);
-    ENTER_GL();
-
     if (Count > 0 && pRects) {
         curRect = pRects;
     } else {




More information about the wine-cvs mailing list