Henri Verbeet : wined3d: Bind the system framebuffer based on the actual location in context_apply_fbo_state ().

Alexandre Julliard julliard at winehq.org
Thu Aug 25 13:00:12 CDT 2011


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

Author: Henri Verbeet <hverbeet at codeweavers.com>
Date:   Wed Aug 24 22:08:47 2011 +0200

wined3d: Bind the system framebuffer based on the actual location in context_apply_fbo_state().

We can do this now because SFLAG_INDRAWABLE is no longer ambiguous.

---

 dlls/wined3d/context.c |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c
index e13af5f..95ec3ea 100644
--- a/dlls/wined3d/context.c
+++ b/dlls/wined3d/context.c
@@ -415,15 +415,15 @@ static void context_apply_fbo_state(struct wined3d_context *context, GLenum targ
         context->rebind_fbo = FALSE;
     }
 
-    if (render_targets)
+    if (location == SFLAG_INDRAWABLE)
     {
-        context->current_fbo = context_find_fbo_entry(context, target, render_targets, depth_stencil, location);
-        context_apply_fbo_entry(context, target, context->current_fbo);
+        context->current_fbo = NULL;
+        context_bind_fbo(context, target, NULL);
     }
     else
     {
-        context->current_fbo = NULL;
-        context_bind_fbo(context, target, NULL);
+        context->current_fbo = context_find_fbo_entry(context, target, render_targets, depth_stencil, location);
+        context_apply_fbo_entry(context, target, context->current_fbo);
     }
 }
 




More information about the wine-cvs mailing list