ddraw: Correctly apply state when multiple devices are used.

CW-Bug-Id: #24604

Author: Paul Gofman

dlls/ddraw/ddraw_private.h

@@ -118,6 +118,7 @@ struct ddraw
     /* D3D things */
     HWND                    d3d_window;
     struct list             d3ddevice_list;
+    struct d3d_device      *device_last_applied_state;
     int                     d3dversion;
 
     /* Various HWNDs */

dlls/ddraw/device.c

@@ -325,6 +325,9 @@ static ULONG WINAPI d3d_device_inner_Release(IUnknown *iface)
         if (This->recording)
             wined3d_stateblock_decref(This->recording);
 
+        if (This->ddraw->device_last_applied_state == This)
+            This->ddraw->device_last_applied_state = NULL;
+
         /* Releasing the render target below may release the last reference to the ddraw object. Detach
          * the device from it before so it doesn't try to save / restore state on the teared down device. */
         if (This->ddraw)
@@ -3441,6 +3444,11 @@ void d3d_device_sync_surfaces(struct d3d_device *device)
 
 static void d3d_device_apply_state(struct d3d_device *device)
 {
+    if (device->ddraw->device_last_applied_state != device)
+    {
+        wined3d_stateblock_savedstates_set_all(device->wined3d_device, device->state);
+        device->ddraw->device_last_applied_state = device;
+    }
     wined3d_device_apply_stateblock(device->wined3d_device, device->state);
     d3d_device_sync_surfaces(device);
 }

dlls/wined3d/stateblock.c

@@ -286,6 +286,13 @@ static void stateblock_savedstates_set_all(struct wined3d_saved_states *states,
     memset(states->vs_consts_f, 0xffu, sizeof(states->vs_consts_f));
 }
 
+void CDECL wined3d_stateblock_savedstates_set_all(struct wined3d_device *device, struct wined3d_stateblock *stateblock)
+{
+    const struct wined3d_d3d_info *d3d_info = &device->adapter->d3d_info;
+
+    stateblock_savedstates_set_all(&stateblock->changed, d3d_info->limits.vs_uniform_count, d3d_info->limits.ps_uniform_count);
+}
+
 static void stateblock_savedstates_set_pixel(struct wined3d_saved_states *states, const DWORD num_constants)
 {
     DWORD texture_mask = 0;

dlls/wined3d/wined3d.spec

@@ -243,6 +243,7 @@
 @ cdecl wined3d_stateblock_init_contained_states(ptr)
 @ cdecl wined3d_stateblock_multiply_transform(ptr long ptr)
 @ cdecl wined3d_stateblock_reset(ptr)
+@ cdecl wined3d_stateblock_savedstates_set_all(ptr ptr)
 @ cdecl wined3d_stateblock_set_base_vertex_index(ptr long)
 @ cdecl wined3d_stateblock_set_clip_plane(ptr long ptr)
 @ cdecl wined3d_stateblock_set_index_buffer(ptr ptr long)

include/wine/wined3d.h

@@ -2368,6 +2368,8 @@ ULONG __cdecl wined3d_depth_stencil_state_incref(struct wined3d_depth_stencil_st
 
 HRESULT __cdecl wined3d_device_acquire_focus_window(struct wined3d_device *device, HWND window);
 void __cdecl wined3d_device_apply_stateblock(struct wined3d_device *device, struct wined3d_stateblock *stateblock);
+void __cdecl wined3d_stateblock_savedstates_set_all(struct wined3d_device *device, struct wined3d_stateblock *stateblock);
+
 HRESULT __cdecl wined3d_device_begin_scene(struct wined3d_device *device);
 HRESULT __cdecl wined3d_device_clear(struct wined3d_device *device, unsigned int rect_count, const RECT *rects,
         uint32_t flags, const struct wined3d_color *color, float z, unsigned int stencil);