Skip to content

W
wine-cw
Commit 7c40f9aa authored by Stefan Dösinger's avatar Stefan Dösinger Committed by Alexandre Julliard
Browse files
Options

ddraw: Forward D3DRS_TEXTUREADDRESS* and D3DTSS_ADDRESS* to sampler states.

parent 8295d904
Hide whitespace changes
Inline Side-by-side
Showing with 52 additions and 47 deletions
dlls/ddraw/device.c
View file @ 7c40f9aa
......@@ -2195,28 +2195,15 @@ IDirect3DDeviceImpl_7_GetRenderState(IDirect3DDevice7 *iface,
return hr;
}
case D3DRENDERSTATE_TEXTUREADDRESS:
case D3DRENDERSTATE_TEXTUREADDRESSU:
return IWineD3DDevice_GetSamplerState(This->wineD3DDevice,
0, WINED3DSAMP_ADDRESSU,
Value);
case D3DRENDERSTATE_TEXTUREADDRESSV:
case D3DRENDERSTATE_TEXTUREADDRESS:
{
WINED3DTEXTURESTAGESTATETYPE TexStageStateType;
if (RenderStateType == D3DRENDERSTATE_TEXTUREADDRESS)
{
TexStageStateType = WINED3DTSS_ADDRESS;
}
else if (RenderStateType == D3DRENDERSTATE_TEXTUREADDRESSU)
{
TexStageStateType = WINED3DTSS_ADDRESSU;
}
else
{
TexStageStateType = WINED3DTSS_ADDRESSV;
}
return IWineD3DDevice_GetTextureStageState(This->wineD3DDevice,
0, TexStageStateType,
Value);
}
return IWineD3DDevice_GetSamplerState(This->wineD3DDevice,
0, WINED3DSAMP_ADDRESSV,
Value);
default:
/* FIXME: Unhandled: D3DRENDERSTATE_STIPPLEPATTERN00 - 31 */
......@@ -2348,29 +2335,19 @@ IDirect3DDeviceImpl_7_SetRenderState(IDirect3DDevice7 *iface,
tex_min);
}
case D3DRENDERSTATE_TEXTUREADDRESS:
IWineD3DDevice_SetSamplerState(This->wineD3DDevice,
0, WINED3DSAMP_ADDRESSV,
Value);
/* Drop through */
case D3DRENDERSTATE_TEXTUREADDRESSU:
return IWineD3DDevice_SetSamplerState(This->wineD3DDevice,
0, WINED3DSAMP_ADDRESSU,
Value);
case D3DRENDERSTATE_TEXTUREADDRESSV:
case D3DRENDERSTATE_TEXTUREADDRESS:
{
WINED3DTEXTURESTAGESTATETYPE TexStageStateType;
if (RenderStateType == D3DRENDERSTATE_TEXTUREADDRESS)
{
TexStageStateType = WINED3DTSS_ADDRESS;
}
else if (RenderStateType == D3DRENDERSTATE_TEXTUREADDRESSU)
{
TexStageStateType = WINED3DTSS_ADDRESSU;
}
else
{
TexStageStateType = WINED3DTSS_ADDRESSV;
}
return IWineD3DDevice_SetTextureStageState(This->wineD3DDevice,
0, TexStageStateType,
Value);
}
return IWineD3DDevice_SetSamplerState(This->wineD3DDevice,
0, WINED3DSAMP_ADDRESSV,
Value);
case D3DRENDERSTATE_TEXTUREMAPBLEND:
{
......@@ -4020,11 +3997,23 @@ IDirect3DDeviceImpl_7_GetTextureStageState(IDirect3DDevice7 *iface,
Stage,
WINED3DSAMP_MAGFILTER,
State);
case D3DTSS_ADDRESS:
case D3DTSS_ADDRESSU:
return IWineD3DDevice_GetSamplerState(This->wineD3DDevice,
Stage,
WINED3DSAMP_ADDRESSU,
State);
case D3DTSS_ADDRESSV:
return IWineD3DDevice_GetSamplerState(This->wineD3DDevice,
Stage,
WINED3DSAMP_ADDRESSV,
State);
default:
return IWineD3DDevice_GetTextureStageState(This->wineD3DDevice,
Stage,
TexStageStateType,
State);
Stage,
TexStageStateType,
State);
}
}
......@@ -4103,12 +4092,28 @@ IDirect3DDeviceImpl_7_SetTextureStageState(IDirect3DDevice7 *iface,
WINED3DSAMP_MAGFILTER,
State);
case D3DTSS_ADDRESS:
IWineD3DDevice_SetSamplerState(This->wineD3DDevice,
Stage,
WINED3DSAMP_ADDRESSV,
State);
/* Drop through */
case D3DTSS_ADDRESSU:
return IWineD3DDevice_SetSamplerState(This->wineD3DDevice,
Stage,
WINED3DSAMP_ADDRESSU,
State);
case D3DTSS_ADDRESSV:
return IWineD3DDevice_SetSamplerState(This->wineD3DDevice,
Stage,
WINED3DSAMP_ADDRESSV,
State);
default:
return IWineD3DDevice_SetTextureStageState(This->wineD3DDevice,
Stage,
TexStageStateType,
State);
Stage,
TexStageStateType,
State);
}
}
......
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