Module: wine Branch: master Commit: 256d43316418a346978834a41b52c4f99456bb3b URL: http://source.winehq.org/git/wine.git/?a=commit;h=256d43316418a346978834a41b...
Author: Henri Verbeet hverbeet@codeweavers.com Date: Fri Jun 29 07:37:56 2012 +0200
d3d9: Implement d3d9_device_PresentEx().
---
dlls/d3d8/device.c | 3 ++- dlls/d3d9/device.c | 20 +++++++++++++++----- dlls/wined3d/device.c | 8 ++++---- dlls/wined3d/swapchain.c | 3 +++ include/wine/wined3d.h | 2 +- 5 files changed, 25 insertions(+), 11 deletions(-)
diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index 62a8e70..d5fd32a 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -610,7 +610,8 @@ static HRESULT WINAPI d3d8_device_Present(IDirect3DDevice8 *iface, const RECT *s iface, wine_dbgstr_rect(src_rect), wine_dbgstr_rect(dst_rect), dst_window_override, dirty_region);
wined3d_mutex_lock(); - hr = wined3d_device_present(device->wined3d_device, src_rect, dst_rect, dst_window_override, dirty_region); + hr = wined3d_device_present(device->wined3d_device, src_rect, dst_rect, + dst_window_override, dirty_region, 0); wined3d_mutex_unlock();
return hr; diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index d4256fc..bcad6aa 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -584,11 +584,12 @@ static HRESULT WINAPI DECLSPEC_HOTPATCH d3d9_device_Present(IDirect3DDevice9Ex * iface, src_rect, dst_rect, dst_window_override, dirty_region);
wined3d_mutex_lock(); - hr = wined3d_device_present(device->wined3d_device, src_rect, dst_rect, dst_window_override, dirty_region); + hr = wined3d_device_present(device->wined3d_device, src_rect, dst_rect, + dst_window_override, dirty_region, 0); wined3d_mutex_unlock();
return hr; - } +}
static HRESULT WINAPI d3d9_device_GetBackBuffer(IDirect3DDevice9Ex *iface, UINT swapchain, UINT backbuffer_idx, D3DBACKBUFFER_TYPE backbuffer_type, IDirect3DSurface9 **backbuffer) @@ -2818,10 +2819,19 @@ static HRESULT WINAPI d3d9_device_PresentEx(IDirect3DDevice9Ex *iface, const RECT *src_rect, const RECT *dst_rect, HWND dst_window_override, const RGNDATA *dirty_region, DWORD flags) { - FIXME("iface %p, src_rect %p, dst_rect %p, dst_window_override %p, dirty_region %p, flags %#x stub!\n", - iface, src_rect, dst_rect, dst_window_override, dirty_region, flags); + struct d3d9_device *device = impl_from_IDirect3DDevice9Ex(iface); + HRESULT hr;
- return E_NOTIMPL; + TRACE("iface %p, src_rect %s, dst_rect %s, dst_window_override %p, dirty_region %p, flags %#x.\n", + iface, wine_dbgstr_rect(src_rect), wine_dbgstr_rect(dst_rect), + dst_window_override, dirty_region, flags); + + wined3d_mutex_lock(); + hr = wined3d_device_present(device->wined3d_device, src_rect, dst_rect, + dst_window_override, dirty_region, flags); + wined3d_mutex_unlock(); + + return hr; }
static HRESULT WINAPI d3d9_device_GetGPUThreadPriority(IDirect3DDevice9Ex *iface, INT *priority) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 8c01184..9b73f01 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -3821,18 +3821,18 @@ HRESULT CDECL wined3d_device_end_scene(struct wined3d_device *device) }
HRESULT CDECL wined3d_device_present(const struct wined3d_device *device, const RECT *src_rect, - const RECT *dst_rect, HWND dst_window_override, const RGNDATA *dirty_region) + const RECT *dst_rect, HWND dst_window_override, const RGNDATA *dirty_region, DWORD flags) { UINT i;
- TRACE("device %p, src_rect %s, dst_rect %s, dst_window_override %p, dirty_region %p.\n", + TRACE("device %p, src_rect %s, dst_rect %s, dst_window_override %p, dirty_region %p, flags %#x.\n", device, wine_dbgstr_rect(src_rect), wine_dbgstr_rect(dst_rect), - dst_window_override, dirty_region); + dst_window_override, dirty_region, flags);
for (i = 0; i < device->swapchain_count; ++i) { wined3d_swapchain_present(device->swapchains[i], src_rect, - dst_rect, dst_window_override, dirty_region, 0); + dst_rect, dst_window_override, dirty_region, flags); }
return WINED3D_OK; diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index 6dbd2d7..8c69fad 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -150,6 +150,9 @@ HRESULT CDECL wined3d_swapchain_present(struct wined3d_swapchain *swapchain, swapchain, wine_dbgstr_rect(src_rect), wine_dbgstr_rect(dst_rect), dst_window_override, dirty_region, flags);
+ if (flags) + FIXME("Ignoring flags %#x.\n", flags); + if (!swapchain->back_buffers) { WARN("Swapchain doesn't have a backbuffer, returning WINED3DERR_INVALIDCALL\n"); diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 5d4111d..5e95917 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2181,7 +2181,7 @@ HRESULT __cdecl wined3d_device_init_gdi(struct wined3d_device *device, struct wi HRESULT __cdecl wined3d_device_multiply_transform(struct wined3d_device *device, enum wined3d_transform_state state, const struct wined3d_matrix *matrix); HRESULT __cdecl wined3d_device_present(const struct wined3d_device *device, const RECT *src_rect, - const RECT *dst_rect, HWND dst_window_override, const RGNDATA *dirty_region); + const RECT *dst_rect, HWND dst_window_override, const RGNDATA *dirty_region, DWORD flags); HRESULT __cdecl wined3d_device_process_vertices(struct wined3d_device *device, UINT src_start_idx, UINT dst_idx, UINT vertex_count, struct wined3d_buffer *dst_buffer, const struct wined3d_vertex_declaration *declaration, DWORD flags, DWORD dst_fvf);