d3d8: Handle stateblocks in d3d8_device_SetTexture().

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_SetTexture().
6f97c24b · Zebediah Figura · Alexandre Julliard · 95545a66 · 6f97c24b
Commit 6f97c24b authored Oct 24, 2019 by Zebediah Figura Committed by Alexandre Julliard Oct 28, 2019
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 1 deletion

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

No files found.
--- a/dlls/d3d8/device.c
+++ b/dlls/d3d8/device.c
@@ -2135,8 +2135,11 @@ static HRESULT WINAPI d3d8_device_SetTexture(IDirect3DDevice8 *iface, DWORD stag
    texture_impl = unsafe_impl_from_IDirect3DBaseTexture8(texture);

    wined3d_mutex_lock();
-    wined3d_device_set_texture(device->wined3d_device, stage,
+    wined3d_stateblock_set_texture(device->update_state, stage,
            texture_impl ? texture_impl->wined3d_texture : NULL);
+    if (!device->recording)
+        wined3d_device_set_texture(device->wined3d_device, stage,
+                texture_impl ? texture_impl->wined3d_texture : NULL);
    wined3d_mutex_unlock();

    return D3D_OK;