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

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 12439d3d00b1b2118bd8f459cd3d39c6a41a872b
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=12439d3d00b1b2118bd8f459c...

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

d3d9: Handle stateblocks in d3d9_device_SetVertexShader().

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 | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c
index faf4cb7ea6..6917ad577c 100644
--- a/dlls/d3d9/device.c
+++ b/dlls/d3d9/device.c
@@ -3422,8 +3422,11 @@ static HRESULT WINAPI d3d9_device_SetVertexShader(IDirect3DDevice9Ex *iface, IDi
     TRACE("iface %p, shader %p.\n", iface, shader);
 
     wined3d_mutex_lock();
-    wined3d_device_set_vertex_shader(device->wined3d_device,
+    wined3d_stateblock_set_vertex_shader(device->update_state,
             shader_obj ? shader_obj->wined3d_shader : NULL);
+    if (!device->recording)
+        wined3d_device_set_vertex_shader(device->wined3d_device,
+                shader_obj ? shader_obj->wined3d_shader : NULL);
     wined3d_mutex_unlock();
 
     return D3D_OK;