ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

wined3d: wined3d_stateblock_apply() never fails.

This commit is contained in:
Henri Verbeet 2012-10-04 23:42:17 +02:00 committed by Alexandre Julliard
parent b69545c7da
commit 8e24dbb60a
6 changed files with 9 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
dlls/d3d8/device.c
View File

@ -1532,7 +1532,6 @@ static HRESULT WINAPI d3d8_device_ApplyStateBlock(IDirect3DDevice8 *iface, DWORD
{
struct d3d8_device *device = impl_from_IDirect3DDevice8(iface);
struct wined3d_stateblock *stateblock;
HRESULT hr;
TRACE("iface %p, token %#x.\n", iface, token);
@ -1547,10 +1546,10 @@ static HRESULT WINAPI d3d8_device_ApplyStateBlock(IDirect3DDevice8 *iface, DWORD
wined3d_mutex_unlock();
return D3DERR_INVALIDCALL;
}
hr = wined3d_stateblock_apply(stateblock);
wined3d_stateblock_apply(stateblock);
wined3d_mutex_unlock();
return hr;
return D3D_OK;
}
static HRESULT WINAPI d3d8_device_CaptureStateBlock(IDirect3DDevice8 *iface, DWORD token)

5
dlls/d3d9/stateblock.c
View File

@ -108,15 +108,14 @@ static HRESULT WINAPI d3d9_stateblock_Capture(IDirect3DStateBlock9 *iface)
static HRESULT WINAPI d3d9_stateblock_Apply(IDirect3DStateBlock9 *iface)
{
struct d3d9_stateblock *stateblock = impl_from_IDirect3DStateBlock9(iface);
HRESULT hr;
TRACE("iface %p.\n", iface);
wined3d_mutex_lock();
hr = wined3d_stateblock_apply(stateblock->wined3d_stateblock);
wined3d_stateblock_apply(stateblock->wined3d_stateblock);
wined3d_mutex_unlock();
return hr;
return D3D_OK;
}

8
dlls/ddraw/ddraw.c
View File

@ -955,14 +955,8 @@ static HRESULT WINAPI ddraw7_SetCooperativeLevel(IDirectDraw7 *iface, HWND hwnd,
wined3d_surface_decref(rt);
}
hr = wined3d_stateblock_apply(stateblock);
wined3d_stateblock_apply(stateblock);
wined3d_stateblock_decref(stateblock);
if (FAILED(hr))
{
ERR("Failed to apply stateblock, hr %#x.\n", hr);
wined3d_mutex_unlock();
return hr;
}
}
/* Unhandled flags */

5
dlls/ddraw/device.c
View File

@ -5380,7 +5380,6 @@ static HRESULT d3d_device7_ApplyStateBlock(IDirect3DDevice7 *iface, DWORD stateb
{
struct d3d_device *device = impl_from_IDirect3DDevice7(iface);
struct wined3d_stateblock *wined3d_sb;
HRESULT hr;
TRACE("iface %p, stateblock %#x.\n", iface, stateblock);
@ -5393,10 +5392,10 @@ static HRESULT d3d_device7_ApplyStateBlock(IDirect3DDevice7 *iface, DWORD stateb
return D3DERR_INVALIDSTATEBLOCK;
}
hr = wined3d_stateblock_apply(wined3d_sb);
wined3d_stateblock_apply(wined3d_sb);
wined3d_mutex_unlock();
return hr_ddraw_from_wined3d(hr);
return D3D_OK;
}
static HRESULT WINAPI d3d_device7_ApplyStateBlock_FPUSetup(IDirect3DDevice7 *iface, DWORD stateblock)

4
dlls/wined3d/stateblock.c
View File

@ -917,7 +917,7 @@ static void apply_lights(struct wined3d_device *device, const struct wined3d_sta
}
}
HRESULT CDECL wined3d_stateblock_apply(const struct wined3d_stateblock *stateblock)
void CDECL wined3d_stateblock_apply(const struct wined3d_stateblock *stateblock)
{
struct wined3d_device *device = stateblock->device;
unsigned int i;
@ -1072,8 +1072,6 @@ HRESULT CDECL wined3d_stateblock_apply(const struct wined3d_stateblock *stateblo
}
TRACE("Applied stateblock %p.\n", stateblock);
return WINED3D_OK;
}
void stateblock_init_default_state(struct wined3d_stateblock *stateblock)

2
include/wine/wined3d.h
View File

@ -2304,7 +2304,7 @@ ULONG __cdecl wined3d_shader_incref(struct wined3d_shader *shader);
HRESULT __cdecl wined3d_shader_set_local_constants_float(struct wined3d_shader *shader,
UINT start_idx, const float *src_data, UINT vector4f_count);
HRESULT __cdecl wined3d_stateblock_apply(const struct wined3d_stateblock *stateblock);
void __cdecl wined3d_stateblock_apply(const 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);