Module: wine Branch: master Commit: c78312ad0804e6cf82ef6bd4da2c8ba765e89054 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c78312ad0804e6cf82ef6bd4da...
Author: Henri Verbeet hverbeet@codeweavers.com Date: Tue Apr 14 10:16:01 2015 +0200
d3d9: Merge most of d3d9_device_Reset() and d3d9_device_ResetEx().
---
dlls/d3d9/device.c | 72 ++++++++++++++++++++++-------------------------------- 1 file changed, 29 insertions(+), 43 deletions(-)
diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index da462b1..97c71bb 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -626,21 +626,28 @@ static HRESULT CDECL reset_enum_callback(struct wined3d_resource *resource) return D3D_OK; }
-static HRESULT WINAPI DECLSPEC_HOTPATCH d3d9_device_Reset(IDirect3DDevice9Ex *iface, - D3DPRESENT_PARAMETERS *present_parameters) +static HRESULT d3d9_device_reset(struct d3d9_device *device, + D3DPRESENT_PARAMETERS *present_parameters, D3DDISPLAYMODEEX *mode) { - struct d3d9_device *device = impl_from_IDirect3DDevice9Ex(iface); struct wined3d_swapchain_desc swapchain_desc; + struct wined3d_display_mode wined3d_mode; HRESULT hr;
- TRACE("iface %p, present_parameters %p.\n", iface, present_parameters); - if (!device->d3d_parent->extended && device->device_state == D3D9_DEVICE_STATE_LOST) { WARN("App not active, returning D3DERR_DEVICELOST.\n"); return D3DERR_DEVICELOST; }
+ if (mode) + { + wined3d_mode.width = mode->Width; + wined3d_mode.height = mode->Height; + wined3d_mode.refresh_rate = mode->RefreshRate; + wined3d_mode.format_id = wined3dformat_from_d3dformat(mode->Format); + wined3d_mode.scanline_ordering = mode->ScanLineOrdering; + } + wined3d_mutex_lock();
if (device->vertex_buffer) @@ -649,6 +656,7 @@ static HRESULT WINAPI DECLSPEC_HOTPATCH d3d9_device_Reset(IDirect3DDevice9Ex *if device->vertex_buffer = NULL; device->vertex_buffer_size = 0; } + if (device->index_buffer) { wined3d_buffer_decref(device->index_buffer); @@ -657,17 +665,27 @@ static HRESULT WINAPI DECLSPEC_HOTPATCH d3d9_device_Reset(IDirect3DDevice9Ex *if }
wined3d_swapchain_desc_from_present_parameters(&swapchain_desc, present_parameters); - hr = wined3d_device_reset(device->wined3d_device, &swapchain_desc, - NULL, reset_enum_callback, !device->d3d_parent->extended); - if (FAILED(hr) && !device->d3d_parent->extended) - device->device_state = D3D9_DEVICE_STATE_NOT_RESET; - else + if (SUCCEEDED(hr = wined3d_device_reset(device->wined3d_device, &swapchain_desc, + mode ? &wined3d_mode : NULL, reset_enum_callback, !device->d3d_parent->extended))) device->device_state = D3D9_DEVICE_STATE_OK; + else if (!device->d3d_parent->extended) + device->device_state = D3D9_DEVICE_STATE_NOT_RESET; + wined3d_mutex_unlock();
return hr; }
+static HRESULT WINAPI DECLSPEC_HOTPATCH d3d9_device_Reset(IDirect3DDevice9Ex *iface, + D3DPRESENT_PARAMETERS *present_parameters) +{ + struct d3d9_device *device = impl_from_IDirect3DDevice9Ex(iface); + + TRACE("iface %p, present_parameters %p.\n", iface, present_parameters); + + return d3d9_device_reset(device, present_parameters, NULL); +} + static HRESULT WINAPI DECLSPEC_HOTPATCH d3d9_device_Present(IDirect3DDevice9Ex *iface, const RECT *src_rect, const RECT *dst_rect, HWND dst_window_override, const RGNDATA *dirty_region) { @@ -3253,42 +3271,10 @@ static HRESULT WINAPI DECLSPEC_HOTPATCH d3d9_device_ResetEx(IDirect3DDevice9Ex * D3DPRESENT_PARAMETERS *present_parameters, D3DDISPLAYMODEEX *mode) { struct d3d9_device *device = impl_from_IDirect3DDevice9Ex(iface); - struct wined3d_swapchain_desc swapchain_desc; - struct wined3d_display_mode wined3d_mode; - HRESULT hr;
TRACE("iface %p, present_parameters %p, mode %p.\n", iface, present_parameters, mode);
- if (mode) - { - wined3d_mode.width = mode->Width; - wined3d_mode.height = mode->Height; - wined3d_mode.refresh_rate = mode->RefreshRate; - wined3d_mode.format_id = wined3dformat_from_d3dformat(mode->Format); - wined3d_mode.scanline_ordering = mode->ScanLineOrdering; - } - - wined3d_mutex_lock(); - - if (device->vertex_buffer) - { - wined3d_buffer_decref(device->vertex_buffer); - device->vertex_buffer = NULL; - device->vertex_buffer_size = 0; - } - if (device->index_buffer) - { - wined3d_buffer_decref(device->index_buffer); - device->index_buffer = NULL; - device->index_buffer_size = 0; - } - - wined3d_swapchain_desc_from_present_parameters(&swapchain_desc, present_parameters); - hr = wined3d_device_reset(device->wined3d_device, &swapchain_desc, - mode ? &wined3d_mode : NULL, reset_enum_callback, FALSE); - wined3d_mutex_unlock(); - - return hr; + return d3d9_device_reset(device, present_parameters, mode); }
static HRESULT WINAPI d3d9_device_GetDisplayModeEx(IDirect3DDevice9Ex *iface,
-
Alexandre Julliard