wined3d: Also reset the device state to the default in wined3d_device_uninit_3d().

Fixes a regression introduced by 96547e62. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48072Signed-off-by: Zebediah Figura <z.figura12@gmail.com> Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>

wined3d: Also reset the device state to the default in wined3d_device_uninit_3d().
7b1581a7 · Zebediah Figura · Alexandre Julliard · bfb901c6 · 7b1581a7 · 7b1581a7
Commit 7b1581a7 authored Nov 15, 2019 by Zebediah Figura Committed by Alexandre Julliard Nov 15, 2019
Show whitespace changes
Inline Side-by-side

Showing with 5 additions and 3 deletions

ddraw2.c dlls/ddraw/tests/ddraw2.c +1 -1

ddraw4.c dlls/ddraw/tests/ddraw4.c +1 -1

ddraw7.c dlls/ddraw/tests/ddraw7.c +1 -1

device.c dlls/wined3d/device.c +2 -0

No files found.
--- a/dlls/ddraw/tests/ddraw2.c
+++ b/dlls/ddraw/tests/ddraw2.c
@@ -1012,7 +1012,7 @@ static void test_coop_level_d3d_state(void)
    hr = IDirect3DDevice2_EndScene(device);
    ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr);
    color = get_surface_color(rt, 320, 240);
-    todo_wine ok(compare_color(color, 0x0000ff80, 1), "Got unexpected color 0x%08x.\n", color);
+    ok(compare_color(color, 0x0000ff80, 1), "Got unexpected color 0x%08x.\n", color);

    destroy_viewport(device, viewport);
    destroy_material(background);

--- a/dlls/ddraw/tests/ddraw4.c
+++ b/dlls/ddraw/tests/ddraw4.c
@@ -1197,7 +1197,7 @@ static void test_coop_level_d3d_state(void)
    hr = IDirect3DDevice3_EndScene(device);
    ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr);
    color = get_surface_color(rt, 320, 240);
-    todo_wine ok(compare_color(color, 0x0000ff80, 1), "Got unexpected color 0x%08x.\n", color);
+    ok(compare_color(color, 0x0000ff80, 1), "Got unexpected color 0x%08x.\n", color);

    destroy_viewport(device, viewport);
    IDirectDrawSurface4_Release(surface);

--- a/dlls/ddraw/tests/ddraw7.c
+++ b/dlls/ddraw/tests/ddraw7.c
@@ -1099,7 +1099,7 @@ static void test_coop_level_d3d_state(void)
    hr = IDirect3DDevice7_EndScene(device);
    ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr);
    color = get_surface_color(rt, 320, 240);
-    todo_wine ok(compare_color(color, 0x0000ff80, 1), "Got unexpected color 0x%08x.\n", color);
+    ok(compare_color(color, 0x0000ff80, 1), "Got unexpected color 0x%08x.\n", color);

    IDirectDrawSurface7_Release(surface);
    IDirectDrawSurface7_Release(rt);

--- a/dlls/wined3d/device.c
+++ b/dlls/wined3d/device.c
@@ -1142,6 +1142,8 @@ void wined3d_device_uninit_3d(struct wined3d_device *device)

    wined3d_cs_emit_reset_state(device->cs);
    state_cleanup(&device->state);
+    memset(&device->state, 0, sizeof(device->state));
+    state_init(&device->state, &device->fb, &device->adapter->d3d_info, WINED3D_STATE_INIT_DEFAULT);
    for (i = 0; i < device->adapter->d3d_info.limits.max_rt_count; ++i)
    {
        wined3d_device_set_rendertarget_view(device, i, NULL, FALSE);