From: Riccardo Bortolato Subject: [PATCH 08/12] wined3d: remove wined3d_volume_from_resource from the public api Message-Id: <1442996856-32611-8-git-send-email-rikyz619@gmail.com> Date: Wed, 23 Sep 2015 10:27:32 +0200 --- dlls/wined3d/texture.c | 4 ++-- dlls/wined3d/volume.c | 5 ----- dlls/wined3d/wined3d.spec | 1 - include/wine/wined3d.h | 1 - 4 files changed, 2 insertions(+), 9 deletions(-) diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 9d9e1a5..98bc70b 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -1306,12 +1306,12 @@ static void texture3d_prepare_texture(struct wined3d_texture *texture, struct wi static HRESULT texture3d_sub_resource_map(struct wined3d_resource *sub_resource, struct wined3d_map_desc *map_desc, const struct wined3d_box *box, DWORD flags) { - return wined3d_volume_map(wined3d_volume_from_resource(sub_resource), map_desc, box, flags); + return wined3d_volume_map(volume_from_resource(sub_resource), map_desc, box, flags); } static HRESULT texture3d_sub_resource_unmap(struct wined3d_resource *sub_resource) { - return wined3d_volume_unmap(wined3d_volume_from_resource(sub_resource)); + return wined3d_volume_unmap(volume_from_resource(sub_resource)); } static const struct wined3d_texture_ops texture3d_ops = diff --git a/dlls/wined3d/volume.c b/dlls/wined3d/volume.c index 0837b96..7787c6a 100644 --- a/dlls/wined3d/volume.c +++ b/dlls/wined3d/volume.c @@ -676,11 +676,6 @@ HRESULT wined3d_volume_map(struct wined3d_volume *volume, return WINED3D_OK; } -struct wined3d_volume * CDECL wined3d_volume_from_resource(struct wined3d_resource *resource) -{ - return volume_from_resource(resource); -} - HRESULT wined3d_volume_unmap(struct wined3d_volume *volume) { TRACE("volume %p.\n", volume); diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index b101f83..c8f8944 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -281,5 +281,4 @@ @ cdecl wined3d_vertex_declaration_get_parent(ptr) @ cdecl wined3d_vertex_declaration_incref(ptr) -@ cdecl wined3d_volume_from_resource(ptr) @ cdecl wined3d_volume_get_resource(ptr) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 514aa35..31b510b 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2567,7 +2567,6 @@ 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); -struct wined3d_volume * __cdecl wined3d_volume_from_resource(struct wined3d_resource *resource); struct wined3d_resource * __cdecl wined3d_volume_get_resource(struct wined3d_volume *volume); /* Return the integer base-2 logarithm of x. Undefined for x == 0. */ -- 1.9.1