[PATCH 3/6] d3d9: Retrieve sampler states from the primary stateblock.
Zebediah Figura
z.figura12 at gmail.com
Tue Feb 11 19:19:15 CST 2020
Signed-off-by: Zebediah Figura <z.figura12 at gmail.com>
---
dlls/d3d9/device.c | 16 +++++++++++++---
1 file changed, 13 insertions(+), 3 deletions(-)
diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c
index 6df43ccb66..730032755e 100644
--- a/dlls/d3d9/device.c
+++ b/dlls/d3d9/device.c
@@ -2660,14 +2660,24 @@ static HRESULT WINAPI d3d9_device_SetTextureStageState(IDirect3DDevice9Ex *iface
}
static HRESULT WINAPI d3d9_device_GetSamplerState(IDirect3DDevice9Ex *iface,
- DWORD sampler, D3DSAMPLERSTATETYPE state, DWORD *value)
+ DWORD sampler_idx, D3DSAMPLERSTATETYPE state, DWORD *value)
{
struct d3d9_device *device = impl_from_IDirect3DDevice9Ex(iface);
- TRACE("iface %p, sampler %u, state %#x, value %p.\n", iface, sampler, state, value);
+ TRACE("iface %p, sampler_idx %u, state %#x, value %p.\n", iface, sampler_idx, state, value);
+
+ if (sampler_idx >= WINED3DVERTEXTEXTURESAMPLER0 && sampler_idx <= WINED3DVERTEXTEXTURESAMPLER3)
+ sampler_idx -= (WINED3DVERTEXTEXTURESAMPLER0 - WINED3D_MAX_FRAGMENT_SAMPLERS);
+
+ if (sampler_idx >= WINED3D_MAX_COMBINED_SAMPLERS)
+ {
+ WARN("Invalid sampler %u.\n", sampler_idx);
+ *value = 0;
+ return D3D_OK;
+ }
wined3d_mutex_lock();
- *value = wined3d_device_get_sampler_state(device->wined3d_device, sampler, state);
+ *value = wined3d_stateblock_get_state(device->state)->sampler_states[sampler_idx][state];
wined3d_mutex_unlock();
return D3D_OK;
--
2.25.0
More information about the wine-devel
mailing list