Skip to content

W
wine-winehq
Commit 5d28b422 authored by Zebediah Figura's avatar Zebediah Figura Committed by Alexandre Julliard
Browse files
Options

ddraw: Update the primary stateblock in d3d_device3_SetRenderState().

Signed-off-by: 's avatarZebediah Figura <z.figura12@gmail.com> Signed-off-by: 's avatarHenri Verbeet <hverbeet@codeweavers.com> Signed-off-by: 's avatarAlexandre Julliard <julliard@winehq.org>
parent 1907d01f
Hide whitespace changes
Inline Side-by-side
Showing with 34 additions and 26 deletions
dlls/ddraw/device.c
View file @ 5d28b422
...@@ -2688,6 +2688,13 @@ static HRESULT WINAPI d3d_device7_SetRenderState_FPUPreserve(IDirect3DDevice7 *i ...@@ -2688,6 +2688,13 @@ static HRESULT WINAPI d3d_device7_SetRenderState_FPUPreserve(IDirect3DDevice7 *i
return hr; return hr;
} }
static void d3d_device_set_texture_stage_state(struct d3d_device *device,
UINT stage, enum wined3d_texture_stage_state state, DWORD value)
{
wined3d_stateblock_set_texture_stage_state(device->state, stage, state, value);
wined3d_device_set_texture_stage_state(device->wined3d_device, stage, state, value);
}
static void fixup_texture_alpha_op(struct d3d_device *device) static void fixup_texture_alpha_op(struct d3d_device *device)
{ {
/* This fixup is required by the way D3DTBLEND_MODULATE maps to texture stage states. /* This fixup is required by the way D3DTBLEND_MODULATE maps to texture stage states.
...@@ -2711,7 +2718,7 @@ static void fixup_texture_alpha_op(struct d3d_device *device) ...@@ -2711,7 +2718,7 @@ static void fixup_texture_alpha_op(struct d3d_device *device)
} }
/* Args 1 and 2 are already set to WINED3DTA_TEXTURE/WINED3DTA_CURRENT in case of D3DTBLEND_MODULATE */ /* Args 1 and 2 are already set to WINED3DTA_TEXTURE/WINED3DTA_CURRENT in case of D3DTBLEND_MODULATE */
wined3d_device_set_texture_stage_state(device->wined3d_device, d3d_device_set_texture_stage_state(device,
0, WINED3D_TSS_ALPHA_OP, tex_alpha ? WINED3D_TOP_SELECT_ARG1 : WINED3D_TOP_SELECT_ARG2); 0, WINED3D_TSS_ALPHA_OP, tex_alpha ? WINED3D_TOP_SELECT_ARG1 : WINED3D_TOP_SELECT_ARG2);
} }
...@@ -2757,6 +2764,7 @@ static HRESULT WINAPI d3d_device3_SetRenderState(IDirect3DDevice3 *iface, ...@@ -2757,6 +2764,7 @@ static HRESULT WINAPI d3d_device3_SetRenderState(IDirect3DDevice3 *iface,
if (value == 0) if (value == 0)
{ {
wined3d_stateblock_set_texture(device->state, 0, NULL);
wined3d_device_set_texture(device->wined3d_device, 0, NULL); wined3d_device_set_texture(device->wined3d_device, 0, NULL);
hr = D3D_OK; hr = D3D_OK;
break; break;
...@@ -2793,69 +2801,69 @@ static HRESULT WINAPI d3d_device3_SetRenderState(IDirect3DDevice3 *iface, ...@@ -2793,69 +2801,69 @@ static HRESULT WINAPI d3d_device3_SetRenderState(IDirect3DDevice3 *iface,
{ {
fixup_texture_alpha_op(device); fixup_texture_alpha_op(device);
wined3d_device_set_texture_stage_state(device->wined3d_device, d3d_device_set_texture_stage_state(device,
0, WINED3D_TSS_ALPHA_ARG1, WINED3DTA_TEXTURE); 0, WINED3D_TSS_ALPHA_ARG1, WINED3DTA_TEXTURE);
wined3d_device_set_texture_stage_state(device->wined3d_device, d3d_device_set_texture_stage_state(device,
0, WINED3D_TSS_ALPHA_ARG2, WINED3DTA_CURRENT); 0, WINED3D_TSS_ALPHA_ARG2, WINED3DTA_CURRENT);
wined3d_device_set_texture_stage_state(device->wined3d_device, d3d_device_set_texture_stage_state(device,
0, WINED3D_TSS_COLOR_ARG1, WINED3DTA_TEXTURE); 0, WINED3D_TSS_COLOR_ARG1, WINED3DTA_TEXTURE);
wined3d_device_set_texture_stage_state(device->wined3d_device, d3d_device_set_texture_stage_state(device,
0, WINED3D_TSS_COLOR_ARG2, WINED3DTA_CURRENT); 0, WINED3D_TSS_COLOR_ARG2, WINED3DTA_CURRENT);
wined3d_device_set_texture_stage_state(device->wined3d_device, d3d_device_set_texture_stage_state(device,
0, WINED3D_TSS_COLOR_OP, WINED3D_TOP_MODULATE); 0, WINED3D_TSS_COLOR_OP, WINED3D_TOP_MODULATE);
break; break;
} }
case D3DTBLEND_ADD: case D3DTBLEND_ADD:
wined3d_device_set_texture_stage_state(device->wined3d_device, d3d_device_set_texture_stage_state(device,
0, WINED3D_TSS_COLOR_OP, WINED3D_TOP_ADD); 0, WINED3D_TSS_COLOR_OP, WINED3D_TOP_ADD);
wined3d_device_set_texture_stage_state(device->wined3d_device, d3d_device_set_texture_stage_state(device,
0, WINED3D_TSS_COLOR_ARG1, WINED3DTA_TEXTURE); 0, WINED3D_TSS_COLOR_ARG1, WINED3DTA_TEXTURE);
wined3d_device_set_texture_stage_state(device->wined3d_device, d3d_device_set_texture_stage_state(device,
0, WINED3D_TSS_COLOR_ARG2, WINED3DTA_CURRENT); 0, WINED3D_TSS_COLOR_ARG2, WINED3DTA_CURRENT);
wined3d_device_set_texture_stage_state(device->wined3d_device, d3d_device_set_texture_stage_state(device,
0, WINED3D_TSS_ALPHA_OP, WINED3D_TOP_SELECT_ARG2); 0, WINED3D_TSS_ALPHA_OP, WINED3D_TOP_SELECT_ARG2);
wined3d_device_set_texture_stage_state(device->wined3d_device, d3d_device_set_texture_stage_state(device,
0, WINED3D_TSS_ALPHA_ARG2, WINED3DTA_CURRENT); 0, WINED3D_TSS_ALPHA_ARG2, WINED3DTA_CURRENT);
break; break;
case D3DTBLEND_MODULATEALPHA: case D3DTBLEND_MODULATEALPHA:
wined3d_device_set_texture_stage_state(device->wined3d_device, d3d_device_set_texture_stage_state(device,
0, WINED3D_TSS_COLOR_ARG1, WINED3DTA_TEXTURE); 0, WINED3D_TSS_COLOR_ARG1, WINED3DTA_TEXTURE);
wined3d_device_set_texture_stage_state(device->wined3d_device, d3d_device_set_texture_stage_state(device,
0, WINED3D_TSS_ALPHA_ARG1, WINED3DTA_TEXTURE); 0, WINED3D_TSS_ALPHA_ARG1, WINED3DTA_TEXTURE);
wined3d_device_set_texture_stage_state(device->wined3d_device, d3d_device_set_texture_stage_state(device,
0, WINED3D_TSS_COLOR_ARG2, WINED3DTA_CURRENT); 0, WINED3D_TSS_COLOR_ARG2, WINED3DTA_CURRENT);
wined3d_device_set_texture_stage_state(device->wined3d_device, d3d_device_set_texture_stage_state(device,
0, WINED3D_TSS_ALPHA_ARG2, WINED3DTA_CURRENT); 0, WINED3D_TSS_ALPHA_ARG2, WINED3DTA_CURRENT);
wined3d_device_set_texture_stage_state(device->wined3d_device, d3d_device_set_texture_stage_state(device,
0, WINED3D_TSS_COLOR_OP, WINED3D_TOP_MODULATE); 0, WINED3D_TSS_COLOR_OP, WINED3D_TOP_MODULATE);
wined3d_device_set_texture_stage_state(device->wined3d_device, d3d_device_set_texture_stage_state(device,
0, WINED3D_TSS_ALPHA_OP, WINED3D_TOP_MODULATE); 0, WINED3D_TSS_ALPHA_OP, WINED3D_TOP_MODULATE);
break; break;
case D3DTBLEND_COPY: case D3DTBLEND_COPY:
case D3DTBLEND_DECAL: case D3DTBLEND_DECAL:
wined3d_device_set_texture_stage_state(device->wined3d_device, d3d_device_set_texture_stage_state(device,
0, WINED3D_TSS_COLOR_ARG1, WINED3DTA_TEXTURE); 0, WINED3D_TSS_COLOR_ARG1, WINED3DTA_TEXTURE);
wined3d_device_set_texture_stage_state(device->wined3d_device, d3d_device_set_texture_stage_state(device,
0, WINED3D_TSS_ALPHA_ARG1, WINED3DTA_TEXTURE); 0, WINED3D_TSS_ALPHA_ARG1, WINED3DTA_TEXTURE);
wined3d_device_set_texture_stage_state(device->wined3d_device, d3d_device_set_texture_stage_state(device,
0, WINED3D_TSS_COLOR_OP, WINED3D_TOP_SELECT_ARG1); 0, WINED3D_TSS_COLOR_OP, WINED3D_TOP_SELECT_ARG1);
wined3d_device_set_texture_stage_state(device->wined3d_device, d3d_device_set_texture_stage_state(device,
0, WINED3D_TSS_ALPHA_OP, WINED3D_TOP_SELECT_ARG1); 0, WINED3D_TSS_ALPHA_OP, WINED3D_TOP_SELECT_ARG1);
break; break;
case D3DTBLEND_DECALALPHA: case D3DTBLEND_DECALALPHA:
wined3d_device_set_texture_stage_state(device->wined3d_device, d3d_device_set_texture_stage_state(device,
0, WINED3D_TSS_COLOR_OP, WINED3D_TOP_BLEND_TEXTURE_ALPHA); 0, WINED3D_TSS_COLOR_OP, WINED3D_TOP_BLEND_TEXTURE_ALPHA);
wined3d_device_set_texture_stage_state(device->wined3d_device, d3d_device_set_texture_stage_state(device,
0, WINED3D_TSS_COLOR_ARG1, WINED3DTA_TEXTURE); 0, WINED3D_TSS_COLOR_ARG1, WINED3DTA_TEXTURE);
wined3d_device_set_texture_stage_state(device->wined3d_device, d3d_device_set_texture_stage_state(device,
0, WINED3D_TSS_COLOR_ARG2, WINED3DTA_CURRENT); 0, WINED3D_TSS_COLOR_ARG2, WINED3DTA_CURRENT);
wined3d_device_set_texture_stage_state(device->wined3d_device, d3d_device_set_texture_stage_state(device,
0, WINED3D_TSS_ALPHA_OP, WINED3D_TOP_SELECT_ARG2); 0, WINED3D_TSS_ALPHA_OP, WINED3D_TOP_SELECT_ARG2);
wined3d_device_set_texture_stage_state(device->wined3d_device, d3d_device_set_texture_stage_state(device,
0, WINED3D_TSS_ALPHA_ARG2, WINED3DTA_CURRENT); 0, WINED3D_TSS_ALPHA_ARG2, WINED3DTA_CURRENT);
break; break;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment