Henri Verbeet : wined3d: Simplify the render target check in ffp_blitter_clear().
Alexandre Julliard
julliard at winehq.org
Mon Jul 17 15:37:19 CDT 2017
Module: wine
Branch: master
Commit: b8e0af67f5443bf123667fb91798b68c251deb94
URL: http://source.winehq.org/git/wine.git/?a=commit;h=b8e0af67f5443bf123667fb91798b68c251deb94
Author: Henri Verbeet <hverbeet at codeweavers.com>
Date: Mon Jul 17 14:01:38 2017 +0200
wined3d: Simplify the render target check in ffp_blitter_clear().
Signed-off-by: Henri Verbeet <hverbeet at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
dlls/wined3d/surface.c | 18 ++++--------------
1 file changed, 4 insertions(+), 14 deletions(-)
diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c
index d000e5c..632a42b 100644
--- a/dlls/wined3d/surface.c
+++ b/dlls/wined3d/surface.c
@@ -2569,7 +2569,6 @@ static void ffp_blitter_clear(struct wined3d_blitter *blitter, struct wined3d_de
const RECT *draw_rect, DWORD flags, const struct wined3d_color *colour, float depth, DWORD stencil)
{
struct wined3d_rendertarget_view *view;
- struct wined3d_resource *resource;
struct wined3d_blitter *next;
unsigned int i;
@@ -2580,22 +2579,13 @@ static void ffp_blitter_clear(struct wined3d_blitter *blitter, struct wined3d_de
if (!(view = fb->render_targets[i]))
continue;
- resource = view->resource;
- if (!(flags & (WINED3DCLEAR_ZBUFFER | WINED3DCLEAR_STENCIL))
+ if ((!(flags & (WINED3DCLEAR_ZBUFFER | WINED3DCLEAR_STENCIL))
&& ffp_blitter_use_cpu_clear(view))
+ || (!(view->resource->usage & WINED3DUSAGE_RENDERTARGET)
+ && (wined3d_settings.offscreen_rendering_mode != ORM_FBO
+ || !(view->format_flags & WINED3DFMT_FLAG_FBO_ATTACHABLE))))
goto next;
- if (wined3d_settings.offscreen_rendering_mode == ORM_FBO)
- {
- if (!((view->format_flags & WINED3DFMT_FLAG_FBO_ATTACHABLE)
- || (resource->usage & WINED3DUSAGE_RENDERTARGET)))
- goto next;
- }
- else if (!(resource->usage & WINED3DUSAGE_RENDERTARGET))
- {
- goto next;
- }
-
/* FIXME: We should reject colour fills on formats with fixups,
* but this would break P8 colour fills for example. */
}
More information about the wine-cvs
mailing list