Henri Verbeet : d3d9: Introduce a helper to convert d3d9 sampler states to wined3d states.
Module: wine Branch: master Commit: 91a826698780e3948eebc25abfbea5f28f09c211 URL: https://source.winehq.org/git/wine.git/?a=commit;h=91a826698780e3948eebc25ab... Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Apr 2 15:23:00 2020 +0430 d3d9: Introduce a helper to convert d3d9 sampler states to wined3d states. Signed-off-by: Chip Davis <cdavis(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/device.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 511496edd1..07fb906e85 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -566,6 +566,11 @@ static enum wined3d_render_state wined3d_render_state_from_d3d(D3DRENDERSTATETYP return (enum wined3d_render_state)type; } +static enum wined3d_sampler_state wined3d_sampler_state_from_d3d(D3DSAMPLERSTATETYPE type) +{ + return (enum wined3d_sampler_state)type; +} + static void device_reset_viewport_state(struct d3d9_device *device) { struct wined3d_viewport vp; @@ -2755,7 +2760,7 @@ static HRESULT WINAPI DECLSPEC_HOTPATCH d3d9_device_SetSamplerState(IDirect3DDev sampler -= D3DVERTEXTEXTURESAMPLER0 - WINED3D_VERTEX_SAMPLER_OFFSET; wined3d_mutex_lock(); - wined3d_stateblock_set_sampler_state(device->update_state, sampler, state, value); + wined3d_stateblock_set_sampler_state(device->update_state, sampler, wined3d_sampler_state_from_d3d(state), value); wined3d_mutex_unlock(); return D3D_OK;
participants (1)
-
Alexandre Julliard