Module: wine Branch: master Commit: b69545c7da86e98ef1191e9a9fdaa5712d13ba8c URL: http://source.winehq.org/git/wine.git/?a=commit;h=b69545c7da86e98ef1191e9a9f...
Author: Henri Verbeet hverbeet@codeweavers.com Date: Thu Oct 4 23:42:16 2012 +0200
wined3d: wined3d_stateblock_capture() never fails.
---
dlls/d3d8/device.c | 5 ++--- dlls/d3d9/stateblock.c | 5 ++--- dlls/ddraw/ddraw.c | 9 +-------- dlls/ddraw/device.c | 5 ++--- dlls/wined3d/stateblock.c | 4 +--- include/wine/wined3d.h | 2 +- 6 files changed, 9 insertions(+), 21 deletions(-)
diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index 6b33684..a8af52e 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -1557,7 +1557,6 @@ static HRESULT WINAPI d3d8_device_CaptureStateBlock(IDirect3DDevice8 *iface, DWO { struct d3d8_device *device = impl_from_IDirect3DDevice8(iface); struct wined3d_stateblock *stateblock; - HRESULT hr;
TRACE("iface %p, token %#x.\n", iface, token);
@@ -1569,10 +1568,10 @@ static HRESULT WINAPI d3d8_device_CaptureStateBlock(IDirect3DDevice8 *iface, DWO wined3d_mutex_unlock(); return D3DERR_INVALIDCALL; } - hr = wined3d_stateblock_capture(stateblock); + wined3d_stateblock_capture(stateblock); wined3d_mutex_unlock();
- return hr; + return D3D_OK; }
static HRESULT WINAPI d3d8_device_DeleteStateBlock(IDirect3DDevice8 *iface, DWORD token) diff --git a/dlls/d3d9/stateblock.c b/dlls/d3d9/stateblock.c index 8ec8db9..4af2247 100644 --- a/dlls/d3d9/stateblock.c +++ b/dlls/d3d9/stateblock.c @@ -95,15 +95,14 @@ static HRESULT WINAPI d3d9_stateblock_GetDevice(IDirect3DStateBlock9 *iface, IDi static HRESULT WINAPI d3d9_stateblock_Capture(IDirect3DStateBlock9 *iface) { struct d3d9_stateblock *stateblock = impl_from_IDirect3DStateBlock9(iface); - HRESULT hr;
TRACE("iface %p.\n", iface);
wined3d_mutex_lock(); - hr = wined3d_stateblock_capture(stateblock->wined3d_stateblock); + wined3d_stateblock_capture(stateblock->wined3d_stateblock); wined3d_mutex_unlock();
- return hr; + return D3D_OK; }
static HRESULT WINAPI d3d9_stateblock_Apply(IDirect3DStateBlock9 *iface) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index e7d9302..c2a7be1 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -924,14 +924,7 @@ static HRESULT WINAPI ddraw7_SetCooperativeLevel(IDirectDraw7 *iface, HWND hwnd, return hr; }
- if (FAILED(hr = wined3d_stateblock_capture(stateblock))) - { - ERR("Failed to capture stateblock, hr %#x.\n", hr); - wined3d_stateblock_decref(stateblock); - wined3d_mutex_unlock(); - return hr; - } - + wined3d_stateblock_capture(stateblock); rt = wined3d_device_get_render_target(This->wined3d_device, 0); if (rt == This->wined3d_frontbuffer) rt = NULL; diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index 3e86c35..a0b6781 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -5436,7 +5436,6 @@ static HRESULT d3d_device7_CaptureStateBlock(IDirect3DDevice7 *iface, DWORD stat { struct d3d_device *device = impl_from_IDirect3DDevice7(iface); struct wined3d_stateblock *wined3d_sb; - HRESULT hr;
TRACE("iface %p, stateblock %#x.\n", iface, stateblock);
@@ -5449,10 +5448,10 @@ static HRESULT d3d_device7_CaptureStateBlock(IDirect3DDevice7 *iface, DWORD stat return D3DERR_INVALIDSTATEBLOCK; }
- hr = wined3d_stateblock_capture(wined3d_sb); + wined3d_stateblock_capture(wined3d_sb); wined3d_mutex_unlock();
- return hr_ddraw_from_wined3d(hr); + return D3D_OK; }
static HRESULT WINAPI d3d_device7_CaptureStateBlock_FPUSetup(IDirect3DDevice7 *iface, DWORD stateblock) diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c index e357095..a2524f1 100644 --- a/dlls/wined3d/stateblock.c +++ b/dlls/wined3d/stateblock.c @@ -611,7 +611,7 @@ static void wined3d_state_record_lights(struct wined3d_state *dst_state, const s } }
-HRESULT CDECL wined3d_stateblock_capture(struct wined3d_stateblock *stateblock) +void CDECL wined3d_stateblock_capture(struct wined3d_stateblock *stateblock) { const struct wined3d_state *src_state = &stateblock->device->stateBlock->state; unsigned int i; @@ -897,8 +897,6 @@ HRESULT CDECL wined3d_stateblock_capture(struct wined3d_stateblock *stateblock) wined3d_state_record_lights(&stateblock->state, src_state);
TRACE("Capture done.\n"); - - return WINED3D_OK; }
static void apply_lights(struct wined3d_device *device, const struct wined3d_state *state) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 521b2b3..bb44969 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2305,7 +2305,7 @@ HRESULT __cdecl wined3d_shader_set_local_constants_float(struct wined3d_shader * UINT start_idx, const float *src_data, UINT vector4f_count);
HRESULT __cdecl wined3d_stateblock_apply(const struct wined3d_stateblock *stateblock); -HRESULT __cdecl wined3d_stateblock_capture(struct wined3d_stateblock *stateblock); +void __cdecl wined3d_stateblock_capture(struct wined3d_stateblock *stateblock); HRESULT __cdecl wined3d_stateblock_create(struct wined3d_device *device, enum wined3d_stateblock_type type, struct wined3d_stateblock **stateblock); ULONG __cdecl wined3d_stateblock_decref(struct wined3d_stateblock *stateblock);
-
Alexandre Julliard