Module: wine Branch: master Commit: 2669feeb8c27f3e4714c8a1969f637c51acf3c51 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2669feeb8c27f3e4714c8a1969...
Author: Henri Verbeet hverbeet@codeweavers.com Date: Mon Sep 17 21:48:51 2012 +0200
wined3d: wined3d_device_set_material() never fails.
---
dlls/d3d8/device.c | 5 ++--- dlls/d3d9/device.c | 5 ++--- dlls/ddraw/device.c | 5 ++--- dlls/wined3d/device.c | 6 ++---- include/wine/wined3d.h | 2 +- 5 files changed, 9 insertions(+), 14 deletions(-)
diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index e5c2605..7ff67ab 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -1333,16 +1333,15 @@ static HRESULT WINAPI d3d8_device_GetViewport(IDirect3DDevice8 *iface, D3DVIEWPO static HRESULT WINAPI d3d8_device_SetMaterial(IDirect3DDevice8 *iface, const D3DMATERIAL8 *material) { struct d3d8_device *device = impl_from_IDirect3DDevice8(iface); - HRESULT hr;
TRACE("iface %p, material %p.\n", iface, material);
/* Note: D3DMATERIAL8 is compatible with struct wined3d_material. */ wined3d_mutex_lock(); - hr = wined3d_device_set_material(device->wined3d_device, (const struct wined3d_material *)material); + wined3d_device_set_material(device->wined3d_device, (const struct wined3d_material *)material); wined3d_mutex_unlock();
- return hr; + return D3D_OK; }
static HRESULT WINAPI d3d8_device_GetMaterial(IDirect3DDevice8 *iface, D3DMATERIAL8 *material) diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 3bbdd78..ef51f25 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -1399,16 +1399,15 @@ static HRESULT WINAPI d3d9_device_GetViewport(IDirect3DDevice9Ex *iface, D3DVIEW static HRESULT WINAPI d3d9_device_SetMaterial(IDirect3DDevice9Ex *iface, const D3DMATERIAL9 *material) { struct d3d9_device *device = impl_from_IDirect3DDevice9Ex(iface); - HRESULT hr;
TRACE("iface %p, material %p.\n", iface, material);
/* Note: D3DMATERIAL9 is compatible with struct wined3d_material. */ wined3d_mutex_lock(); - hr = wined3d_device_set_material(device->wined3d_device, (const struct wined3d_material *)material); + wined3d_device_set_material(device->wined3d_device, (const struct wined3d_material *)material); wined3d_mutex_unlock();
- return hr; + return D3D_OK; }
static HRESULT WINAPI d3d9_device_GetMaterial(IDirect3DDevice9Ex *iface, D3DMATERIAL9 *material) diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index f0bd56a..9162e92 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -5089,7 +5089,6 @@ static HRESULT WINAPI d3d_device7_GetViewport_FPUPreserve(IDirect3DDevice7 *ifac static HRESULT d3d_device7_SetMaterial(IDirect3DDevice7 *iface, D3DMATERIAL7 *material) { struct d3d_device *device = impl_from_IDirect3DDevice7(iface); - HRESULT hr;
TRACE("iface %p, material %p.\n", iface, material);
@@ -5098,10 +5097,10 @@ static HRESULT d3d_device7_SetMaterial(IDirect3DDevice7 *iface, D3DMATERIAL7 *ma
wined3d_mutex_lock(); /* Note: D3DMATERIAL7 is compatible with struct wined3d_material. */ - hr = wined3d_device_set_material(device->wined3d_device, (struct wined3d_material *)material); + wined3d_device_set_material(device->wined3d_device, (struct wined3d_material *)material); wined3d_mutex_unlock();
- return hr_ddraw_from_wined3d(hr); + return D3D_OK; }
static HRESULT WINAPI d3d_device7_SetMaterial_FPUSetup(IDirect3DDevice7 *iface, D3DMATERIAL7 *material) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 903d589..e4da126 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -2168,7 +2168,7 @@ HRESULT CDECL wined3d_device_get_clip_status(const struct wined3d_device *device return WINED3D_OK; }
-HRESULT CDECL wined3d_device_set_material(struct wined3d_device *device, const struct wined3d_material *material) +void CDECL wined3d_device_set_material(struct wined3d_device *device, const struct wined3d_material *material) { TRACE("device %p, material %p.\n", device, material);
@@ -2179,12 +2179,10 @@ HRESULT CDECL wined3d_device_set_material(struct wined3d_device *device, const s if (device->isRecordingState) { TRACE("Recording... not performing anything.\n"); - return WINED3D_OK; + return; }
device_invalidate_state(device, STATE_MATERIAL); - - return WINED3D_OK; }
HRESULT CDECL wined3d_device_get_material(const struct wined3d_device *device, struct wined3d_material *material) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index c3e1c19..2bc112a 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2207,7 +2207,7 @@ void __cdecl wined3d_device_set_index_buffer(struct wined3d_device *device, HRESULT __cdecl wined3d_device_set_light(struct wined3d_device *device, UINT light_idx, const struct wined3d_light *light); HRESULT __cdecl wined3d_device_set_light_enable(struct wined3d_device *device, UINT light_idx, BOOL enable); -HRESULT __cdecl wined3d_device_set_material(struct wined3d_device *device, const struct wined3d_material *material); +void __cdecl wined3d_device_set_material(struct wined3d_device *device, const struct wined3d_material *material); void __cdecl wined3d_device_set_multithreaded(struct wined3d_device *device); HRESULT __cdecl wined3d_device_set_npatch_mode(struct wined3d_device *device, float segments); HRESULT __cdecl wined3d_device_set_pixel_shader(struct wined3d_device *device, struct wined3d_shader *shader);