marko10_000
/
wine-wine
forked from Mirrors/wine-wine
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

wined3d: Handle NULL rectangles in wined3d_swapchain_present(). 

Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
oldstable
Henri Verbeet 2016-03-17 16:30:04 +01:00 committed by Alexandre Julliard
parent 240912c59b
commit a2e5881de1
1 changed files with 25 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
dlls/wined3d/swapchain.c
View File

@ -135,6 +135,8 @@ void CDECL wined3d_swapchain_set_window(struct wined3d_swapchain *swapchain, HWN
HRESULT CDECL wined3d_swapchain_present(struct wined3d_swapchain *swapchain, HRESULT CDECL wined3d_swapchain_present(struct wined3d_swapchain *swapchain,
const RECT *src_rect, const RECT *dst_rect, HWND dst_window_override, DWORD flags) const RECT *src_rect, const RECT *dst_rect, HWND dst_window_override, DWORD flags)
{ {
RECT s, d;
TRACE("swapchain %p, src_rect %s, dst_rect %s, dst_window_override %p, flags %#x.\n", TRACE("swapchain %p, src_rect %s, dst_rect %s, dst_window_override %p, flags %#x.\n",
swapchain, wine_dbgstr_rect(src_rect), wine_dbgstr_rect(dst_rect), swapchain, wine_dbgstr_rect(src_rect), wine_dbgstr_rect(dst_rect),
dst_window_override, flags); dst_window_override, flags);
@ -148,6 +150,19 @@ HRESULT CDECL wined3d_swapchain_present(struct wined3d_swapchain *swapchain,
return WINED3DERR_INVALIDCALL; return WINED3DERR_INVALIDCALL;
} }
if (!src_rect)
{
SetRect(&s, 0, 0, swapchain->desc.backbuffer_width,
swapchain->desc.backbuffer_height);
src_rect = &s;
}
if (!dst_rect)
{
GetClientRect(swapchain->win_handle, &d);
dst_rect = &d;
}
wined3d_cs_emit_present(swapchain->device->cs, swapchain, src_rect, wined3d_cs_emit_present(swapchain->device->cs, swapchain, src_rect,
dst_rect, dst_window_override, flags); dst_rect, dst_window_override, flags);
@ -467,7 +482,7 @@ static void wined3d_swapchain_rotate(struct wined3d_swapchain *swapchain, struct
} }
static void swapchain_gl_present(struct wined3d_swapchain *swapchain, static void swapchain_gl_present(struct wined3d_swapchain *swapchain,
const RECT *src_rect_in, const RECT *dst_rect_in, DWORD flags) const RECT *src_rect, const RECT *dst_rect, DWORD flags)
{ {
struct wined3d_surface *back_buffer = surface_from_resource( struct wined3d_surface *back_buffer = surface_from_resource(
wined3d_texture_get_sub_resource(swapchain->back_buffers[0], 0)); wined3d_texture_get_sub_resource(swapchain->back_buffers[0], 0));
@ -475,7 +490,6 @@ static void swapchain_gl_present(struct wined3d_swapchain *swapchain,
const struct wined3d_gl_info *gl_info; const struct wined3d_gl_info *gl_info;
struct wined3d_context *context; struct wined3d_context *context;
struct wined3d_surface *front; struct wined3d_surface *front;
RECT src_rect, dst_rect;
BOOL render_to_fbo; BOOL render_to_fbo;
context = context_acquire(swapchain->device, back_buffer); context = context_acquire(swapchain->device, back_buffer);
@ -530,32 +544,13 @@ static void swapchain_gl_present(struct wined3d_swapchain *swapchain,
TRACE("Presenting HDC %p.\n", context->hdc); TRACE("Presenting HDC %p.\n", context->hdc);
render_to_fbo = swapchain->render_to_fbo; if (!(render_to_fbo = swapchain->render_to_fbo)
&& (src_rect->left || src_rect->top
if (src_rect_in) || src_rect->right != swapchain->desc.backbuffer_width
{ || src_rect->bottom != swapchain->desc.backbuffer_height
src_rect = *src_rect_in; || dst_rect->left || dst_rect->top
if (!render_to_fbo && (src_rect.left || src_rect.top || dst_rect->right != swapchain->desc.backbuffer_width
|| src_rect.right != swapchain->desc.backbuffer_width || dst_rect->bottom != swapchain->desc.backbuffer_height))
|| src_rect.bottom != swapchain->desc.backbuffer_height))
{
render_to_fbo = TRUE;
}
}
else
{
SetRect(&src_rect, 0, 0, swapchain->desc.backbuffer_width,
swapchain->desc.backbuffer_height);
}
if (dst_rect_in)
dst_rect = *dst_rect_in;
else
GetClientRect(swapchain->win_handle, &dst_rect);
if (!render_to_fbo && (dst_rect.left || dst_rect.top
|| dst_rect.right != swapchain->desc.backbuffer_width
|| dst_rect.bottom != swapchain->desc.backbuffer_height))
render_to_fbo = TRUE; render_to_fbo = TRUE;
/* Rendering to a window of different size, presenting partial rectangles, /* Rendering to a window of different size, presenting partial rectangles,
@ -584,7 +579,7 @@ static void swapchain_gl_present(struct wined3d_swapchain *swapchain,
if (swapchain->desc.swap_effect == WINED3D_SWAP_EFFECT_FLIP && !once++) if (swapchain->desc.swap_effect == WINED3D_SWAP_EFFECT_FLIP && !once++)
FIXME("WINED3D_SWAP_EFFECT_FLIP not implemented.\n"); FIXME("WINED3D_SWAP_EFFECT_FLIP not implemented.\n");
swapchain_blit(swapchain, context, &src_rect, &dst_rect); swapchain_blit(swapchain, context, src_rect, dst_rect);
} }
if (swapchain->num_contexts > 1) if (swapchain->num_contexts > 1)
@ -709,7 +704,7 @@ static void swapchain_gdi_frontbuffer_updated(struct wined3d_swapchain *swapchai
} }
static void swapchain_gdi_present(struct wined3d_swapchain *swapchain, static void swapchain_gdi_present(struct wined3d_swapchain *swapchain,
const RECT *src_rect_in, const RECT *dst_rect_in, DWORD flags) const RECT *src_rect, const RECT *dst_rect, DWORD flags)
{ {
struct wined3d_surface *front, *back; struct wined3d_surface *front, *back;