Module: wine Branch: master Commit: 53b21e0e9cb23c2915c8ce7ff79af41e4cd10544 URL: http://source.winehq.org/git/wine.git/?a=commit;h=53b21e0e9cb23c2915c8ce7ff7...
Author: Henri Verbeet hverbeet@codeweavers.com Date: Mon Aug 29 10:49:02 2016 +0200
d3d8: Use wined3d_resource_map() in d3d8_vertexbuffer_Lock().
Signed-off-by: Henri Verbeet hverbeet@codeweavers.com Signed-off-by: Alexandre Julliard julliard@winehq.org
---
dlls/d3d8/buffer.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/dlls/d3d8/buffer.c b/dlls/d3d8/buffer.c index aa19314..4826fac 100644 --- a/dlls/d3d8/buffer.c +++ b/dlls/d3d8/buffer.c @@ -182,14 +182,20 @@ static HRESULT WINAPI d3d8_vertexbuffer_Lock(IDirect3DVertexBuffer8 *iface, UINT BYTE **data, DWORD flags) { struct d3d8_vertexbuffer *buffer = impl_from_IDirect3DVertexBuffer8(iface); + struct wined3d_map_desc wined3d_map_desc; + struct wined3d_box wined3d_box = {0}; HRESULT hr;
TRACE("iface %p, offset %u, size %u, data %p, flags %#x.\n", iface, offset, size, data, flags);
+ wined3d_box.left = offset; + wined3d_box.right = offset + size; wined3d_mutex_lock(); - hr = wined3d_buffer_map(buffer->wined3d_buffer, offset, size, data, flags); + hr = wined3d_resource_map(wined3d_buffer_get_resource(buffer->wined3d_buffer), + 0, &wined3d_map_desc, &wined3d_box, flags); wined3d_mutex_unlock(); + *data = wined3d_map_desc.data;
return hr; }