Module: wine Branch: master Commit: ca26689b6e5fe3ccd720a84e0991ebd13c859946 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ca26689b6e5fe3ccd720a84e09...
Author: Henri Verbeet hverbeet@codeweavers.com Date: Wed Mar 30 21:30:16 2016 +0200
wined3d: Use the texture dimension helpers in is_full_clear().
Signed-off-by: Henri Verbeet hverbeet@codeweavers.com Signed-off-by: Alexandre Julliard julliard@winehq.org
---
dlls/wined3d/device.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index a9b9f0d..033bb58 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -216,16 +216,16 @@ void device_switch_onscreen_ds(struct wined3d_device *device,
static BOOL is_full_clear(const struct wined3d_surface *target, const RECT *draw_rect, const RECT *clear_rect) { + unsigned int height = wined3d_texture_get_level_height(target->container, target->texture_level); + unsigned int width = wined3d_texture_get_level_width(target->container, target->texture_level); + /* partial draw rect */ - if (draw_rect->left || draw_rect->top - || draw_rect->right < target->resource.width - || draw_rect->bottom < target->resource.height) + if (draw_rect->left || draw_rect->top || draw_rect->right < width || draw_rect->bottom < height) return FALSE;
/* partial clear rect */ if (clear_rect && (clear_rect->left > 0 || clear_rect->top > 0 - || clear_rect->right < target->resource.width - || clear_rect->bottom < target->resource.height)) + || clear_rect->right < width || clear_rect->bottom < height)) return FALSE;
return TRUE;