Skip to content

W
wine-cw
Commit 7551f01b authored by Henri Verbeet's avatar Henri Verbeet Committed by Alexandre Julliard
Browse files
Options

wined3d: Do not take "draw_rect" into account when comparing attachment sizes in…

wined3d: Do not take "draw_rect" into account when comparing attachment sizes in ffp_blitter_clear(). The scissor rectangle and viewport shouldn't affect whether attachment sizes are equal. The Intel i965 driver will do a fast clear when the scissor rectangle overlaps the intersection of the attachments, and that behaviour is allowed by the OpenGL spec. This commit fixes failures in the d3d8 and d3d9 depth_buffer_test() tests on the Intel i965 driver. See also commit 0530f33c. Signed-off-by: 's avatarHenri Verbeet <hverbeet@codeweavers.com> Signed-off-by: 's avatarAlexandre Julliard <julliard@winehq.org>
parent 6202cf45
Hide whitespace changes
Inline Side-by-side
Showing with 6 additions and 13 deletions
dlls/wined3d/surface.c
View file @ 7551f01b
......@@ -2052,12 +2052,11 @@ static void ffp_blitter_clear(struct wined3d_blitter *blitter, struct wined3d_de
unsigned int rt_count, const struct wined3d_fb_state *fb, unsigned int rect_count, const RECT *clear_rects,
const RECT *draw_rect, DWORD flags, const struct wined3d_color *colour, float depth, DWORD stencil)
{
BOOL have_previous_rect = FALSE, have_identical_size = TRUE;
struct wined3d_rendertarget_view *view;
struct wined3d_rendertarget_view *view, *previous = NULL;
BOOL have_identical_size = TRUE;
struct wined3d_fb_state tmp_fb;
unsigned int next_rt_count = 0;
struct wined3d_blitter *next;
RECT previous_rect, rect;
DWORD next_flags = 0;
unsigned int i;
......@@ -2101,23 +2100,17 @@ static void ffp_blitter_clear(struct wined3d_blitter *blitter, struct wined3d_de
if (!(view = fb->render_targets[i]))
continue;
SetRect(&rect, 0, 0, view->width, view->height);
IntersectRect(&rect, draw_rect, &rect);
if (have_previous_rect && !EqualRect(&previous_rect, &rect))
if (previous && (previous->width != view->width || previous->height != view->height))
have_identical_size = FALSE;
previous_rect = rect;
have_previous_rect = TRUE;
previous = view;
}
if (flags & (WINED3DCLEAR_ZBUFFER | WINED3DCLEAR_STENCIL))
{
view = fb->depth_stencil;
SetRect(&rect, 0, 0, view->width, view->height);
IntersectRect(&rect, draw_rect, &rect);
if (have_previous_rect && !EqualRect(&previous_rect, &rect))
if (previous && (previous->width != view->width || previous->height != view->height))
have_identical_size = FALSE;
previous_rect = rect;
have_previous_rect = TRUE;
previous = view;
}
if (have_identical_size)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment