d3d8: Handle stateblocks in d3d8_device_SetVertexShader().

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>

d3d8: Handle stateblocks in d3d8_device_SetVertexShader().
41f0096d · Zebediah Figura · Alexandre Julliard · 157aac1b · 41f0096d
Commit 41f0096d authored Sep 30, 2019 by Zebediah Figura Committed by Alexandre Julliard Oct 01, 2019
Hide whitespace changes
Inline Side-by-side

Showing with 16 additions and 4 deletions

device.c dlls/d3d8/device.c +16 -4

No files found.
--- a/dlls/d3d8/device.c
+++ b/dlls/d3d8/device.c
@@ -2814,9 +2814,15 @@ static HRESULT WINAPI d3d8_device_SetVertexShader(IDirect3DDevice8 *iface, DWORD
        TRACE("Setting FVF, %#x\n", shader);

        wined3d_mutex_lock();
-        wined3d_device_set_vertex_declaration(device->wined3d_device,
+        wined3d_stateblock_set_vertex_declaration(device->update_state,
                d3d8_device_get_fvf_declaration(device, shader)->wined3d_vertex_declaration);
-        wined3d_device_set_vertex_shader(device->wined3d_device, NULL);
+        wined3d_stateblock_set_vertex_shader(device->update_state, NULL);
+        if (!device->recording)
+        {
+            wined3d_device_set_vertex_declaration(device->wined3d_device,
+                    d3d8_device_get_fvf_declaration(device, shader)->wined3d_vertex_declaration);
+            wined3d_device_set_vertex_shader(device->wined3d_device, NULL);
+        }
        wined3d_mutex_unlock();

        return D3D_OK;
@@ -2833,9 +2839,15 @@ static HRESULT WINAPI d3d8_device_SetVertexShader(IDirect3DDevice8 *iface, DWORD
        return D3DERR_INVALIDCALL;
    }

-    wined3d_device_set_vertex_declaration(device->wined3d_device,
+    wined3d_stateblock_set_vertex_declaration(device->update_state,
            shader_impl->vertex_declaration->wined3d_vertex_declaration);
-    wined3d_device_set_vertex_shader(device->wined3d_device, shader_impl->wined3d_shader);
+    wined3d_stateblock_set_vertex_shader(device->update_state, shader_impl->wined3d_shader);
+    if (!device->recording)
+    {
+        wined3d_device_set_vertex_declaration(device->wined3d_device,
+                shader_impl->vertex_declaration->wined3d_vertex_declaration);
+        wined3d_device_set_vertex_shader(device->wined3d_device, shader_impl->wined3d_shader);
+    }
    wined3d_mutex_unlock();

    return D3D_OK;