Henri Verbeet : d3d11: Use wined3d_resource_map() in d3d10_buffer_Map().
Alexandre Julliard
julliard at winehq.org
Wed Aug 31 11:02:41 CDT 2016
Module: wine
Branch: master
Commit: cec2ff4f86025fba405ee1d17cd2042bb08391c5
URL: http://source.winehq.org/git/wine.git/?a=commit;h=cec2ff4f86025fba405ee1d17cd2042bb08391c5
Author: Henri Verbeet <hverbeet at codeweavers.com>
Date: Wed Aug 31 11:27:50 2016 +0200
d3d11: Use wined3d_resource_map() in d3d10_buffer_Map().
Signed-off-by: Henri Verbeet <hverbeet at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
dlls/d3d11/buffer.c | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/dlls/d3d11/buffer.c b/dlls/d3d11/buffer.c
index 5a5e66e..a43b6be 100644
--- a/dlls/d3d11/buffer.c
+++ b/dlls/d3d11/buffer.c
@@ -303,6 +303,7 @@ static UINT STDMETHODCALLTYPE d3d10_buffer_GetEvictionPriority(ID3D10Buffer *ifa
static HRESULT STDMETHODCALLTYPE d3d10_buffer_Map(ID3D10Buffer *iface, D3D10_MAP map_type, UINT map_flags, void **data)
{
struct d3d_buffer *buffer = impl_from_ID3D10Buffer(iface);
+ struct wined3d_map_desc wined3d_map_desc;
HRESULT hr;
TRACE("iface %p, map_type %u, map_flags %#x, data %p.\n", iface, map_type, map_flags, data);
@@ -311,8 +312,9 @@ static HRESULT STDMETHODCALLTYPE d3d10_buffer_Map(ID3D10Buffer *iface, D3D10_MAP
FIXME("Ignoring map_flags %#x.\n", map_flags);
wined3d_mutex_lock();
- hr = wined3d_buffer_map(buffer->wined3d_buffer, 0, 0, (BYTE **)data,
- wined3d_map_flags_from_d3d11_map_type(map_type));
+ hr = wined3d_resource_map(wined3d_buffer_get_resource(buffer->wined3d_buffer), 0,
+ &wined3d_map_desc, NULL, wined3d_map_flags_from_d3d11_map_type(map_type));
+ *data = wined3d_map_desc.data;
wined3d_mutex_unlock();
return hr;
More information about the wine-cvs
mailing list