ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ddraw: Use resource mapping functions in d3d_device7_DrawPrimitive(). 

Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Henri Verbeet 2016-08-31 11:27:53 +02:00 committed by Alexandre Julliard
parent 7d97171425
commit 215e34819d
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
dlls/ddraw/device.c
View File

@ -3501,9 +3501,11 @@ static HRESULT d3d_device7_DrawPrimitive(IDirect3DDevice7 *iface,
DWORD vertex_count, DWORD flags) DWORD vertex_count, DWORD flags)
{ {
struct d3d_device *device = impl_from_IDirect3DDevice7(iface); struct d3d_device *device = impl_from_IDirect3DDevice7(iface);
struct wined3d_map_desc wined3d_map_desc;
struct wined3d_box wined3d_box = {0};
UINT stride, vb_pos, size, align; UINT stride, vb_pos, size, align;
struct wined3d_resource *vb;
HRESULT hr; HRESULT hr;
BYTE *data;
TRACE("iface %p, primitive_type %#x, fvf %#x, vertices %p, vertex_count %u, flags %#x.\n", TRACE("iface %p, primitive_type %#x, fvf %#x, vertices %p, vertex_count %u, flags %#x.\n",
iface, primitive_type, fvf, vertices, vertex_count, flags); iface, primitive_type, fvf, vertices, vertex_count, flags);
@ -3531,12 +3533,14 @@ static HRESULT d3d_device7_DrawPrimitive(IDirect3DDevice7 *iface,
else else
vb_pos += align; vb_pos += align;
hr = wined3d_buffer_map(device->vertex_buffer, vb_pos, size, &data, wined3d_box.left = vb_pos;
vb_pos ? WINED3D_MAP_NOOVERWRITE : WINED3D_MAP_DISCARD); wined3d_box.right = vb_pos + size;
if (FAILED(hr)) vb = wined3d_buffer_get_resource(device->vertex_buffer);
if (FAILED(hr = wined3d_resource_map(vb, 0, &wined3d_map_desc, &wined3d_box,
vb_pos ? WINED3D_MAP_NOOVERWRITE : WINED3D_MAP_DISCARD)))
goto done; goto done;
memcpy(data, vertices, size); memcpy(wined3d_map_desc.data, vertices, size);
wined3d_buffer_unmap(device->vertex_buffer); wined3d_resource_unmap(vb, 0);
device->vertex_buffer_pos = vb_pos + size; device->vertex_buffer_pos = vb_pos + size;
hr = wined3d_device_set_stream_source(device->wined3d_device, 0, device->vertex_buffer, 0, stride); hr = wined3d_device_set_stream_source(device->wined3d_device, 0, device->vertex_buffer, 0, stride);