wined3d: Remove stateblock handling from wined3d_device_set_sampler().

Signed-off-by: Zebediah Figura <z.figura12@gmail.com> Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>

wined3d: Remove stateblock handling from wined3d_device_set_sampler().
7bb0d2d4 · Zebediah Figura · Alexandre Julliard · 8e70ce08 · 7bb0d2d4
Commit 7bb0d2d4 authored Jan 23, 2019 by Zebediah Figura Committed by Alexandre Julliard Jan 24, 2019
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 4 deletions

device.c dlls/wined3d/device.c +3 -4

No files found.
--- 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);
 }