Module: wine Branch: master Commit: aee692d2244127ecea4f477ed0d3a83ceb6dd5c0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=aee692d2244127ecea4f477ed0...
Author: Henri Verbeet hverbeet@codeweavers.com Date: Fri Oct 16 10:35:07 2015 +0200
d3d8: Simplify d3d8_device_GetBackBuffer().
Signed-off-by: Henri Verbeet hverbeet@codeweavers.com Signed-off-by: Alexandre Julliard julliard@winehq.org
---
dlls/d3d8/device.c | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-)
diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index 20ce900..9dd78b0 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -722,7 +722,7 @@ static HRESULT WINAPI d3d8_device_GetBackBuffer(IDirect3DDevice8 *iface, UINT backbuffer_idx, D3DBACKBUFFER_TYPE backbuffer_type, IDirect3DSurface8 **backbuffer) { struct d3d8_device *device = impl_from_IDirect3DDevice8(iface); - struct wined3d_swapchain *swapchain; + struct wined3d_swapchain *wined3d_swapchain; struct wined3d_resource *wined3d_resource; struct wined3d_texture *wined3d_texture; struct d3d8_surface *surface_impl; @@ -734,14 +734,9 @@ static HRESULT WINAPI d3d8_device_GetBackBuffer(IDirect3DDevice8 *iface,
/* No need to check for backbuffer == NULL, Windows crashes in that case. */ wined3d_mutex_lock(); - if (!(swapchain = wined3d_device_get_swapchain(device->wined3d_device, 0))) - { - wined3d_mutex_unlock(); - *backbuffer = NULL; - return D3DERR_INVALIDCALL; - }
- if (!(wined3d_texture = wined3d_swapchain_get_back_buffer(swapchain, backbuffer_idx))) + wined3d_swapchain = device->implicit_swapchain->wined3d_swapchain; + if (!(wined3d_texture = wined3d_swapchain_get_back_buffer(wined3d_swapchain, backbuffer_idx))) { wined3d_mutex_unlock(); *backbuffer = NULL;