ddraw: Handle stateblocks in d3d_device7_SetMaterial().

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>

ddraw: Handle stateblocks in d3d_device7_SetMaterial().
47fdb6d9 · Zebediah Figura · Alexandre Julliard · f64feb17 · 47fdb6d9
Commit 47fdb6d9 authored Oct 30, 2019 by Zebediah Figura Committed by Alexandre Julliard Oct 31, 2019
Show whitespace changes
Inline Side-by-side

Showing with 3 additions and 1 deletion

device.c dlls/ddraw/device.c +3 -1

No files found.
--- a/dlls/ddraw/device.c
+++ b/dlls/ddraw/device.c
@@ -5448,7 +5448,9 @@ static HRESULT d3d_device7_SetMaterial(IDirect3DDevice7 *iface, D3DMATERIAL7 *ma

    wined3d_mutex_lock();
    /* Note: D3DMATERIAL7 is compatible with struct wined3d_material. */
-    wined3d_device_set_material(device->wined3d_device, (struct wined3d_material *)material);
+    wined3d_stateblock_set_material(device->update_state, (const struct wined3d_material *)material);
+    if (!device->recording)
+        wined3d_device_set_material(device->wined3d_device, (const struct wined3d_material *)material);
    wined3d_mutex_unlock();

    return D3D_OK;