[PATCH 1/3] d3d9: Track WINED3D_RS_ZENABLE in the primary stateblock.
Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/d3d9/device.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index ec1800a6492..5ef0c9cdf66 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -1007,6 +1007,8 @@ static HRESULT d3d9_device_reset(struct d3d9_device *device, if (!extended) { device->auto_mipmaps = 0; + wined3d_stateblock_set_render_state(device->state, WINED3D_RS_ZENABLE, + !!swapchain_desc.enable_auto_depth_stencil); wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_ZENABLE, !!swapchain_desc.enable_auto_depth_stencil); } @@ -4630,6 +4632,8 @@ HRESULT device_init(struct d3d9_device *device, struct d3d9 *parent, struct wine wined3d_swapchain_incref(d3d_swapchain->wined3d_swapchain); IDirect3DSwapChain9Ex_Release(&d3d_swapchain->IDirect3DSwapChain9Ex_iface); + wined3d_stateblock_set_render_state(device->state, WINED3D_RS_ZENABLE, + !!swapchain_desc->enable_auto_depth_stencil); wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_ZENABLE, !!swapchain_desc->enable_auto_depth_stencil); -- 2.23.0
Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/d3d8/device.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index 92b67b92740..17d8a726c75 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -922,6 +922,9 @@ static HRESULT WINAPI d3d8_device_Reset(IDirect3DDevice8 *iface, implicit_swapchain = wined3d_swapchain_get_parent(device->implicit_swapchain); implicit_swapchain->swap_interval = wined3dswapinterval_from_d3d(present_parameters->FullScreen_PresentationInterval); + wined3d_stateblock_set_render_state(device->state, WINED3D_RS_POINTSIZE_MIN, 0); + wined3d_stateblock_set_render_state(device->state, WINED3D_RS_ZENABLE, + !!swapchain_desc.enable_auto_depth_stencil); wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_POINTSIZE_MIN, 0); wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_ZENABLE, !!swapchain_desc.enable_auto_depth_stencil); @@ -3710,6 +3713,9 @@ HRESULT device_init(struct d3d8_device *device, struct d3d8 *parent, struct wine wined3d_swapchain_incref(wined3d_swapchain); IDirect3DSwapChain8_Release(&d3d_swapchain->IDirect3DSwapChain8_iface); + wined3d_stateblock_set_render_state(device->state, WINED3D_RS_ZENABLE, + !!swapchain_desc.enable_auto_depth_stencil); + wined3d_stateblock_set_render_state(device->state, WINED3D_RS_POINTSIZE_MIN, 0); wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_ZENABLE, !!swapchain_desc.enable_auto_depth_stencil); wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_POINTSIZE_MIN, 0); -- 2.23.0
Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com>
Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/ddraw/device.c | 2 ++ dlls/ddraw/surface.c | 2 ++ 2 files changed, 4 insertions(+) diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index cdb2e9c2ba9..4ad1fdb7f57 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -7025,6 +7025,8 @@ static HRESULT d3d_device_init(struct d3d_device *device, struct ddraw *ddraw, ddraw->d3ddevice = device; + wined3d_stateblock_set_render_state(ddraw->state, WINED3D_RS_ZENABLE, + d3d_device_update_depth_stencil(device)); wined3d_device_set_render_state(ddraw->wined3d_device, WINED3D_RS_ZENABLE, d3d_device_update_depth_stencil(device)); if (version == 1) /* Color keying is initially enabled for version 1 devices. */ diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index 89e5024c0ef..fda42f2982f 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -6085,6 +6085,8 @@ HRESULT ddraw_surface_create(struct ddraw *ddraw, const DDSURFACEDESC2 *surface_ return hr_ddraw_from_wined3d(hr); } + wined3d_stateblock_set_render_state(ddraw->state, WINED3D_RS_ZENABLE, + !!swapchain_desc.enable_auto_depth_stencil); wined3d_device_set_render_state(ddraw->wined3d_device, WINED3D_RS_ZENABLE, !!swapchain_desc.enable_auto_depth_stencil); } -- 2.23.0
Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com>
Hi, While running your changed tests, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at: https://testbot.winehq.org/JobDetails.pl?Key=60304 Your paranoid android. === debian10 (32 bit Chinese:China report) === d3d9: device.c:10513: Test failed: second window has pixel format 5, expected 1
participants (3)
-
Henri Verbeet -
Marvin -
Zebediah Figura