Riccardo Bortolato : wined3d: Merge wined3d_volume_{inc, dec}ref in their respective caller.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: cee9409ab857593f04c9709c8a20c5bac80f2934
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=cee9409ab857593f04c9709c8a...

Author: Riccardo Bortolato 
Date:   Wed Oct  7 19:04:35 2015 +0200

wined3d: Merge wined3d_volume_{inc, dec}ref in their respective caller.

Signed-off-by: Riccardo Bortolato 
Signed-off-by: Henri Verbeet 
Signed-off-by: Alexandre Julliard

---

dlls/wined3d/volume.c | 24 ++++++++----------------
 1 file changed, 8 insertions(+), 16 deletions(-)

diff --git a/dlls/wined3d/volume.c b/dlls/wined3d/volume.c
index 6a7cc5c..41264e8 100644
--- a/dlls/wined3d/volume.c
+++ b/dlls/wined3d/volume.c
@@ -460,20 +460,6 @@ static void volume_unload(struct wined3d_resource *resource)
     resource_unload(resource);
 }

-static ULONG CDECL wined3d_volume_incref(struct wined3d_volume *volume)
-{
-    TRACE("Forwarding to container %p.\n", volume->container);
-
-    return wined3d_texture_incref(volume->container);
-}
-
-static ULONG CDECL wined3d_volume_decref(struct wined3d_volume *volume)
-{
-    TRACE("Forwarding to container %p.\n", volume->container);
-
-    return wined3d_texture_decref(volume->container);
-}
-
 static BOOL volume_check_block_align(const struct wined3d_volume *volume,
         const struct wined3d_box *box)
 {
@@ -700,12 +686,18 @@ HRESULT wined3d_volume_unmap(struct wined3d_volume *volume)

static ULONG volume_resource_incref(struct wined3d_resource *resource)
 {
-    return wined3d_volume_incref(volume_from_resource(resource));
+    struct wined3d_volume *volume = volume_from_resource(resource);
+    TRACE("Forwarding to container %p.\n", volume->container);
+
+    return wined3d_texture_incref(volume->container);
 }

static ULONG volume_resource_decref(struct wined3d_resource *resource)
 {
-    return wined3d_volume_decref(volume_from_resource(resource));
+    struct wined3d_volume *volume = volume_from_resource(resource);
+    TRACE("Forwarding to container %p.\n", volume->container);
+
+    return wined3d_texture_decref(volume->container);
 }

static const struct wined3d_resource_ops volume_resource_ops =