Zebediah Figura : wined3d: Introduce wined3d_device_context_unmap().
Alexandre Julliard
julliard at winehq.org
Tue Apr 13 16:31:21 CDT 2021
Module: wine
Branch: master
Commit: 41041c8ff1601fb99432cfe26f527a686a55bd06
URL: https://source.winehq.org/git/wine.git/?a=commit;h=41041c8ff1601fb99432cfe26f527a686a55bd06
Author: Zebediah Figura <z.figura12 at gmail.com>
Date: Mon Apr 12 22:46:32 2021 -0500
wined3d: Introduce wined3d_device_context_unmap().
Signed-off-by: Zebediah Figura <z.figura12 at gmail.com>
Signed-off-by: Henri Verbeet <hverbeet at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
dlls/wined3d/device.c | 8 ++++++++
dlls/wined3d/resource.c | 2 +-
dlls/wined3d/wined3d.spec | 1 +
include/wine/wined3d.h | 2 ++
4 files changed, 12 insertions(+), 1 deletion(-)
diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c
index 67b1de831e3..9240bad9d27 100644
--- a/dlls/wined3d/device.c
+++ b/dlls/wined3d/device.c
@@ -5316,6 +5316,14 @@ HRESULT CDECL wined3d_device_context_map(struct wined3d_device_context *context,
return context->ops->map(context, resource, sub_resource_idx, map_desc, box, flags);
}
+HRESULT CDECL wined3d_device_context_unmap(struct wined3d_device_context *context,
+ struct wined3d_resource *resource, unsigned int sub_resource_idx)
+{
+ TRACE("context %p, resource %p, sub_resource_idx %u.\n", context, resource, sub_resource_idx);
+
+ return context->ops->unmap(context, resource, sub_resource_idx);
+}
+
struct wined3d_rendertarget_view * CDECL wined3d_device_get_rendertarget_view(const struct wined3d_device *device,
unsigned int view_idx)
{
diff --git a/dlls/wined3d/resource.c b/dlls/wined3d/resource.c
index 8085c0e6aee..6e34605f547 100644
--- a/dlls/wined3d/resource.c
+++ b/dlls/wined3d/resource.c
@@ -327,7 +327,7 @@ HRESULT CDECL wined3d_resource_unmap(struct wined3d_resource *resource, unsigned
{
TRACE("resource %p, sub_resource_idx %u.\n", resource, sub_resource_idx);
- return resource->device->cs->c.ops->unmap(&resource->device->cs->c, resource, sub_resource_idx);
+ return wined3d_device_context_unmap(&resource->device->cs->c, resource, sub_resource_idx);
}
void CDECL wined3d_resource_preload(struct wined3d_resource *resource)
diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec
index 874b0a9dfc7..7c81eff1593 100644
--- a/dlls/wined3d/wined3d.spec
+++ b/dlls/wined3d/wined3d.spec
@@ -190,6 +190,7 @@
@ cdecl wined3d_device_context_set_unordered_access_view(ptr long long ptr long)
@ cdecl wined3d_device_context_set_vertex_declaration(ptr ptr)
@ cdecl wined3d_device_context_set_viewports(ptr long ptr)
+@ cdecl wined3d_device_context_unmap(ptr ptr long)
@ cdecl wined3d_device_context_update_sub_resource(ptr ptr long ptr ptr long long long)
@ cdecl wined3d_output_find_closest_matching_mode(ptr ptr)
diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h
index a0c5a876ad7..e0a205f3dad 100644
--- a/include/wine/wined3d.h
+++ b/include/wine/wined3d.h
@@ -2607,6 +2607,8 @@ void __cdecl wined3d_device_context_set_vertex_declaration(struct wined3d_device
struct wined3d_vertex_declaration *declaration);
void __cdecl wined3d_device_context_set_viewports(struct wined3d_device_context *context, unsigned int viewport_count,
const struct wined3d_viewport *viewports);
+HRESULT __cdecl wined3d_device_context_unmap(struct wined3d_device_context *context,
+ struct wined3d_resource *resource, unsigned int sub_resource_idx);
void __cdecl wined3d_device_context_update_sub_resource(struct wined3d_device_context *context,
struct wined3d_resource *resource, unsigned int sub_resource_idx, const struct wined3d_box *box,
const void *data, unsigned int row_pitch, unsigned int depth_pitch, unsigned int flags);
More information about the wine-cvs
mailing list