[v4 4/5] wined3d: Call wined3d_texture_incref() instead of wined3d_surface_incref() from surface_resource_incref().

[Riccardo Bortolato]

Removed the now unused wined3d_surface_incref() completely.

Signed-off-by: Riccardo Bortolato <rikyz619 at gmail.com>
---
 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 db33791..f077be5 100644
--- a/dlls/wined3d/surface.c
+++ b/dlls/wined3d/surface.c
@@ -1093,7 +1093,11 @@ static void surface_remove_pbo(struct wined3d_surface *surface, const struct win
 
 static ULONG surface_resource_incref(struct wined3d_resource *resource)
 {
-    return wined3d_surface_incref(surface_from_resource(resource));
+    struct wined3d_surface *surface = surface_from_resource(resource);
+
+    TRACE("surface %p, container %p.\n", surface, surface->container);
+
+    return wined3d_texture_incref(surface->container);
 }
 
 static ULONG surface_resource_decref(struct wined3d_resource *resource)
@@ -1859,13 +1863,6 @@ static inline unsigned short float_32_to_16(const float *in)
     return ret;
 }
 
-ULONG CDECL wined3d_surface_incref(struct wined3d_surface *surface)
-{
-    TRACE("surface %p, container %p.\n", surface, surface->container);
-
-    return wined3d_texture_incref(surface->container);
-}
-
 ULONG CDECL wined3d_surface_decref(struct wined3d_surface *surface)
 {
     TRACE("surface %p, container %p.\n", surface, surface->container);
diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec
index c09e0a6..146b618 100644
--- a/dlls/wined3d/wined3d.spec
+++ b/dlls/wined3d/wined3d.spec
@@ -230,7 +230,6 @@
 @ cdecl wined3d_surface_get_pitch(ptr)
 @ cdecl wined3d_surface_get_resource(ptr)
 @ cdecl wined3d_surface_getdc(ptr ptr)
-@ cdecl wined3d_surface_incref(ptr)
 @ cdecl wined3d_surface_map(ptr ptr ptr long)
 @ cdecl wined3d_surface_preload(ptr)
 @ cdecl wined3d_surface_releasedc(ptr ptr)
diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h
index 300b322..8957cfb 100644
--- a/include/wine/wined3d.h
+++ b/include/wine/wined3d.h
@@ -2481,7 +2481,6 @@ void * __cdecl wined3d_surface_get_parent(const struct wined3d_surface *surface)
 DWORD __cdecl wined3d_surface_get_pitch(const struct wined3d_surface *surface);
 struct wined3d_resource * __cdecl wined3d_surface_get_resource(struct wined3d_surface *surface);
 HRESULT __cdecl wined3d_surface_getdc(struct wined3d_surface *surface, HDC *dc);
-ULONG __cdecl wined3d_surface_incref(struct wined3d_surface *surface);
 HRESULT __cdecl wined3d_surface_map(struct wined3d_surface *surface,
         struct wined3d_map_desc *map_desc, const struct wined3d_box *box, DWORD flags);
 void __cdecl wined3d_surface_preload(struct wined3d_surface *surface);
-- 
1.9.1