Riccardo Bortolato : wined3d: Remove volume reference counting from public interface.

[Alexandre Julliard]

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

Author: Riccardo Bortolato 
Date:   Wed Sep  9 19:02:21 2015 +0200

wined3d: Remove volume reference counting from public interface.

---

dlls/wined3d/volume.c     | 4 ++--
 dlls/wined3d/wined3d.spec | 2 --
 include/wine/wined3d.h    | 2 --
 3 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/dlls/wined3d/volume.c b/dlls/wined3d/volume.c
index 6d62c5e..2daa55e 100644
--- a/dlls/wined3d/volume.c
+++ b/dlls/wined3d/volume.c
@@ -460,14 +460,14 @@ static void volume_unload(struct wined3d_resource *resource)
     resource_unload(resource);
 }

-ULONG CDECL wined3d_volume_incref(struct wined3d_volume *volume)
+static ULONG CDECL wined3d_volume_incref(struct wined3d_volume *volume)
 {
     TRACE("Forwarding to container %p.\n", volume->container);

return wined3d_texture_incref(volume->container);
 }

-ULONG CDECL wined3d_volume_decref(struct wined3d_volume *volume)
+static ULONG CDECL wined3d_volume_decref(struct wined3d_volume *volume)
 {
     TRACE("Forwarding to container %p.\n", volume->container);

diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec
index f2447da..6f770a9 100644
--- a/dlls/wined3d/wined3d.spec
+++ b/dlls/wined3d/wined3d.spec
@@ -283,9 +283,7 @@
 @ cdecl wined3d_vertex_declaration_get_parent(ptr)
 @ cdecl wined3d_vertex_declaration_incref(ptr)

-@ cdecl wined3d_volume_decref(ptr)
 @ cdecl wined3d_volume_from_resource(ptr)
 @ cdecl wined3d_volume_get_resource(ptr)
-@ cdecl wined3d_volume_incref(ptr)
 @ cdecl wined3d_volume_map(ptr ptr ptr long)
 @ cdecl wined3d_volume_unmap(ptr)
diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h
index e2b9e1f..d3dde35 100644
--- a/include/wine/wined3d.h
+++ b/include/wine/wined3d.h
@@ -2566,10 +2566,8 @@ ULONG __cdecl wined3d_vertex_declaration_decref(struct wined3d_vertex_declaratio
 void * __cdecl wined3d_vertex_declaration_get_parent(const struct wined3d_vertex_declaration *declaration);
 ULONG __cdecl wined3d_vertex_declaration_incref(struct wined3d_vertex_declaration *declaration);

-ULONG __cdecl wined3d_volume_decref(struct wined3d_volume *volume);
 struct wined3d_volume * __cdecl wined3d_volume_from_resource(struct wined3d_resource *resource);
 struct wined3d_resource * __cdecl wined3d_volume_get_resource(struct wined3d_volume *volume);
-ULONG __cdecl wined3d_volume_incref(struct wined3d_volume *volume);
 HRESULT __cdecl wined3d_volume_map(struct wined3d_volume *volume,
         struct wined3d_map_desc *map_desc, const struct wined3d_box *box, DWORD flags);
 HRESULT __cdecl wined3d_volume_unmap(struct wined3d_volume *volume);