d3d9: Handle stateblocks in d3d9_device_SetFVF().

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>

d3d9: Handle stateblocks in d3d9_device_SetFVF().
157aac1b · Zebediah Figura · Alexandre Julliard · 3b7967cd · 157aac1b
Commit 157aac1b authored Sep 30, 2019 by Zebediah Figura Committed by Alexandre Julliard Oct 01, 2019
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 1 deletion

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

No files found.
--- a/dlls/d3d9/device.c
+++ b/dlls/d3d9/device.c
@@ -3359,7 +3359,9 @@ static HRESULT WINAPI d3d9_device_SetFVF(IDirect3DDevice9Ex *iface, DWORD fvf)
        return D3DERR_DRIVERINTERNALERROR;
    }

-    wined3d_device_set_vertex_declaration(device->wined3d_device, decl);
+    wined3d_stateblock_set_vertex_declaration(device->update_state, decl);
+    if (!device->recording)
+        wined3d_device_set_vertex_declaration(device->wined3d_device, decl);
    device->has_vertex_declaration = TRUE;
    wined3d_mutex_unlock();