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

wined3d: Do not call wined3d_device_destroy_default_samplers() in the CS thread. 

Signed-off-by: Jan Sikorski <jsikorski@codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Jan Sikorski 2021-10-07 12:57:26 +02:00 committed by Alexandre Julliard
parent 6d2d43bb05
commit 33449ed625
4 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
dlls/wined3d/adapter_gl.c
View File

@ -4575,6 +4575,7 @@ static void adapter_gl_uninit_3d(struct wined3d_device *device)
{ {
TRACE("device %p.\n", device); TRACE("device %p.\n", device);
wined3d_device_destroy_default_samplers(device);
wined3d_cs_destroy_object(device->cs, wined3d_device_delete_opengl_contexts_cs, device); wined3d_cs_destroy_object(device->cs, wined3d_device_delete_opengl_contexts_cs, device);
wined3d_cs_finish(device->cs, WINED3D_CS_QUEUE_DEFAULT); wined3d_cs_finish(device->cs, WINED3D_CS_QUEUE_DEFAULT);
} }

2
dlls/wined3d/adapter_vk.c
View File

@ -748,7 +748,6 @@ static void adapter_vk_uninit_3d_cs(void *object)
device->shader_backend->shader_free_private(device, &context_vk->c); device->shader_backend->shader_free_private(device, &context_vk->c);
wined3d_device_vk_destroy_null_views(device_vk, context_vk); wined3d_device_vk_destroy_null_views(device_vk, context_vk);
wined3d_device_vk_destroy_null_resources(device_vk, context_vk); wined3d_device_vk_destroy_null_resources(device_vk, context_vk);
wined3d_device_destroy_default_samplers(device, &context_vk->c);
} }
static void adapter_vk_uninit_3d(struct wined3d_device *device) static void adapter_vk_uninit_3d(struct wined3d_device *device)
@ -761,6 +760,7 @@ static void adapter_vk_uninit_3d(struct wined3d_device *device)
device_vk = wined3d_device_vk(device); device_vk = wined3d_device_vk(device);
context_vk = &device_vk->context_vk; context_vk = &device_vk->context_vk;
wined3d_device_destroy_default_samplers(device);
wined3d_cs_destroy_object(device->cs, adapter_vk_uninit_3d_cs, device_vk); wined3d_cs_destroy_object(device->cs, adapter_vk_uninit_3d_cs, device_vk);
wined3d_cs_finish(device->cs, WINED3D_CS_QUEUE_DEFAULT); wined3d_cs_finish(device->cs, WINED3D_CS_QUEUE_DEFAULT);

4
dlls/wined3d/device.c
View File

@ -572,8 +572,7 @@ void wined3d_device_create_default_samplers(struct wined3d_device *device, struc
} }
} }
/* Context activation is done by the caller. */ void wined3d_device_destroy_default_samplers(struct wined3d_device *device)
void wined3d_device_destroy_default_samplers(struct wined3d_device *device, struct wined3d_context *context)
{ {
wined3d_sampler_decref(device->default_sampler); wined3d_sampler_decref(device->default_sampler);
device->default_sampler = NULL; device->default_sampler = NULL;
@ -982,7 +981,6 @@ void wined3d_device_delete_opengl_contexts_cs(void *object)
device->blitter->ops->blitter_destroy(device->blitter, context); device->blitter->ops->blitter_destroy(device->blitter, context);
device->shader_backend->shader_free_private(device, context); device->shader_backend->shader_free_private(device, context);
wined3d_device_gl_destroy_dummy_textures(device_gl, context_gl); wined3d_device_gl_destroy_dummy_textures(device_gl, context_gl);
wined3d_device_destroy_default_samplers(device, context);
context_release(context); context_release(context);
while (device->context_count) while (device->context_count)

3
dlls/wined3d/wined3d_private.h
View File

@ -3889,8 +3889,7 @@ void wined3d_device_create_default_samplers(struct wined3d_device *device,
struct wined3d_context *context) DECLSPEC_HIDDEN; struct wined3d_context *context) DECLSPEC_HIDDEN;
void wined3d_device_create_primary_opengl_context_cs(void *object) DECLSPEC_HIDDEN; void wined3d_device_create_primary_opengl_context_cs(void *object) DECLSPEC_HIDDEN;
void wined3d_device_delete_opengl_contexts_cs(void *object) DECLSPEC_HIDDEN; void wined3d_device_delete_opengl_contexts_cs(void *object) DECLSPEC_HIDDEN;
void wined3d_device_destroy_default_samplers(struct wined3d_device *device, void wined3d_device_destroy_default_samplers(struct wined3d_device *device) DECLSPEC_HIDDEN;
struct wined3d_context *context) DECLSPEC_HIDDEN;
HRESULT wined3d_device_init(struct wined3d_device *device, struct wined3d *wined3d, HRESULT wined3d_device_init(struct wined3d_device *device, struct wined3d *wined3d,
unsigned int adapter_idx, enum wined3d_device_type device_type, HWND focus_window, unsigned int flags, unsigned int adapter_idx, enum wined3d_device_type device_type, HWND focus_window, unsigned int flags,
BYTE surface_alignment, const enum wined3d_feature_level *levels, unsigned int level_count, BYTE surface_alignment, const enum wined3d_feature_level *levels, unsigned int level_count,