Henri Verbeet : wined3d: context_validate_onscreen_formats() may modify context->render_offscreen.

[Alexandre Julliard]

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

Author: Henri Verbeet <hverbeet(a)codeweavers.com>
Date:   Tue May 18 09:53:06 2010 +0200

wined3d: context_validate_onscreen_formats() may modify context->render_offscreen.

I merged this by accident in be43c867a5fd06dc6b9f5b686abb22a1e17a712e.

---

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

diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c
index d240686..ce20282 100644
--- a/dlls/wined3d/context.c
+++ b/dlls/wined3d/context.c
@@ -1992,6 +1992,8 @@ void context_apply_blit_state(struct wined3d_context *context, IWineD3DDeviceImp
 {
     if (wined3d_settings.offscreen_rendering_mode == ORM_FBO)
     {
+        if (!context->render_offscreen) context_validate_onscreen_formats(device, context);
+
         if (context->render_offscreen)
         {
             FIXME("Applying blit state for an offscreen target with ORM_FBO. This should be avoided.\n");
@@ -2003,8 +2005,6 @@ void context_apply_blit_state(struct wined3d_context *context, IWineD3DDeviceImp
         }
         else
         {
-            context_validate_onscreen_formats(device, context);
-
             ENTER_GL();
             context_bind_fbo(context, GL_FRAMEBUFFER, NULL);
             LEAVE_GL();
@@ -2077,9 +2077,10 @@ void context_apply_draw_state(struct wined3d_context *context, IWineD3DDeviceImp
 
     if (wined3d_settings.offscreen_rendering_mode == ORM_FBO)
     {
+        if (!context->render_offscreen) context_validate_onscreen_formats(device, context);
+
         if (!context->render_offscreen)
         {
-            context_validate_onscreen_formats(device, context);
             ENTER_GL();
             context_apply_fbo_state(context, GL_FRAMEBUFFER, NULL, NULL);
             LEAVE_GL();