[PATCH 4/4] wined3d: Remove wined3d_texture_{map,unmap}().

Józef Kucia jkucia at codeweavers.com
Wed Nov 4 17:13:41 CST 2015


Signed-off-by: Józef Kucia <jkucia at codeweavers.com>
---
 dlls/wined3d/texture.c    | 17 -----------------
 dlls/wined3d/wined3d.spec |  2 --
 include/wine/wined3d.h    |  3 ---
 3 files changed, 22 deletions(-)

diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c
index 4380e5f..1d5bec7 100644
--- a/dlls/wined3d/texture.c
+++ b/dlls/wined3d/texture.c
@@ -1547,23 +1547,6 @@ HRESULT CDECL wined3d_texture_create(struct wined3d_device *device, const struct
     return WINED3D_OK;
 }
 
-HRESULT CDECL wined3d_texture_map(struct wined3d_texture *texture, unsigned int sub_resource_idx,
-        struct wined3d_map_desc *map_desc, const struct wined3d_box *box, DWORD flags)
-{
-    TRACE("texture %p, sub_resource_idx %u, map_desc %p, box %p, flags %#x.\n",
-            texture, sub_resource_idx, map_desc, box, flags);
-
-    return texture->resource.resource_ops->resource_sub_resource_map(&texture->resource, sub_resource_idx,
-            map_desc, box, flags);
-}
-
-HRESULT CDECL wined3d_texture_unmap(struct wined3d_texture *texture, unsigned int sub_resource_idx)
-{
-    TRACE("texture %p, sub_resource_idx %u.\n", texture, sub_resource_idx);
-
-    return texture->resource.resource_ops->resource_sub_resource_unmap(&texture->resource, sub_resource_idx);
-}
-
 HRESULT CDECL wined3d_texture_get_dc(struct wined3d_texture *texture, unsigned int sub_resource_idx, HDC *dc)
 {
     struct wined3d_resource *sub_resource;
diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec
index 7067e08..a7e625d 100644
--- a/dlls/wined3d/wined3d.spec
+++ b/dlls/wined3d/wined3d.spec
@@ -276,8 +276,6 @@
 @ cdecl wined3d_texture_set_autogen_filter_type(ptr long)
 @ cdecl wined3d_texture_set_color_key(ptr long ptr)
 @ cdecl wined3d_texture_set_lod(ptr long)
-@ cdecl wined3d_texture_map(ptr long ptr ptr long)
-@ cdecl wined3d_texture_unmap(ptr long)
 @ cdecl wined3d_texture_update_desc(ptr long long long long long ptr long)
 
 @ cdecl wined3d_vertex_declaration_create(ptr ptr long ptr ptr ptr)
diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h
index 9c9258a..2deb450 100644
--- a/include/wine/wined3d.h
+++ b/include/wine/wined3d.h
@@ -2554,10 +2554,7 @@ HRESULT __cdecl wined3d_texture_set_autogen_filter_type(struct wined3d_texture *
 HRESULT __cdecl wined3d_texture_set_color_key(struct wined3d_texture *texture,
         DWORD flags, const struct wined3d_color_key *color_key);
 DWORD __cdecl wined3d_texture_set_lod(struct wined3d_texture *texture, DWORD lod);
-HRESULT __cdecl wined3d_texture_map(struct wined3d_texture *texture, unsigned int sub_resource_idx,
-        struct wined3d_map_desc *map_desc, const struct wined3d_box *box, DWORD flags);
 HRESULT __cdecl wined3d_texture_release_dc(struct wined3d_texture *texture, unsigned int sub_resource_idx, HDC dc);
-HRESULT __cdecl wined3d_texture_unmap(struct wined3d_texture *texture, unsigned int sub_resource_idx);
 HRESULT __cdecl wined3d_texture_update_desc(struct wined3d_texture *texture,
         UINT width, UINT height, enum wined3d_format_id format_id,
         enum wined3d_multisample_type multisample_type, UINT multisample_quality,
-- 
2.4.10




More information about the wine-patches mailing list