Henri Verbeet : wined3d: Simplify context_apply_fbo_state_blit().
Alexandre Julliard
julliard at winehq.org
Fri Aug 26 10:40:47 CDT 2011
Module: wine
Branch: master
Commit: 98277e1fc6896348d1becded9a809d5b6a3b18b0
URL: http://source.winehq.org/git/wine.git/?a=commit;h=98277e1fc6896348d1becded9a809d5b6a3b18b0
Author: Henri Verbeet <hverbeet at codeweavers.com>
Date: Thu Aug 25 21:04:55 2011 +0200
wined3d: Simplify context_apply_fbo_state_blit().
---
dlls/wined3d/context.c | 17 ++++++-----------
1 files changed, 6 insertions(+), 11 deletions(-)
diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c
index 797eb73..33b07ce 100644
--- a/dlls/wined3d/context.c
+++ b/dlls/wined3d/context.c
@@ -431,17 +431,12 @@ static void context_apply_fbo_state(struct wined3d_context *context, GLenum targ
void context_apply_fbo_state_blit(struct wined3d_context *context, GLenum target,
struct wined3d_surface *render_target, struct wined3d_surface *depth_stencil, DWORD location)
{
- if (location != SFLAG_INDRAWABLE || surface_is_offscreen(render_target))
- {
- UINT clear_size = (context->gl_info->limits.buffers - 1) * sizeof(*context->blit_targets);
- context->blit_targets[0] = render_target;
- if (clear_size) memset(&context->blit_targets[1], 0, clear_size);
- context_apply_fbo_state(context, target, context->blit_targets, depth_stencil, location);
- }
- else
- {
- context_apply_fbo_state(context, target, NULL, NULL, location);
- }
+ UINT clear_size = (context->gl_info->limits.buffers - 1) * sizeof(*context->blit_targets);
+
+ context->blit_targets[0] = render_target;
+ if (clear_size)
+ memset(&context->blit_targets[1], 0, clear_size);
+ context_apply_fbo_state(context, target, context->blit_targets, depth_stencil, location);
}
/* Context activation is done by the caller. */
More information about the wine-cvs
mailing list