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

wined3d: Handle unmappable buffers in wined3d_device_process_vertices() gracefully. 

Signed-off-by: Józef Kucia <jkucia@codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Józef Kucia 2018-12-25 13:24:36 +01:00 committed by Alexandre Julliard
parent bdccebcab4
commit 2058505ceb
1 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
dlls/wined3d/device.c
View File

@ -3340,7 +3340,7 @@ HRESULT CDECL wined3d_device_process_vertices(struct wined3d_device *device,
struct wined3d_resource *resource; struct wined3d_resource *resource;
struct wined3d_box box = {0}; struct wined3d_box box = {0};
struct wined3d_shader *vs; struct wined3d_shader *vs;
unsigned int i; unsigned int i, j;
HRESULT hr; HRESULT hr;
WORD map; WORD map;
@ -3375,7 +3375,20 @@ HRESULT CDECL wined3d_device_process_vertices(struct wined3d_device *device,
box.left = src_start_idx * e->stride; box.left = src_start_idx * e->stride;
box.right = box.left + vertex_count * e->stride; box.right = box.left + vertex_count * e->stride;
if (FAILED(wined3d_resource_map(resource, 0, &map_desc, &box, WINED3D_MAP_READ))) if (FAILED(wined3d_resource_map(resource, 0, &map_desc, &box, WINED3D_MAP_READ)))
{
ERR("Failed to map resource.\n"); ERR("Failed to map resource.\n");
for (j = 0, map = stream_info.use_map; map && j < i; map >>= 1, ++j)
{
if (!(map & 1))
continue;
e = &stream_info.elements[j];
resource = &state->streams[e->stream_idx].buffer->resource;
if (FAILED(wined3d_resource_unmap(resource, 0)))
ERR("Failed to unmap resource.\n");
}
return WINED3DERR_INVALIDCALL;
}
e->data.buffer_object = 0; e->data.buffer_object = 0;
e->data.addr += (ULONG_PTR)map_desc.data; e->data.addr += (ULONG_PTR)map_desc.data;
} }