[PATCH 2/5] wined3d: Remove stateblock handling from wined3d_device_set_sampler().
Zebediah Figura
z.figura12 at gmail.com
Wed Jan 23 23:30:50 CST 2019
Signed-off-by: Zebediah Figura <z.figura12 at gmail.com>
---
dlls/wined3d/device.c | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c
index a399d24065..a44d15f0f8 100644
--- a/dlls/wined3d/device.c
+++ b/dlls/wined3d/device.c
@@ -2342,15 +2342,14 @@ static void wined3d_device_set_sampler(struct wined3d_device *device,
return;
}
- prev = device->update_state->sampler[type][idx];
+ prev = device->state.sampler[type][idx];
if (sampler == prev)
return;
if (sampler)
wined3d_sampler_incref(sampler);
- device->update_state->sampler[type][idx] = sampler;
- if (!device->recording)
- wined3d_cs_emit_set_sampler(device->cs, type, idx, sampler);
+ device->state.sampler[type][idx] = sampler;
+ wined3d_cs_emit_set_sampler(device->cs, type, idx, sampler);
if (prev)
wined3d_sampler_decref(prev);
}
--
2.17.1
More information about the wine-devel
mailing list