Zebediah Figura : wined3d: Remove stateblock handling from wined3d_device_set_sampler().
Alexandre Julliard
julliard at winehq.org
Thu Jan 24 14:42:53 CST 2019
Module: wine
Branch: master
Commit: 7bb0d2d4e87c0290935da50c3fc79677f7ce3c4c
URL: https://source.winehq.org/git/wine.git/?a=commit;h=7bb0d2d4e87c0290935da50c3fc79677f7ce3c4c
Author: Zebediah Figura <z.figura12 at gmail.com>
Date: Wed Jan 23 23:30:50 2019 -0600
wined3d: Remove stateblock handling from wined3d_device_set_sampler().
Signed-off-by: Zebediah Figura <z.figura12 at gmail.com>
Signed-off-by: Henri Verbeet <hverbeet at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
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 4fa935f..c910e83 100644
--- a/dlls/wined3d/device.c
+++ b/dlls/wined3d/device.c
@@ -2337,15 +2337,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);
}
More information about the wine-cvs
mailing list