From f8c01e7a96aed4e64eab11acbae8aef70c8e7cbe Mon Sep 17 00:00:00 2001 From: Patrick Rudolph Date: Fri, 23 Sep 2016 17:55:08 +0200 Subject: st/nine: Use NineDevice9_CreateDepthStencilSurface in swapchain9 Replace custom code with NineDevice9_CreateDepthStencilSurface. All functionality is given now. --- src/gallium/state_trackers/nine/swapchain9.c | 30 ++++++++++++++++------------ 1 file changed, 17 insertions(+), 13 deletions(-) (limited to 'src') diff --git a/src/gallium/state_trackers/nine/swapchain9.c b/src/gallium/state_trackers/nine/swapchain9.c index 37e433ff746..9459786c6cf 100644 --- a/src/gallium/state_trackers/nine/swapchain9.c +++ b/src/gallium/state_trackers/nine/swapchain9.c @@ -353,27 +353,31 @@ NineSwapChain9_Resize( struct NineSwapChain9 *This, if (tmplt.format == PIPE_FORMAT_NONE) return D3DERR_INVALIDCALL; - resource = This->screen->resource_create(This->screen, &tmplt); - if (!resource) { - DBG("Failed to create pipe_resource for depth buffer.\n"); - return D3DERR_OUTOFVIDEOMEMORY; - } if (This->zsbuf) { + resource = This->screen->resource_create(This->screen, &tmplt); + if (!resource) { + DBG("Failed to create pipe_resource for depth buffer.\n"); + return D3DERR_OUTOFVIDEOMEMORY; + } + NineSurface9_SetMultiSampleType(This->zsbuf, desc.MultiSampleType); NineSurface9_SetResourceResize(This->zsbuf, resource); pipe_resource_reference(&resource, NULL); } else { - /* XXX wine thinks the container of this should be the device */ - desc.Format = pParams->AutoDepthStencilFormat; - desc.Usage = D3DUSAGE_DEPTHSTENCIL; - hr = NineSurface9_new(pDevice, NineUnknown(pDevice), resource, NULL, 0, - 0, 0, &desc, &This->zsbuf); - pipe_resource_reference(&resource, NULL); + hr = NineDevice9_CreateDepthStencilSurface(pDevice, + pParams->BackBufferWidth, + pParams->BackBufferHeight, + pParams->AutoDepthStencilFormat, + pParams->MultiSampleType, + pParams->MultiSampleQuality, + 0, + (IDirect3DSurface9 **)&This->zsbuf, + NULL); if (FAILED(hr)) { DBG("Failed to create ZS surface.\n"); return hr; } - This->zsbuf->base.base.forward = FALSE; + NineUnknown_ConvertRefToBind(NineUnknown(This->zsbuf)); } } @@ -493,7 +497,7 @@ NineSwapChain9_dtor( struct NineSwapChain9 *This ) } } if (This->zsbuf) - NineUnknown_Destroy(NineUnknown(This->zsbuf)); + NineUnknown_Unbind(NineUnknown(This->zsbuf)); if (This->present) ID3DPresent_Release(This->present); -- cgit v1.2.3