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

wined3d: wined3d_device_set_software_vertex_processing() never fails.

This commit is contained in:
Henri Verbeet 2012-09-26 22:34:03 +02:00 committed by Alexandre Julliard
parent f9d494294a
commit c0f52fbf1c
3 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
dlls/d3d9/device.c
View File

@ -1884,15 +1884,14 @@ static HRESULT WINAPI d3d9_device_GetScissorRect(IDirect3DDevice9Ex *iface, RECT
static HRESULT WINAPI d3d9_device_SetSoftwareVertexProcessing(IDirect3DDevice9Ex *iface, BOOL software) static HRESULT WINAPI d3d9_device_SetSoftwareVertexProcessing(IDirect3DDevice9Ex *iface, BOOL software)
{ {
struct d3d9_device *device = impl_from_IDirect3DDevice9Ex(iface); struct d3d9_device *device = impl_from_IDirect3DDevice9Ex(iface);
HRESULT hr;
TRACE("iface %p, software %#x.\n", iface, software); TRACE("iface %p, software %#x.\n", iface, software);
wined3d_mutex_lock(); 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(); wined3d_mutex_unlock();
return hr; return D3D_OK;
} }
static BOOL WINAPI d3d9_device_GetSoftwareVertexProcessing(IDirect3DDevice9Ex *iface) static BOOL WINAPI d3d9_device_GetSoftwareVertexProcessing(IDirect3DDevice9Ex *iface)

4
dlls/wined3d/device.c
View File

@ -4205,7 +4205,7 @@ HRESULT CDECL wined3d_device_validate_device(const struct wined3d_device *device
return WINED3D_OK; 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; static BOOL warned;
@ -4218,8 +4218,6 @@ HRESULT CDECL wined3d_device_set_software_vertex_processing(struct wined3d_devic
} }
device->softwareVertexProcessing = software; device->softwareVertexProcessing = software;
return WINED3D_OK;
} }
BOOL CDECL wined3d_device_get_software_vertex_processing(const struct wined3d_device *device) BOOL CDECL wined3d_device_get_software_vertex_processing(const struct wined3d_device *device)

2
include/wine/wined3d.h
View File

@ -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, void __cdecl wined3d_device_set_sampler_state(struct wined3d_device *device,
UINT sampler_idx, enum wined3d_sampler_state state, DWORD value); UINT sampler_idx, enum wined3d_sampler_state state, DWORD value);
void __cdecl wined3d_device_set_scissor_rect(struct wined3d_device *device, const RECT *rect); 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, HRESULT __cdecl wined3d_device_set_stream_source(struct wined3d_device *device,
UINT stream_idx, struct wined3d_buffer *buffer, UINT offset, UINT stride); 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); HRESULT __cdecl wined3d_device_set_stream_source_freq(struct wined3d_device *device, UINT stream_idx, UINT divider);