Zebediah Figura : d3d9: Handle stateblocks in d3d9_device_SetFVF().

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 157aac1b2302786c2e4368bfdee7ea90292a3ded
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=157aac1b2302786c2e4368bfd...

Author: Zebediah Figura <z.figura12(a)gmail.com>
Date:   Mon Sep 30 20:28:34 2019 -0500

d3d9: Handle stateblocks in d3d9_device_SetFVF().

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

---

 dlls/d3d9/device.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c
index 7d24703795..26b1b982f8 100644
--- 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();