Module: wine Branch: master Commit: 15824c0704d4de54959218a94bc001ddde5aa91d URL: http://source.winehq.org/git/wine.git/?a=commit;h=15824c0704d4de54959218a94b...
Author: Józef Kucia jkucia@codeweavers.com Date: Wed Dec 6 11:00:38 2017 +0100
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
---
dlls/wined3d/device.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index d57758d..2655702 100644 --- 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); }