[PATCH 3/7] wined3d: introduce new wined3d_texture_(un)map functions

[Riccardo Bortolato]

---
 dlls/wined3d/texture.c    | 47 +++++++++++++++++++++++++++++++++++++++++++++++
 dlls/wined3d/wined3d.spec |  2 ++
 include/wine/wined3d.h    |  3 +++
 3 files changed, 52 insertions(+)

diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c
index b369809..6059704 100644
--- a/dlls/wined3d/texture.c
+++ b/dlls/wined3d/texture.c
@@ -915,6 +915,17 @@ static void texture2d_prepare_texture(struct wined3d_texture *texture, struct wi
     }
 }
 
+static HRESULT texture2d_sub_resource_map(struct wined3d_resource *sub_resource,
+        struct wined3d_map_desc *map_desc, const struct wined3d_box *box, DWORD flags)
+{
+    return wined3d_surface_map(wined3d_surface_from_resource(sub_resource), map_desc, box, flags);
+}
+
+static HRESULT texture2d_sub_resource_unmap(struct wined3d_resource *sub_resource)
+{
+    return wined3d_surface_unmap(wined3d_surface_from_resource(sub_resource));
+}
+
 static const struct wined3d_texture_ops texture2d_ops =
 {
     texture2d_sub_resource_load,
@@ -924,6 +935,8 @@ static const struct wined3d_texture_ops texture2d_ops =
     texture2d_sub_resource_validate_location,
     texture2d_sub_resource_upload_data,
     texture2d_prepare_texture,
+    texture2d_sub_resource_map,
+    texture2d_sub_resource_unmap,
 };
 
 static ULONG texture_resource_incref(struct wined3d_resource *resource)
@@ -1290,6 +1303,17 @@ 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);
+}
+
+static HRESULT texture3d_sub_resource_unmap(struct wined3d_resource *sub_resource)
+{
+     return wined3d_volume_unmap(wined3d_volume_from_resource(sub_resource));
+}
+
 static const struct wined3d_texture_ops texture3d_ops =
 {
     texture3d_sub_resource_load,
@@ -1299,6 +1323,8 @@ static const struct wined3d_texture_ops texture3d_ops =
     texture3d_sub_resource_validate_location,
     texture3d_sub_resource_upload_data,
     texture3d_prepare_texture,
+    texture3d_sub_resource_map,
+    texture3d_sub_resource_unmap,
 };
 
 static HRESULT volumetexture_init(struct wined3d_texture *texture, const struct wined3d_resource_desc *desc,
@@ -1465,3 +1491,24 @@ 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)
+{
+    struct wined3d_resource *sub_resource = wined3d_texture_get_sub_resource(texture, sub_resource_idx);
+
+    if (!sub_resource)
+        return WINED3DERR_INVALIDCALL;
+
+    return texture->texture_ops->texture_sub_resource_map(sub_resource, map_desc, box, flags);
+}
+
+HRESULT CDECL wined3d_texture_unmap(struct wined3d_texture *texture, unsigned int sub_resource_idx)
+{
+    struct wined3d_resource *sub_resource = wined3d_texture_get_sub_resource(texture, sub_resource_idx);
+
+    if (!sub_resource)
+        return WINED3DERR_INVALIDCALL;
+
+    return texture->texture_ops->texture_sub_resource_unmap(sub_resource);
+}
diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec
index 9531dd3..a39d946 100644
--- a/dlls/wined3d/wined3d.spec
+++ b/dlls/wined3d/wined3d.spec
@@ -273,6 +273,8 @@
 @ 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 68ca9b3..23eb1ed 100644
--- a/include/wine/wined3d.h
+++ b/include/wine/wined3d.h
@@ -2551,6 +2551,9 @@ 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_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,
-- 
1.9.1