From: Zebediah Figura zfigura@codeweavers.com
--- dlls/d3d9/d3d9_private.h | 1 + dlls/d3d9/surface.c | 7 +++++++ 2 files changed, 8 insertions(+)
diff --git a/dlls/d3d9/d3d9_private.h b/dlls/d3d9/d3d9_private.h index 53c73853e46..cb86ce678fb 100644 --- a/dlls/d3d9/d3d9_private.h +++ b/dlls/d3d9/d3d9_private.h @@ -176,6 +176,7 @@ struct d3d9_surface IDirect3DDevice9Ex *parent_device; IUnknown *container; struct d3d9_texture *texture; + struct wined3d_swapchain *swapchain; };
struct wined3d_rendertarget_view *d3d9_surface_acquire_rendertarget_view(struct d3d9_surface *surface) DECLSPEC_HIDDEN; diff --git a/dlls/d3d9/surface.c b/dlls/d3d9/surface.c index df94aad3c59..f0cc36da3a1 100644 --- a/dlls/d3d9/surface.c +++ b/dlls/d3d9/surface.c @@ -70,6 +70,8 @@ static ULONG WINAPI d3d9_surface_AddRef(IDirect3DSurface9 *iface) if (surface->wined3d_rtv) wined3d_rendertarget_view_incref(surface->wined3d_rtv); wined3d_texture_incref(surface->wined3d_texture); + if (surface->swapchain) + wined3d_swapchain_incref(surface->swapchain); }
return refcount; @@ -103,6 +105,10 @@ static ULONG WINAPI d3d9_surface_Release(IDirect3DSurface9 *iface)
if (surface->wined3d_rtv) wined3d_rendertarget_view_decref(surface->wined3d_rtv); + if (surface->swapchain) + wined3d_swapchain_decref(surface->swapchain); + /* Releasing the texture may free the d3d9 object, so do not access it + * after releasing the texture. */ wined3d_texture_decref(surface->wined3d_texture);
/* Release the device last, as it may cause the device to be destroyed. */ @@ -363,6 +369,7 @@ struct d3d9_surface *d3d9_surface_create(struct wined3d_texture *wined3d_texture surface->container = container; surface->wined3d_texture = wined3d_texture; surface->sub_resource_idx = sub_resource_idx; + surface->swapchain = wined3d_texture_get_swapchain(wined3d_texture);
if (surface->container && SUCCEEDED(IUnknown_QueryInterface(surface->container, &IID_IDirect3DBaseTexture9, (void **)&texture)))