Henri Verbeet : wined3d: wined3d_device_set_software_vertex_processing() never fails.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: c0f52fbf1c044514a0a0b403dc5062c2615ff726
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=c0f52fbf1c044514a0a0b403dc...

Author: Henri Verbeet <hverbeet(a)codeweavers.com>
Date:   Wed Sep 26 22:34:03 2012 +0200

wined3d: wined3d_device_set_software_vertex_processing() never fails.

---

 dlls/d3d9/device.c     |    5 ++---
 dlls/wined3d/device.c  |    4 +---
 include/wine/wined3d.h |    2 +-
 3 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c
index b8f23d7..cd7e001 100644
--- a/dlls/d3d9/device.c
+++ b/dlls/d3d9/device.c
@@ -1884,15 +1884,14 @@ static HRESULT WINAPI d3d9_device_GetScissorRect(IDirect3DDevice9Ex *iface, RECT
 static HRESULT WINAPI d3d9_device_SetSoftwareVertexProcessing(IDirect3DDevice9Ex *iface, BOOL software)
 {
     struct d3d9_device *device = impl_from_IDirect3DDevice9Ex(iface);
-    HRESULT hr;
 
     TRACE("iface %p, software %#x.\n", iface, software);
 
     wined3d_mutex_lock();
-    hr = wined3d_device_set_software_vertex_processing(device->wined3d_device, software);
+    wined3d_device_set_software_vertex_processing(device->wined3d_device, software);
     wined3d_mutex_unlock();
 
-    return hr;
+    return D3D_OK;
 }
 
 static BOOL WINAPI d3d9_device_GetSoftwareVertexProcessing(IDirect3DDevice9Ex *iface)
diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c
index bf78c28..916a648 100644
--- a/dlls/wined3d/device.c
+++ b/dlls/wined3d/device.c
@@ -4205,7 +4205,7 @@ HRESULT CDECL wined3d_device_validate_device(const struct wined3d_device *device
     return WINED3D_OK;
 }
 
-HRESULT CDECL wined3d_device_set_software_vertex_processing(struct wined3d_device *device, BOOL software)
+void CDECL wined3d_device_set_software_vertex_processing(struct wined3d_device *device, BOOL software)
 {
     static BOOL warned;
 
@@ -4218,8 +4218,6 @@ HRESULT CDECL wined3d_device_set_software_vertex_processing(struct wined3d_devic
     }
 
     device->softwareVertexProcessing = software;
-
-    return WINED3D_OK;
 }
 
 BOOL CDECL wined3d_device_get_software_vertex_processing(const struct wined3d_device *device)
diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h
index bb16455..40dfda8 100644
--- a/include/wine/wined3d.h
+++ b/include/wine/wined3d.h
@@ -2224,7 +2224,7 @@ HRESULT __cdecl wined3d_device_set_render_target(struct wined3d_device *device,
 void __cdecl wined3d_device_set_sampler_state(struct wined3d_device *device,
         UINT sampler_idx, enum wined3d_sampler_state state, DWORD value);
 void __cdecl wined3d_device_set_scissor_rect(struct wined3d_device *device, const RECT *rect);
-HRESULT __cdecl wined3d_device_set_software_vertex_processing(struct wined3d_device *device, BOOL software);
+void __cdecl wined3d_device_set_software_vertex_processing(struct wined3d_device *device, BOOL software);
 HRESULT __cdecl wined3d_device_set_stream_source(struct wined3d_device *device,
         UINT stream_idx, struct wined3d_buffer *buffer, UINT offset, UINT stride);
 HRESULT __cdecl wined3d_device_set_stream_source_freq(struct wined3d_device *device, UINT stream_idx, UINT divider);