From: Riccardo Bortolato Subject: [v5 (rebased) 5/5] wined3d: Call wined3d_texture_decref() instead of wined3d_surface_decref() from surface_resource_decref(). Message-Id: <1453920354-24353-5-git-send-email-rikyz619@gmail.com> Date: Wed, 27 Jan 2016 19:45:54 +0100 In-Reply-To: <1453920354-24353-1-git-send-email-rikyz619@gmail.com> References: <1453920354-24353-1-git-send-email-rikyz619@gmail.com> Removed the now unused wined3d_surface_decref(). Signed-off-by: Riccardo Bortolato --- dlls/wined3d/surface.c | 13 +++++-------- dlls/wined3d/wined3d.spec | 1 - include/wine/wined3d.h | 1 - 3 files changed, 5 insertions(+), 10 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 9fb7ac8..fa95aef 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1102,7 +1102,11 @@ static ULONG surface_resource_incref(struct wined3d_resource *resource) static ULONG surface_resource_decref(struct wined3d_resource *resource) { - return wined3d_surface_decref(surface_from_resource(resource)); + struct wined3d_surface *surface = surface_from_resource(resource); + + TRACE("surface %p, container %p.\n", surface, surface->container); + + return wined3d_texture_decref(surface->container); } static void surface_unload(struct wined3d_resource *resource) @@ -1863,13 +1867,6 @@ static inline unsigned short float_32_to_16(const float *in) return ret; } -ULONG CDECL wined3d_surface_decref(struct wined3d_surface *surface) -{ - TRACE("surface %p, container %p.\n", surface, surface->container); - - return wined3d_texture_decref(surface->container); -} - void CDECL wined3d_surface_preload(struct wined3d_surface *surface) { TRACE("surface %p.\n", surface); diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index 146b618..cd8174c 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -223,7 +223,6 @@ @ cdecl wined3d_stateblock_incref(ptr) @ cdecl wined3d_surface_blt(ptr ptr ptr ptr long ptr long) -@ cdecl wined3d_surface_decref(ptr) @ cdecl wined3d_surface_from_resource(ptr) @ cdecl wined3d_surface_get_overlay_position(ptr ptr ptr) @ cdecl wined3d_surface_get_parent(ptr) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index c156ed5..bd0a9c7 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2475,7 +2475,6 @@ ULONG __cdecl wined3d_stateblock_incref(struct wined3d_stateblock *stateblock); HRESULT __cdecl wined3d_surface_blt(struct wined3d_surface *dst_surface, const RECT *dst_rect, struct wined3d_surface *src_surface, const RECT *src_rect, DWORD flags, const WINEDDBLTFX *blt_fx, enum wined3d_texture_filter_type filter); -ULONG __cdecl wined3d_surface_decref(struct wined3d_surface *surface); struct wined3d_surface * __cdecl wined3d_surface_from_resource(struct wined3d_resource *resource); HRESULT __cdecl wined3d_surface_get_overlay_position(const struct wined3d_surface *surface, LONG *x, LONG *y); void * __cdecl wined3d_surface_get_parent(const struct wined3d_surface *surface); -- 1.9.1