system/wine
system/wine
1
0
Fork 0
mirror of git://source.winehq.org/git/wine.git synced 2024-09-01 22:34:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

wined3d: Check for failure from wined3d_device_context_require_space() in wined3d_device_context_emit_unmap().

Browse source 
Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51485
Signed-off-by: Zebediah Figura <zfigura@codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Zebediah Figura 2021-07-26 15:14:09 -05:00 committed by Alexandre Julliard
parent eb6fcd3cb9
commit e4502cff81
2 changed files with 11 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
dlls/d3d11/tests/d3d11.c
View file

@ -33091,6 +33091,15 @@ static void test_deferred_context_map(void)
ID3D11CommandList_Release(list);
/* Dead Rising unmaps a resource on the wrong context. */
hr = ID3D11DeviceContext_Map(immediate, (ID3D11Resource *)buffer, 0, D3D11_MAP_WRITE_DISCARD, 0, &map_desc);
ok(hr == S_OK, "Got unexpected hr %#x.\n", hr);
ID3D11DeviceContext_Unmap(deferred, (ID3D11Resource *)buffer, 0);
ID3D11DeviceContext_Unmap(immediate, (ID3D11Resource *)buffer, 0);
/* Test WRITE_NO_OVERWRITE. */
hr = ID3D11DeviceContext_Map(immediate, (ID3D11Resource *)buffer, 0, D3D11_MAP_WRITE_DISCARD, 0, &map_desc);

3
dlls/wined3d/cs.c
View file

@ -2520,7 +2520,8 @@ HRESULT wined3d_device_context_emit_unmap(struct wined3d_device_context *context
wined3d_not_from_cs(context->device->cs);
op = wined3d_device_context_require_space(context, sizeof(*op), WINED3D_CS_QUEUE_MAP);
if (!(op = wined3d_device_context_require_space(context, sizeof(*op), WINED3D_CS_QUEUE_MAP)))
return E_OUTOFMEMORY;
op->opcode = WINED3D_CS_OP_UNMAP;
op->resource = resource;
op->sub_resource_idx = sub_resource_idx;