Henri Verbeet : wined3d: Use wined3d_resource_map() in d3d_vertex_buffer7_Lock().
Alexandre Julliard
julliard at winehq.org
Mon Aug 29 11:07:22 CDT 2016
Module: wine
Branch: master
Commit: 7834f00be5a1b0e764de3e85bc3146945bbdf330
URL: http://source.winehq.org/git/wine.git/?a=commit;h=7834f00be5a1b0e764de3e85bc3146945bbdf330
Author: Henri Verbeet <hverbeet at codeweavers.com>
Date: Mon Aug 29 10:49:00 2016 +0200
wined3d: Use wined3d_resource_map() in d3d_vertex_buffer7_Lock().
Signed-off-by: Henri Verbeet <hverbeet at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
dlls/ddraw/vertexbuffer.c | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/dlls/ddraw/vertexbuffer.c b/dlls/ddraw/vertexbuffer.c
index a88d5b5..a0cc3f6 100644
--- a/dlls/ddraw/vertexbuffer.c
+++ b/dlls/ddraw/vertexbuffer.c
@@ -227,6 +227,7 @@ static HRESULT WINAPI d3d_vertex_buffer7_Lock(IDirect3DVertexBuffer7 *iface,
struct d3d_vertex_buffer *buffer = impl_from_IDirect3DVertexBuffer7(iface);
struct wined3d_resource_desc wined3d_desc;
struct wined3d_resource *wined3d_resource;
+ struct wined3d_map_desc wined3d_map_desc;
HRESULT hr;
DWORD wined3d_flags = 0;
@@ -273,7 +274,9 @@ static HRESULT WINAPI d3d_vertex_buffer7_Lock(IDirect3DVertexBuffer7 *iface,
*data_size = wined3d_desc.size;
}
- hr = wined3d_buffer_map(buffer->wined3d_buffer, 0, 0, (BYTE **)data, wined3d_flags);
+ hr = wined3d_resource_map(wined3d_buffer_get_resource(buffer->wined3d_buffer),
+ 0, &wined3d_map_desc, NULL, wined3d_flags);
+ *data = wined3d_map_desc.data;
wined3d_mutex_unlock();
More information about the wine-cvs
mailing list