wined3d: Do not modify depth test state in wined3d_device_init_3d().

We do not want to automagically disable depth test for D3D10+. Signed-off-by: Józef Kucia <jkucia@codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>

wined3d: Do not modify depth test state in wined3d_device_init_3d().
15824c07 · Józef Kucia · Alexandre Julliard · ad0ad75b · 15824c07
Commit 15824c07 authored Dec 06, 2017 by Józef Kucia Committed by Alexandre Julliard Dec 06, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 2 deletions

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

No files found.
--- a/dlls/wined3d/device.c
+++ b/dlls/wined3d/device.c
@@ -949,7 +949,7 @@ void CDECL wined3d_device_release_focus_window(struct wined3d_device *device)

 static void device_init_swapchain_state(struct wined3d_device *device, struct wined3d_swapchain *swapchain)
 {
-    BOOL ds_enable = !!swapchain->desc.enable_auto_depth_stencil;
+    BOOL ds_enable = swapchain->desc.enable_auto_depth_stencil;
    unsigned int i;

    if (device->fb.render_targets)
@@ -963,7 +963,6 @@ static void device_init_swapchain_state(struct wined3d_device *device, struct wi
    }

    wined3d_device_set_depth_stencil_view(device, ds_enable ? device->auto_depth_stencil_view : NULL);
-    wined3d_device_set_render_state(device, WINED3D_RS_ZENABLE, ds_enable);
 }

 static void wined3d_device_delete_opengl_contexts_cs(void *object)
@@ -4881,6 +4880,8 @@ HRESULT CDECL wined3d_device_reset(struct wined3d_device *device,
        device->update_state = &device->state;

        device_init_swapchain_state(device, swapchain);
+        wined3d_device_set_render_state(device,
+                WINED3D_RS_ZENABLE, !!swapchain->desc.enable_auto_depth_stencil);
        if (wined3d_settings.logo)
            device_load_logo(device, wined3d_settings.logo);
    }