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

wined3d: wined3d_device_set_texture_stage_state() never fails.

This commit is contained in:
Henri Verbeet 2012-09-26 10:12:13 +02:00 committed by Alexandre Julliard
parent 084e967c0d
commit 26c0714009
5 changed files with 13 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
dlls/d3d8/device.c
View File

@ -1812,7 +1812,6 @@ static HRESULT WINAPI d3d8_device_SetTextureStageState(IDirect3DDevice8 *iface,
{
struct d3d8_device *device = impl_from_IDirect3DDevice8(iface);
const struct tss_lookup *l;
HRESULT hr = D3D_OK;
TRACE("iface %p, stage %u, state %#x, value %#x.\n", iface, stage, type, value);
@ -1828,10 +1827,10 @@ static HRESULT WINAPI d3d8_device_SetTextureStageState(IDirect3DDevice8 *iface,
if (l->sampler_state)
wined3d_device_set_sampler_state(device->wined3d_device, stage, l->state, value);
else
hr = wined3d_device_set_texture_stage_state(device->wined3d_device, stage, l->state, value);
wined3d_device_set_texture_stage_state(device->wined3d_device, stage, l->state, value);
wined3d_mutex_unlock();
return hr;
return D3D_OK;
}
static HRESULT WINAPI d3d8_device_ValidateDevice(IDirect3DDevice8 *iface, DWORD *pass_count)

5
dlls/d3d9/device.c
View File

@ -1773,7 +1773,6 @@ static HRESULT WINAPI d3d9_device_SetTextureStageState(IDirect3DDevice9Ex *iface
DWORD stage, D3DTEXTURESTAGESTATETYPE state, DWORD value)
{
struct d3d9_device *device = impl_from_IDirect3DDevice9Ex(iface);
HRESULT hr;
TRACE("iface %p, stage %u, state %#x, value %#x.\n", iface, stage, state, value);
@ -1784,10 +1783,10 @@ static HRESULT WINAPI d3d9_device_SetTextureStageState(IDirect3DDevice9Ex *iface
}
wined3d_mutex_lock();
hr = wined3d_device_set_texture_stage_state(device->wined3d_device, stage, tss_lookup[state], value);
wined3d_device_set_texture_stage_state(device->wined3d_device, stage, tss_lookup[state], value);
wined3d_mutex_unlock();
return hr;
return D3D_OK;
}
static HRESULT WINAPI d3d9_device_GetSamplerState(IDirect3DDevice9Ex *iface,

5
dlls/ddraw/device.c
View File

@ -4684,7 +4684,6 @@ static HRESULT d3d_device7_SetTextureStageState(IDirect3DDevice7 *iface,
{
struct d3d_device *device = impl_from_IDirect3DDevice7(iface);
const struct tss_lookup *l;
HRESULT hr = D3D_OK;
TRACE("iface %p, stage %u, state %#x, value %#x.\n",
iface, stage, state, value);
@ -4766,12 +4765,12 @@ static HRESULT d3d_device7_SetTextureStageState(IDirect3DDevice7 *iface,
}
else
{
hr = wined3d_device_set_texture_stage_state(device->wined3d_device, stage, l->state, value);
wined3d_device_set_texture_stage_state(device->wined3d_device, stage, l->state, value);
}
wined3d_mutex_unlock();
return hr;
return D3D_OK;
}
static HRESULT WINAPI d3d_device7_SetTextureStageState_FPUSetup(IDirect3DDevice7 *iface,

14
dlls/wined3d/device.c
View File

@ -3343,7 +3343,7 @@ HRESULT CDECL wined3d_device_process_vertices(struct wined3d_device *device,
return hr;
}
HRESULT CDECL wined3d_device_set_texture_stage_state(struct wined3d_device *device,
void CDECL wined3d_device_set_texture_stage_state(struct wined3d_device *device,
UINT stage, enum wined3d_texture_stage_state state, DWORD value)
{
const struct wined3d_gl_info *gl_info = &device->adapter->gl_info;
@ -3355,14 +3355,14 @@ HRESULT CDECL wined3d_device_set_texture_stage_state(struct wined3d_device *devi
if (state > WINED3D_HIGHEST_TEXTURE_STATE)
{
WARN("Invalid state %#x passed.\n", state);
return WINED3D_OK;
return;
}
if (stage >= gl_info->limits.texture_stages)
{
WARN("Attempting to set stage %u which is higher than the max stage %u, ignoring.\n",
stage, gl_info->limits.texture_stages - 1);
return WINED3D_OK;
return;
}
old_value = device->updateStateBlock->state.texture_states[stage][state];
@ -3372,14 +3372,14 @@ HRESULT CDECL wined3d_device_set_texture_stage_state(struct wined3d_device *devi
if (device->isRecordingState)
{
TRACE("Recording... not performing anything.\n");
return WINED3D_OK;
return;
}
/* Checked after the assignments to allow proper stateblock recording. */
if (old_value == value)
{
TRACE("Application is setting the old value over, nothing to do.\n");
return WINED3D_OK;
return;
}
if (stage > device->stateBlock->state.lowest_disabled_stage
@ -3389,7 +3389,7 @@ HRESULT CDECL wined3d_device_set_texture_stage_state(struct wined3d_device *devi
/* Colorop change above lowest disabled stage? That won't change
* anything in the GL setup. Changes in other states are important on
* disabled stages too. */
return WINED3D_OK;
return;
}
if (state == WINED3D_TSS_COLOR_OP)
@ -3433,8 +3433,6 @@ HRESULT CDECL wined3d_device_set_texture_stage_state(struct wined3d_device *devi
}
device_invalidate_state(device, STATE_TEXTURESTAGE(stage, state));
return WINED3D_OK;
}
HRESULT CDECL wined3d_device_get_texture_stage_state(const struct wined3d_device *device,

2
include/wine/wined3d.h
View File

@ -2230,7 +2230,7 @@ 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);
HRESULT __cdecl wined3d_device_set_texture(struct wined3d_device *device, UINT stage, struct wined3d_texture *texture);
HRESULT __cdecl wined3d_device_set_texture_stage_state(struct wined3d_device *device,
void __cdecl wined3d_device_set_texture_stage_state(struct wined3d_device *device,
UINT stage, enum wined3d_texture_stage_state state, DWORD value);
void __cdecl wined3d_device_set_transform(struct wined3d_device *device,
enum wined3d_transform_state state, const struct wined3d_matrix *matrix);