d3d9: Handle stateblocks in d3d9_device_SetVertexDeclaration().

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_SetVertexDeclaration().
3b7967cd · Zebediah Figura · Alexandre Julliard · d7eecf7f · 3b7967cd
Commit 3b7967cd authored Sep 30, 2019 by Zebediah Figura Committed by Alexandre Julliard Oct 01, 2019
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 1 deletion

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

No files found.
--- a/dlls/d3d9/device.c
+++ b/dlls/d3d9/device.c
@@ -3232,8 +3232,11 @@ static HRESULT WINAPI d3d9_device_SetVertexDeclaration(IDirect3DDevice9Ex *iface
    TRACE("iface %p, declaration %p.\n", iface, declaration);

    wined3d_mutex_lock();
-    wined3d_device_set_vertex_declaration(device->wined3d_device,
+    wined3d_stateblock_set_vertex_declaration(device->update_state,
            decl_impl ? decl_impl->wined3d_declaration : NULL);
+    if (!device->recording)
+        wined3d_device_set_vertex_declaration(device->wined3d_device,
+                decl_impl ? decl_impl->wined3d_declaration : NULL);
    device->has_vertex_declaration = !!decl_impl;
    wined3d_mutex_unlock();