system/wine
system/wine
1
0
Fork 0
mirror of git://source.winehq.org/git/wine.git synced 2024-09-15 03:19:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

wined3d: Pass a wined3d_cs pointer to wined3d_not_from_cs().

Browse source 
This partially reverts 6a9752bf5e.

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-05 19:32:13 -05:00 committed by Alexandre Julliard
parent f2fe987907
commit a68cdf4a41
3 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
dlls/wined3d/cs.c
View file

@ -2457,7 +2457,7 @@ HRESULT wined3d_device_context_emit_map(struct wined3d_device_context *context,
/* Mapping resources from the worker thread isn't an issue by itself, but
* increasing the map count would be visible to applications. */
wined3d_not_from_cs(context->device);
wined3d_not_from_cs(context->device->cs);
wined3d_resource_wait_idle(resource);
@ -2502,7 +2502,7 @@ HRESULT wined3d_device_context_emit_unmap(struct wined3d_device_context *context
return WINED3D_OK;
}
wined3d_not_from_cs(context->device);
wined3d_not_from_cs(context->device->cs);
op = wined3d_device_context_require_space(context, sizeof(*op), WINED3D_CS_QUEUE_MAP);
op->opcode = WINED3D_CS_OP_UNMAP;

4
dlls/wined3d/device.c
View file

@ -5536,7 +5536,7 @@ void device_resource_add(struct wined3d_device *device, struct wined3d_resource
{
TRACE("device %p, resource %p.\n", device, resource);
wined3d_not_from_cs(device);
wined3d_not_from_cs(device->cs);
list_add_head(&device->resources, &resource->resource_list_entry);
}
@ -5545,7 +5545,7 @@ static void device_resource_remove(struct wined3d_device *device, struct wined3d
{
TRACE("device %p, resource %p.\n", device, resource);
wined3d_not_from_cs(device);
wined3d_not_from_cs(device->cs);
list_remove(&resource->resource_list_entry);
}

4
dlls/wined3d/wined3d_private.h
View file

@ -6041,9 +6041,9 @@ static inline void wined3d_from_cs(const struct wined3d_cs *cs)
assert(cs->thread_id == GetCurrentThreadId());
}
static inline void wined3d_not_from_cs(const struct wined3d_device *device)
static inline void wined3d_not_from_cs(const struct wined3d_cs *cs)
{
assert(device->cs->thread_id != GetCurrentThreadId());
assert(cs->thread_id != GetCurrentThreadId());
}
static inline enum wined3d_material_color_source validate_material_colour_source(WORD use_map,