Henri Verbeet : wined3d: Unset the depth/ stencil surface before checking resources in wined3d_device_reset().
Alexandre Julliard
julliard at winehq.org
Mon Jun 18 15:00:25 CDT 2012
Module: wine
Branch: master
Commit: 130f232d2049cab5fcdf2c773a7255ff94cc6d33
URL: http://source.winehq.org/git/wine.git/?a=commit;h=130f232d2049cab5fcdf2c773a7255ff94cc6d33
Author: Henri Verbeet <hverbeet at codeweavers.com>
Date: Mon Jun 18 17:19:38 2012 +0200
wined3d: Unset the depth/stencil surface before checking resources in wined3d_device_reset().
---
dlls/wined3d/device.c | 3 +--
1 files changed, 1 insertions(+), 2 deletions(-)
diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c
index be22421..c934ced 100644
--- a/dlls/wined3d/device.c
+++ b/dlls/wined3d/device.c
@@ -5254,6 +5254,7 @@ HRESULT CDECL wined3d_device_reset(struct wined3d_device *device,
TRACE("device %p, swapchain_desc %p.\n", device, swapchain_desc);
stateblock_unbind_resources(device->stateBlock);
+ wined3d_device_set_depth_stencil(device, NULL);
if (device->onscreen_depth_stencil)
{
@@ -5362,8 +5363,6 @@ HRESULT CDECL wined3d_device_reset(struct wined3d_device *device,
/* Reset the depth stencil */
if (swapchain_desc->enable_auto_depth_stencil)
wined3d_device_set_depth_stencil(device, device->auto_depth_stencil);
- else
- wined3d_device_set_depth_stencil(device, NULL);
TRACE("Resetting stateblock\n");
wined3d_stateblock_decref(device->updateStateBlock);
More information about the wine-cvs
mailing list