October 2021 - Wine-Commits

Jan Sikorski : d3d11: Don't grab wined3d lock for wined3d_texture_decref().
by Alexandre Julliard Oct. 15, 2021

Oct. 15, 2021

Module: wine Branch: master Commit: 589a97ae34ef21b089dc7800928a18e98641d7ba URL: https://source.winehq.org/git/wine.git/?a=commit;h=589a97ae34ef21b089dc7800… Author: Jan Sikorski <jsikorski(a)codeweavers.com> Date: Fri Oct 15 14:26:03 2021 +0200 d3d11: Don't grab wined3d lock for wined3d_texture_decref(). Signed-off-by: Jan Sikorski <jsikorski(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/texture.c | 8 -------- 1 file changed, 8 deletions(-) diff --git a/dlls/d3d11/texture.c b/dlls/d3d11/texture.c index 2a43b24b226..4fe395a206c 100644 --- a/dlls/d3d11/texture.c +++ b/dlls/d3d11/texture.c @@ -92,10 +92,7 @@ static ULONG STDMETHODCALLTYPE d3d11_texture1d_Release(ID3D11Texture1D *iface) if (!refcount) { ID3D11Device2 *device = texture->device; - - wined3d_mutex_lock(); wined3d_texture_decref(texture->wined3d_texture); - wined3d_mutex_unlock(); /* Release the device last, it may cause the wined3d device to be * destroyed. */ ID3D11Device2_Release(device); @@ -578,10 +575,7 @@ static ULONG STDMETHODCALLTYPE d3d11_texture2d_Release(ID3D11Texture2D *iface) if (!refcount) { ID3D11Device2 *device = texture->device; - - wined3d_mutex_lock(); wined3d_texture_decref(texture->wined3d_texture); - wined3d_mutex_unlock(); /* Release the device last, it may cause the wined3d device to be * destroyed. */ ID3D11Device2_Release(device); @@ -1140,9 +1134,7 @@ static ULONG STDMETHODCALLTYPE d3d11_texture3d_Release(ID3D11Texture3D *iface) { ID3D11Device2 *device = texture->device; - wined3d_mutex_lock(); wined3d_texture_decref(texture->wined3d_texture); - wined3d_mutex_unlock(); /* Release the device last, it may cause the wined3d device to be * destroyed. */ ID3D11Device2_Release(device);

1 0

Paul Gofman : winhttp: Don't send notifications when connection is closed on read finish.
by Alexandre Julliard Oct. 15, 2021

Oct. 15, 2021

Module: wine Branch: master Commit: d349013ddea1c407189cd22df2a4ff8bf025085b URL: https://source.winehq.org/git/wine.git/?a=commit;h=d349013ddea1c407189cd22d… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Fri Oct 15 16:59:48 2021 +0300 winhttp: Don't send notifications when connection is closed on read finish. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winhttp/request.c | 10 ++++------ dlls/winhttp/tests/notification.c | 32 ++++++++------------------------ 2 files changed, 12 insertions(+), 30 deletions(-) diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index 2c064bb767b..c908e26956f 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -1797,13 +1797,11 @@ static void finished_reading( struct request *request ) if (!wcsicmp( connection, L"close" )) close = TRUE; } else if (!wcscmp( request->version, L"HTTP/1.0" )) close = TRUE; - if (close) - { - close_connection( request ); - return; - } - cache_connection( request->netconn ); + if (close) + netconn_close( request->netconn ); + else + cache_connection( request->netconn ); request->netconn = NULL; } diff --git a/dlls/winhttp/tests/notification.c b/dlls/winhttp/tests/notification.c index bc1283adcf7..72cef89a618 100644 --- a/dlls/winhttp/tests/notification.c +++ b/dlls/winhttp/tests/notification.c @@ -1124,32 +1124,15 @@ static const struct notification read_test[] = { winhttp_read_data, WINHTTP_CALLBACK_STATUS_READ_COMPLETE, NF_SIGNAL } }; -static const struct notification read_allow_close_test[] = -{ - { winhttp_read_data, WINHTTP_CALLBACK_STATUS_RECEIVING_RESPONSE, NF_ALLOW }, - { winhttp_read_data, WINHTTP_CALLBACK_STATUS_RESPONSE_RECEIVED, NF_ALLOW }, - { winhttp_read_data, WINHTTP_CALLBACK_STATUS_CLOSING_CONNECTION, NF_ALLOW }, - { winhttp_read_data, WINHTTP_CALLBACK_STATUS_CONNECTION_CLOSED, NF_ALLOW }, - { winhttp_read_data, WINHTTP_CALLBACK_STATUS_READ_COMPLETE, NF_SIGNAL } -}; - -#define read_request_data(a,b,c,d) _read_request_data(a,b,c,d,__LINE__) -static void _read_request_data(struct test_request *req, struct info *info, const char *expected_data, BOOL closing_connection, unsigned line) +#define read_request_data(a,b,c) _read_request_data(a,b,c,__LINE__) +static void _read_request_data(struct test_request *req, struct info *info, const char *expected_data, unsigned line) { char buffer[1024]; DWORD len; BOOL ret; - if (closing_connection) - { - info->test = read_allow_close_test; - info->count = ARRAY_SIZE( read_allow_close_test ); - } - else - { - info->test = read_test; - info->count = ARRAY_SIZE( read_test ); - } + info->test = read_test; + info->count = ARRAY_SIZE( read_test ); info->index = 0; setup_test( info, winhttp_read_data, line ); @@ -1180,7 +1163,7 @@ static void test_persistent_connection(int port) "Content-Length: 1\r\n" "\r\n" "X" ); - read_request_data( &req, &info, "X", FALSE ); + read_request_data( &req, &info, "X" ); close_request( &req, &info, FALSE ); /* chunked connection test */ @@ -1194,7 +1177,7 @@ static void test_persistent_connection(int port) "\r\n" "9\r\n123456789\r\n" "0\r\n\r\n" ); - read_request_data( &req, &info, "123456789", FALSE ); + read_request_data( &req, &info, "123456789" ); close_request( &req, &info, FALSE ); /* HTTP/1.1 connections are persistent by default, no additional header is needed */ @@ -1206,7 +1189,7 @@ static void test_persistent_connection(int port) "Content-Length: 2\r\n" "\r\n" "xx" ); - read_request_data( &req, &info, "xx", FALSE ); + read_request_data( &req, &info, "xx" ); close_request( &req, &info, FALSE ); open_async_request( port, &req, &info, L"/test", TRUE ); @@ -1218,6 +1201,7 @@ static void test_persistent_connection(int port) "Connection: close\r\n" "\r\n" "yy" ); + read_request_data( &req, &info, "yy" ); close_request( &req, &info, TRUE ); SetEvent( server_socket_done );

1 0

Nikolay Sivov : d3d10/effect: Do not use internal value types.
by Alexandre Julliard Oct. 15, 2021

Oct. 15, 2021

Module: wine Branch: master Commit: 84eeeec433f31f892358e013917498d434470f9d URL: https://source.winehq.org/git/wine.git/?a=commit;h=84eeeec433f31f892358e013… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Oct 14 09:42:14 2021 +0300 d3d10/effect: Do not use internal value types. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d10/d3d10_private.h | 13 ------------- dlls/d3d10/effect.c | 42 ++++++++++++++++++++---------------------- 2 files changed, 20 insertions(+), 35 deletions(-) diff --git a/dlls/d3d10/d3d10_private.h b/dlls/d3d10/d3d10_private.h index e5659507eeb..11b3b4e9482 100644 --- a/dlls/d3d10/d3d10_private.h +++ b/dlls/d3d10/d3d10_private.h @@ -40,19 +40,6 @@ */ #define D3DERR_INVALIDCALL 0x8876086c -enum d3d10_effect_object_type -{ - D3D10_EOT_RASTERIZER_STATE = 0x0, - D3D10_EOT_DEPTH_STENCIL_STATE = 0x1, - D3D10_EOT_BLEND_STATE = 0x2, - D3D10_EOT_VERTEXSHADER = 0x6, - D3D10_EOT_PIXELSHADER = 0x7, - D3D10_EOT_GEOMETRYSHADER = 0x8, - D3D10_EOT_STENCIL_REF = 0x9, - D3D10_EOT_BLEND_FACTOR = 0xa, - D3D10_EOT_SAMPLE_MASK = 0xb, -}; - enum d3d10_effect_object_type_flags { D3D10_EOT_FLAG_GS_SO = 0x1, diff --git a/dlls/d3d10/effect.c b/dlls/d3d10/effect.c index 71ad3f64a05..bd104465222 100644 --- a/dlls/d3d10/effect.c +++ b/dlls/d3d10/effect.c @@ -1485,36 +1485,34 @@ static HRESULT parse_fx10_annotations(const char *data, size_t data_size, const return hr; } -static HRESULT parse_fx10_anonymous_shader(struct d3d10_effect *e, struct d3d10_effect_anonymous_shader *s, - enum d3d10_effect_object_type otype) +static HRESULT parse_fx10_anonymous_shader(struct d3d10_effect *e, D3D_SHADER_VARIABLE_TYPE basetype, + struct d3d10_effect_anonymous_shader *s) { struct d3d10_effect_variable *v = &s->shader; struct d3d10_effect_type *t = &s->type; - const char *shader = NULL; + const char *name = NULL; - switch (otype) + switch (basetype) { - case D3D10_EOT_VERTEXSHADER: - shader = "vertexshader"; - t->basetype = D3D10_SVT_VERTEXSHADER; + case D3D10_SVT_VERTEXSHADER: + name = "vertexshader"; break; - case D3D10_EOT_PIXELSHADER: - shader = "pixelshader"; - t->basetype = D3D10_SVT_PIXELSHADER; + case D3D10_SVT_PIXELSHADER: + name = "pixelshader"; break; - case D3D10_EOT_GEOMETRYSHADER: - shader = "geometryshader"; - t->basetype = D3D10_SVT_GEOMETRYSHADER; + case D3D10_SVT_GEOMETRYSHADER: + name = "geometryshader"; break; default: - FIXME("Unhandled object type %#x.\n", otype); + WARN("Unhandled shader type %#x.\n", basetype); return E_FAIL; } + t->basetype = basetype; - if (!copy_name(shader, &t->name)) + if (!copy_name(name, &t->name)) { ERR("Failed to copy name.\n"); return E_OUTOFMEMORY; @@ -1918,8 +1916,8 @@ static HRESULT parse_fx10_property_assignment(const char *data, size_t data_size TRACE("Effect object starts at offset %#x.\n", value_offset); - if (FAILED(hr = parse_fx10_anonymous_shader(effect, - &effect->anonymous_shaders[effect->anonymous_shader_current], property_info->id))) + if (FAILED(hr = parse_fx10_anonymous_shader(effect, property_info->type, + &effect->anonymous_shaders[effect->anonymous_shader_current]))) return hr; variable = &effect->anonymous_shaders[effect->anonymous_shader_current].shader; @@ -1938,17 +1936,17 @@ static HRESULT parse_fx10_property_assignment(const char *data, size_t data_size TRACE("Stream output declaration: %s.\n", debugstr_a(variable->u.shader.stream_output_declaration)); } - switch (property_info->id) + switch (property_info->type) { - case D3D10_EOT_VERTEXSHADER: - case D3D10_EOT_PIXELSHADER: - case D3D10_EOT_GEOMETRYSHADER: + case D3D10_SVT_VERTEXSHADER: + case D3D10_SVT_PIXELSHADER: + case D3D10_SVT_GEOMETRYSHADER: if (FAILED(hr = parse_fx10_shader(data, data_size, value_offset, variable))) return hr; break; default: - FIXME("Unhandled object type %#x\n", property_info->id); + WARN("Unexpected shader type %#x.\n", property_info->type); return E_FAIL; }

1 0

Nikolay Sivov : d3d10/effect: Add a helper to return array element.
by Alexandre Julliard Oct. 15, 2021

Oct. 15, 2021

Module: wine Branch: master Commit: 920afea8cdd836b5c45d58d54fdf42ce1a3ed289 URL: https://source.winehq.org/git/wine.git/?a=commit;h=920afea8cdd836b5c45d58d5… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Oct 14 09:42:17 2021 +0300 d3d10/effect: Add a helper to return array element. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d10/effect.c | 48 +++++++++++++++++++----------------------------- 1 file changed, 19 insertions(+), 29 deletions(-) diff --git a/dlls/d3d10/effect.c b/dlls/d3d10/effect.c index 14c18aa77db..17a4c547a2c 100644 --- a/dlls/d3d10/effect.c +++ b/dlls/d3d10/effect.c @@ -142,6 +142,13 @@ static inline struct d3d10_effect_variable *impl_from_ID3D10EffectShaderVariable return CONTAINING_RECORD(iface, struct d3d10_effect_variable, ID3D10EffectVariable_iface); } +static struct d3d10_effect_variable * d3d10_array_get_element(struct d3d10_effect_variable *v, + unsigned int index) +{ + if (!v->type->element_count) return v; + return &v->elements[index]; +} + enum d3d10_effect_container_type { D3D10_C_NONE, @@ -2152,7 +2159,8 @@ static HRESULT create_state_object(struct d3d10_effect_variable *v) static HRESULT parse_fx10_object_variable(const char *data, size_t data_size, const char **ptr, BOOL shared_type_desc, struct d3d10_effect_variable *v) { - unsigned int i, j; + struct d3d10_effect_variable *var; + unsigned int i, j, element_count; HRESULT hr; DWORD offset; @@ -2175,6 +2183,8 @@ static HRESULT parse_fx10_object_variable(const char *data, size_t data_size, /* Shared variable description contains only type information. */ if (shared_type_desc) return S_OK; + element_count = max(v->type->element_count, 1); + switch (v->type->basetype) { case D3D10_SVT_TEXTURE: @@ -2186,12 +2196,7 @@ static HRESULT parse_fx10_object_variable(const char *data, size_t data_size, case D3D10_SVT_TEXTURE2DMSARRAY: case D3D10_SVT_TEXTURE3D: case D3D10_SVT_TEXTURECUBE: - if (!v->type->element_count) - i = 1; - else - i = v->type->element_count; - - if (!(v->u.resource.srv = heap_calloc(i, sizeof(*v->u.resource.srv)))) + if (!(v->u.resource.srv = heap_calloc(element_count, sizeof(*v->u.resource.srv)))) { ERR("Failed to allocate shader resource view array memory.\n"); return E_OUTOFMEMORY; @@ -2218,19 +2223,11 @@ static HRESULT parse_fx10_object_variable(const char *data, size_t data_size, case D3D10_SVT_PIXELSHADER: case D3D10_SVT_GEOMETRYSHADER: TRACE("Shader type is %s\n", debug_d3d10_shader_variable_type(v->type->basetype)); - for (i = 0; i < max(v->type->element_count, 1); ++i) + for (i = 0; i < element_count; ++i) { DWORD shader_offset, sodecl_offset; - struct d3d10_effect_variable *var; - if (!v->type->element_count) - { - var = v; - } - else - { - var = &v->elements[i]; - } + var = d3d10_array_get_element(v, i); read_dword(ptr, &shader_offset); TRACE("Shader offset: %#x.\n", shader_offset); @@ -2261,7 +2258,6 @@ static HRESULT parse_fx10_object_variable(const char *data, size_t data_size, case D3D10_SVT_SAMPLER: { const struct d3d10_effect_state_storage_info *storage_info; - unsigned int count = max(v->type->element_count, 1); if (!(storage_info = get_storage_info(v->type->basetype))) { @@ -2276,15 +2272,11 @@ static HRESULT parse_fx10_object_variable(const char *data, size_t data_size, return E_FAIL; } - for (i = 0; i < count; ++i) + for (i = 0; i < element_count; ++i) { - struct d3d10_effect_variable *var; unsigned int prop_count; - if (v->type->element_count) - var = &v->elements[i]; - else - var = v; + var = d3d10_array_get_element(v, i); read_dword(ptr, &prop_count); TRACE("State object property count: %#x.\n", prop_count); @@ -3969,10 +3961,9 @@ static void d3d10_effect_pass_set_shader(struct d3d10_effect_pass *pass, const struct d3d10_effect_pass_shader_desc *shader_desc) { ID3D10Device *device = pass->technique->effect->device; - struct d3d10_effect_variable *v = shader_desc->shader; + struct d3d10_effect_variable *v; - if (v->type->element_count) - v = &v->elements[shader_desc->index]; + v = d3d10_array_get_element(shader_desc->shader, shader_desc->index); switch (v->type->basetype) { @@ -7081,8 +7072,7 @@ static HRESULT d3d10_get_shader_variable(struct d3d10_effect_variable *v, UINT s { unsigned int i; - if (v->type->element_count) - v = &v->elements[0]; + v = d3d10_array_get_element(v, 0); if (!shader_index) {

1 0

Nikolay Sivov : d3d10/effect: Pick up resources from elements when shader variable arrays are used.
by Alexandre Julliard Oct. 15, 2021

Oct. 15, 2021

Module: wine Branch: master Commit: 64df3c61a5b7c86f29f292f131c14a41f027a154 URL: https://source.winehq.org/git/wine.git/?a=commit;h=64df3c61a5b7c86f29f292f1… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Oct 14 09:42:18 2021 +0300 d3d10/effect: Pick up resources from elements when shader variable arrays are used. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d10/effect.c | 11 ++-------- dlls/d3d10/tests/effect.c | 54 +++++++++++++++++++++++++---------------------- 2 files changed, 31 insertions(+), 34 deletions(-) diff --git a/dlls/d3d10/effect.c b/dlls/d3d10/effect.c index 17a4c547a2c..29d59f2620b 100644 --- a/dlls/d3d10/effect.c +++ b/dlls/d3d10/effect.c @@ -3979,6 +3979,8 @@ static void d3d10_effect_pass_set_shader(struct d3d10_effect_pass *pass, default: WARN("Unexpected shader type %u.\n", v->type->basetype); } + + apply_shader_resources(device, v); } static HRESULT STDMETHODCALLTYPE d3d10_effect_pass_Apply(ID3D10EffectPass *iface, UINT flags) @@ -3991,20 +3993,11 @@ static HRESULT STDMETHODCALLTYPE d3d10_effect_pass_Apply(ID3D10EffectPass *iface if (flags) FIXME("Ignoring flags (%#x)\n", flags); if (pass->vs.shader != &null_shader_variable) - { d3d10_effect_pass_set_shader(pass, &pass->vs); - apply_shader_resources(device, pass->vs.shader); - } if (pass->gs.shader != &null_shader_variable) - { d3d10_effect_pass_set_shader(pass, &pass->gs); - apply_shader_resources(device, pass->gs.shader); - } if (pass->ps.shader != &null_shader_variable) - { d3d10_effect_pass_set_shader(pass, &pass->ps); - apply_shader_resources(device, pass->ps.shader); - } if (pass->rasterizer) ID3D10Device_RSSetState(device, pass->rasterizer->u.state.object.rasterizer); if (pass->depth_stencil) diff --git a/dlls/d3d10/tests/effect.c b/dlls/d3d10/tests/effect.c index dd16aab5aaa..93e82490eb0 100644 --- a/dlls/d3d10/tests/effect.c +++ b/dlls/d3d10/tests/effect.c @@ -5946,43 +5946,47 @@ float4 PS( float4 pos : SV_POSITION ) : SV_Target return t_a[1].Sample(s[1], float2(0, 0)); } +PixelShader ps[1] = { CompileShader(ps_4_0, PS()) }; + technique10 rsrc_test { pass p0 { - SetPixelShader(CompileShader(ps_4_0, PS())); + SetPixelShader(ps[0]); } } #endif static DWORD fx_test_resource_variable2[] = { - 0x43425844, 0xb62313ac, 0x8116090b, 0xdc1d2951, 0xfc18ca42, 0x00000001, 0x0000035a, 0x00000001, - 0x00000024, 0x30315846, 0x0000032e, 0xfeff1001, 0x00000000, 0x00000000, 0x00000002, 0x00000000, - 0x00000000, 0x00000000, 0x00000001, 0x0000028a, 0x00000000, 0x00000002, 0x00000000, 0x00000000, - 0x00000000, 0x00000002, 0x00000000, 0x00000000, 0x00000001, 0x00000001, 0x00000000, 0x74786554, + 0x43425844, 0xecd43fcd, 0x0654927c, 0x71931f03, 0xf166cc09, 0x00000001, 0x0000039d, 0x00000001, + 0x00000024, 0x30315846, 0x00000371, 0xfeff1001, 0x00000000, 0x00000000, 0x00000003, 0x00000000, + 0x00000000, 0x00000000, 0x00000001, 0x000002b5, 0x00000000, 0x00000002, 0x00000000, 0x00000000, + 0x00000000, 0x00000002, 0x00000000, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x74786554, 0x32657275, 0x00040044, 0x00020000, 0x00020000, 0x00000000, 0x00000000, 0x00000000, 0x000c0000, 0x5f740000, 0x61530061, 0x656c706d, 0x61745372, 0x2e006574, 0x02000000, 0x02000000, 0x00000000, - 0x00000000, 0x00000000, 0x15000000, 0x73000000, 0x72737200, 0x65745f63, 0x70007473, 0x02180030, - 0x58440000, 0xb2424342, 0x3c889e83, 0xb8b8fc18, 0x749f2920, 0x0001877a, 0x02180000, 0x00050000, - 0x00340000, 0x00c80000, 0x00fc0000, 0x01300000, 0x019c0000, 0x44520000, 0x008c4645, 0x00000000, - 0x00000000, 0x00020000, 0x001c0000, 0x04000000, 0x0100ffff, 0x00620000, 0x005c0000, 0x00030000, - 0x00000000, 0x00000000, 0x00000000, 0x00010000, 0x00020000, 0x00010000, 0x005e0000, 0x00020000, - 0x00050000, 0x00040000, 0xffff0000, 0x0000ffff, 0x00020000, 0x000c0000, 0x00730000, 0x00615f74, - 0x7263694d, 0x666f736f, 0x52282074, 0x4c482029, 0x53204c53, 0x65646168, 0x6f432072, 0x6c69706d, - 0x31207265, 0x00312e30, 0x5349abab, 0x002c4e47, 0x00010000, 0x00080000, 0x00200000, 0x00000000, - 0x00010000, 0x00030000, 0x00000000, 0x000f0000, 0x56530000, 0x534f505f, 0x4f495449, 0x534f004e, - 0x002c4e47, 0x00010000, 0x00080000, 0x00200000, 0x00000000, 0x00000000, 0x00030000, 0x00000000, - 0x000f0000, 0x56530000, 0x7261545f, 0x00746567, 0x4853abab, 0x00645244, 0x00400000, 0x00190000, - 0x005a0000, 0x60000300, 0x00020010, 0x18580000, 0x70000400, 0x00010010, 0x55550000, 0x00650000, - 0x20f20300, 0x00000010, 0x00450000, 0x20f20c00, 0x00000010, 0x40020000, 0x00000000, 0x00000000, - 0x00000000, 0x00000000, 0x7e460000, 0x00010010, 0x60000000, 0x00020010, 0x003e0000, 0x54530100, - 0x00745441, 0x00020000, 0x00000000, 0x00000000, 0x00010000, 0x00000000, 0x00000000, 0x00000000, - 0x00010000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00010000, + 0x00000000, 0x00000000, 0x15000000, 0x73000000, 0x78695000, 0x68536c65, 0x72656461, 0x00005900, + 0x00000200, 0x00000100, 0x00000000, 0x00000000, 0x00000000, 0x00000500, 0x00737000, 0x00000218, + 0x43425844, 0x9e83b242, 0xfc183c88, 0x2920b8b8, 0x877a749f, 0x00000001, 0x00000218, 0x00000005, + 0x00000034, 0x000000c8, 0x000000fc, 0x00000130, 0x0000019c, 0x46454452, 0x0000008c, 0x00000000, + 0x00000000, 0x00000002, 0x0000001c, 0xffff0400, 0x00000100, 0x00000062, 0x0000005c, 0x00000003, + 0x00000000, 0x00000000, 0x00000000, 0x00000001, 0x00000002, 0x00000001, 0x0000005e, 0x00000002, + 0x00000005, 0x00000004, 0xffffffff, 0x00000000, 0x00000002, 0x0000000c, 0x5f740073, 0x694d0061, + 0x736f7263, 0x2074666f, 0x20295228, 0x4c534c48, 0x61685320, 0x20726564, 0x706d6f43, 0x72656c69, + 0x2e303120, 0xabab0031, 0x4e475349, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, + 0x00000001, 0x00000003, 0x00000000, 0x0000000f, 0x505f5653, 0x5449534f, 0x004e4f49, 0x4e47534f, + 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, 0x00000003, 0x00000000, + 0x0000000f, 0x545f5653, 0x65677261, 0xabab0074, 0x52444853, 0x00000064, 0x00000040, 0x00000019, + 0x0300005a, 0x00106000, 0x00000002, 0x04001858, 0x00107000, 0x00000001, 0x00005555, 0x03000065, + 0x001020f2, 0x00000000, 0x0c000045, 0x001020f2, 0x00000000, 0x00004002, 0x00000000, 0x00000000, + 0x00000000, 0x00000000, 0x00107e46, 0x00000001, 0x00106000, 0x00000002, 0x0100003e, 0x54415453, + 0x00000074, 0x00000002, 0x00000000, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, + 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, - 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00660000, 0x00000000, - 0x002a0000, 0x000e0000, 0x00000000, 0xffff0000, 0x0000ffff, 0x00570000, 0x003b0000, 0x00000000, - 0xffff0000, 0x0000ffff, 0x00000000, 0x00000000, 0x00590000, 0x00010000, 0x00000000, 0x00630000, - 0x00010000, 0x00000000, 0x00070000, 0x00000000, 0x00070000, 0x02820000, 0x00000000, + 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x63727372, 0x7365745f, + 0x30700074, 0x00008100, 0x00000000, 0x00002a00, 0x00000e00, 0x00000000, 0xffffff00, 0x000000ff, + 0x00005700, 0x00003b00, 0x00000000, 0xffffff00, 0x000000ff, 0x00000000, 0x00000000, 0x00008100, + 0x00006500, 0x00000000, 0xffffff00, 0x000084ff, 0x00000000, 0x0002a000, 0x00000100, 0x00000000, + 0x0002aa00, 0x00000100, 0x00000000, 0x00000700, 0x00000000, 0x00000300, 0x0002ad00, 0x00000000, }; static void create_effect_texture_resource(ID3D10Device *device, ID3D10ShaderResourceView **srv,

1 0

Jan Sikorski : d3d11: Don't grab wined3d lock for resource mapping and unmapping.
by Alexandre Julliard Oct. 15, 2021

Oct. 15, 2021

Module: wine Branch: master Commit: e2bbce0faf61dddfd5f7aff8b2c969471e5f990a URL: https://source.winehq.org/git/wine.git/?a=commit;h=e2bbce0faf61dddfd5f7aff8… Author: Jan Sikorski <jsikorski(a)codeweavers.com> Date: Fri Oct 15 14:26:05 2021 +0200 d3d11: Don't grab wined3d lock for resource mapping and unmapping. Signed-off-by: Jan Sikorski <jsikorski(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/buffer.c | 4 ---- dlls/d3d11/device.c | 4 ---- dlls/d3d11/texture.c | 12 ------------ 3 files changed, 20 deletions(-) diff --git a/dlls/d3d11/buffer.c b/dlls/d3d11/buffer.c index ab8471d6f52..5a6ca81dff4 100644 --- a/dlls/d3d11/buffer.c +++ b/dlls/d3d11/buffer.c @@ -304,11 +304,9 @@ static HRESULT STDMETHODCALLTYPE d3d10_buffer_Map(ID3D10Buffer *iface, D3D10_MAP if (map_flags) FIXME("Ignoring map_flags %#x.\n", map_flags); - wined3d_mutex_lock(); hr = wined3d_resource_map(wined3d_buffer_get_resource(buffer->wined3d_buffer), 0, &wined3d_map_desc, NULL, wined3d_map_flags_from_d3d10_map_type(map_type)); *data = wined3d_map_desc.data; - wined3d_mutex_unlock(); return hr; } @@ -319,9 +317,7 @@ static void STDMETHODCALLTYPE d3d10_buffer_Unmap(ID3D10Buffer *iface) TRACE("iface %p.\n", iface); - wined3d_mutex_lock(); wined3d_resource_unmap(wined3d_buffer_get_resource(buffer->wined3d_buffer), 0); - wined3d_mutex_unlock(); } static void STDMETHODCALLTYPE d3d10_buffer_GetDesc(ID3D10Buffer *iface, D3D10_BUFFER_DESC *desc) diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index 53afb383bc1..47c3a6aec9b 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -815,10 +815,8 @@ static HRESULT STDMETHODCALLTYPE d3d11_device_context_Map(ID3D11DeviceContext1 * wined3d_resource = wined3d_resource_from_d3d11_resource(resource); - wined3d_mutex_lock(); hr = wined3d_device_context_map(context->wined3d_context, wined3d_resource, subresource_idx, &map_desc, NULL, wined3d_map_flags_from_d3d11_map_type(map_type)); - wined3d_mutex_unlock(); mapped_subresource->pData = map_desc.data; mapped_subresource->RowPitch = map_desc.row_pitch; @@ -837,9 +835,7 @@ static void STDMETHODCALLTYPE d3d11_device_context_Unmap(ID3D11DeviceContext1 *i wined3d_resource = wined3d_resource_from_d3d11_resource(resource); - wined3d_mutex_lock(); wined3d_device_context_unmap(context->wined3d_context, wined3d_resource, subresource_idx); - wined3d_mutex_unlock(); } static void STDMETHODCALLTYPE d3d11_device_context_PSSetConstantBuffers(ID3D11DeviceContext1 *iface, diff --git a/dlls/d3d11/texture.c b/dlls/d3d11/texture.c index 4fe395a206c..87928e638d1 100644 --- a/dlls/d3d11/texture.c +++ b/dlls/d3d11/texture.c @@ -349,13 +349,11 @@ static HRESULT STDMETHODCALLTYPE d3d10_texture1d_Map(ID3D10Texture1D *iface, UIN if (map_flags) FIXME("Ignoring map_flags %#x.\n", map_flags); - wined3d_mutex_lock(); if (SUCCEEDED(hr = wined3d_resource_map(wined3d_texture_get_resource(texture->wined3d_texture), sub_resource_idx, &wined3d_map_desc, NULL, wined3d_map_flags_from_d3d10_map_type(map_type)))) { *data = wined3d_map_desc.data; } - wined3d_mutex_unlock(); return hr; } @@ -366,9 +364,7 @@ static void STDMETHODCALLTYPE d3d10_texture1d_Unmap(ID3D10Texture1D *iface, UINT TRACE("iface %p, sub_resource_idx %u.\n", iface, sub_resource_idx); - wined3d_mutex_lock(); wined3d_resource_unmap(wined3d_texture_get_resource(texture->wined3d_texture), sub_resource_idx); - wined3d_mutex_unlock(); } static void STDMETHODCALLTYPE d3d10_texture1d_GetDesc(ID3D10Texture1D *iface, D3D10_TEXTURE1D_DESC *desc) @@ -846,14 +842,12 @@ static HRESULT STDMETHODCALLTYPE d3d10_texture2d_Map(ID3D10Texture2D *iface, UIN if (map_flags) FIXME("Ignoring map_flags %#x.\n", map_flags); - wined3d_mutex_lock(); if (SUCCEEDED(hr = wined3d_resource_map(wined3d_texture_get_resource(texture->wined3d_texture), sub_resource_idx, &wined3d_map_desc, NULL, wined3d_map_flags_from_d3d10_map_type(map_type)))) { mapped_texture->pData = wined3d_map_desc.data; mapped_texture->RowPitch = wined3d_map_desc.row_pitch; } - wined3d_mutex_unlock(); return hr; } @@ -864,9 +858,7 @@ static void STDMETHODCALLTYPE d3d10_texture2d_Unmap(ID3D10Texture2D *iface, UINT TRACE("iface %p, sub_resource_idx %u.\n", iface, sub_resource_idx); - wined3d_mutex_lock(); wined3d_resource_unmap(wined3d_texture_get_resource(texture->wined3d_texture), sub_resource_idx); - wined3d_mutex_unlock(); } static void STDMETHODCALLTYPE d3d10_texture2d_GetDesc(ID3D10Texture2D *iface, D3D10_TEXTURE2D_DESC *desc) @@ -1339,7 +1331,6 @@ static HRESULT STDMETHODCALLTYPE d3d10_texture3d_Map(ID3D10Texture3D *iface, UIN if (map_flags) FIXME("Ignoring map_flags %#x.\n", map_flags); - wined3d_mutex_lock(); if (SUCCEEDED(hr = wined3d_resource_map(wined3d_texture_get_resource(texture->wined3d_texture), sub_resource_idx, &wined3d_map_desc, NULL, wined3d_map_flags_from_d3d10_map_type(map_type)))) { @@ -1347,7 +1338,6 @@ static HRESULT STDMETHODCALLTYPE d3d10_texture3d_Map(ID3D10Texture3D *iface, UIN mapped_texture->RowPitch = wined3d_map_desc.row_pitch; mapped_texture->DepthPitch = wined3d_map_desc.slice_pitch; } - wined3d_mutex_unlock(); return hr; } @@ -1358,9 +1348,7 @@ static void STDMETHODCALLTYPE d3d10_texture3d_Unmap(ID3D10Texture3D *iface, UINT TRACE("iface %p, sub_resource_idx %u.\n", iface, sub_resource_idx); - wined3d_mutex_lock(); wined3d_resource_unmap(wined3d_texture_get_resource(texture->wined3d_texture), sub_resource_idx); - wined3d_mutex_unlock(); } static void STDMETHODCALLTYPE d3d10_texture3d_GetDesc(ID3D10Texture3D *iface, D3D10_TEXTURE3D_DESC *desc)

1 0

Nikolay Sivov : d3d10/effect: Remove unused arguments from shader resources helper.
by Alexandre Julliard Oct. 15, 2021

Oct. 15, 2021

Module: wine Branch: master Commit: f68f88e276ef7973554364753649c8fba6fd93be URL: https://source.winehq.org/git/wine.git/?a=commit;h=f68f88e276ef797355436475… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Oct 14 09:42:16 2021 +0300 d3d10/effect: Remove unused arguments from shader resources helper. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d10/effect.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/d3d10/effect.c b/dlls/d3d10/effect.c index bd104465222..14c18aa77db 100644 --- a/dlls/d3d10/effect.c +++ b/dlls/d3d10/effect.c @@ -618,7 +618,7 @@ static struct d3d10_effect_variable * d3d10_effect_get_variable_by_name( return effect->pool ? d3d10_effect_get_variable_by_name(effect->pool, name) : NULL; } -static HRESULT get_fx10_shader_resources(struct d3d10_effect_variable *v, const void *data, size_t data_size) +static HRESULT get_fx10_shader_resources(struct d3d10_effect_variable *v) { struct d3d10_effect_shader_variable *sv = &v->u.shader; struct d3d10_effect_shader_resource *sr; @@ -846,7 +846,7 @@ static HRESULT parse_fx10_shader(const char *data, size_t data_size, DWORD offse memcpy(ID3D10Blob_GetBufferPointer(v->u.shader.bytecode), ptr, dxbc_size); - if (FAILED(hr = get_fx10_shader_resources(v, ptr, dxbc_size))) + if (FAILED(hr = get_fx10_shader_resources(v))) return hr; switch (v->type->basetype)

1 0

Paul Gofman : winhttp: Process end of read data before sending callback in read_data().
by Alexandre Julliard Oct. 15, 2021

Oct. 15, 2021

Module: wine Branch: master Commit: 3a8ccb924268c5f9eeff204c87ba30dc0fe587e2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3a8ccb924268c5f9eeff204c… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Fri Oct 15 16:59:49 2021 +0300 winhttp: Process end of read data before sending callback in read_data(). Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winhttp/request.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index c908e26956f..d76edfa71d7 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -1848,6 +1848,7 @@ static DWORD read_data( struct request *request, void *buffer, DWORD size, DWORD done: TRACE( "retrieved %u bytes (%u/%u)\n", bytes_read, request->content_read, request->content_length ); + if (end_of_read_data( request )) finished_reading( request ); if (async) { if (!ret) send_callback( &request->hdr, WINHTTP_CALLBACK_STATUS_READ_COMPLETE, buffer, bytes_read ); @@ -1861,7 +1862,6 @@ done: } if (!ret && read) *read = bytes_read; - if (end_of_read_data( request )) finished_reading( request ); return ret; }

1 0

Jan Sikorski : d3d11: Don't grab wined3d lock for wined3d state setters.
by Alexandre Julliard Oct. 15, 2021

Oct. 15, 2021

Module: wine Branch: master Commit: 228c3bdfec897bd1b73474686fae8f23dda7aa29 URL: https://source.winehq.org/git/wine.git/?a=commit;h=228c3bdfec897bd1b7347468… Author: Jan Sikorski <jsikorski(a)codeweavers.com> Date: Fri Oct 15 14:26:06 2021 +0200 d3d11: Don't grab wined3d lock for wined3d state setters. Signed-off-by: Jan Sikorski <jsikorski(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/device.c | 71 ----------------------------------------------------- 1 file changed, 71 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=228c3bdfec897bd1b734…

1 0

Jan Sikorski : wined3d: Make reference count decrementing functions thread safe.
by Alexandre Julliard Oct. 15, 2021

Oct. 15, 2021

Module: wine Branch: master Commit: 90cd8b0764638bffe2f50fccf989189016b1359f URL: https://source.winehq.org/git/wine.git/?a=commit;h=90cd8b0764638bffe2f50fcc… Author: Jan Sikorski <jsikorski(a)codeweavers.com> Date: Fri Oct 15 14:25:57 2021 +0200 wined3d: Make reference count decrementing functions thread safe. Signed-off-by: Jan Sikorski <jsikorski(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/buffer.c | 2 ++ dlls/wined3d/cs.c | 2 +- dlls/wined3d/device.c | 2 ++ dlls/wined3d/directx.c | 2 ++ dlls/wined3d/palette.c | 4 ++++ dlls/wined3d/query.c | 2 ++ dlls/wined3d/sampler.c | 2 ++ dlls/wined3d/shader.c | 2 ++ dlls/wined3d/state.c | 6 ++++++ dlls/wined3d/stateblock.c | 2 ++ dlls/wined3d/texture.c | 7 +++++++ dlls/wined3d/vertexdeclaration.c | 2 ++ dlls/wined3d/view.c | 12 ++++++++++++ 13 files changed, 46 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index 3430b8b1e97..d259b64bfaf 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -708,8 +708,10 @@ ULONG CDECL wined3d_buffer_decref(struct wined3d_buffer *buffer) if (!refcount) { + wined3d_mutex_lock(); buffer->resource.parent_ops->wined3d_object_destroyed(buffer->resource.parent); buffer->resource.device->adapter->adapter_ops->adapter_destroy_buffer(buffer); + wined3d_mutex_unlock(); } return refcount; diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index 5934f36e1e9..f266e59b4b5 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -99,7 +99,6 @@ ULONG CDECL wined3d_command_list_decref(struct wined3d_command_list *list) { SIZE_T i; - wined3d_mutex_lock(); for (i = 0; i < list->command_list_count; ++i) wined3d_command_list_decref(list->command_lists[i]); for (i = 0; i < list->resource_count; ++i) @@ -109,6 +108,7 @@ ULONG CDECL wined3d_command_list_decref(struct wined3d_command_list *list) for (i = 0; i < list->query_count; ++i) wined3d_query_decref(list->queries[i].query); + wined3d_mutex_lock(); wined3d_cs_destroy_object(device->cs, wined3d_command_list_destroy_object, list); wined3d_mutex_unlock(); } diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index b8c1630ee25..6b2f18c6996 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -263,8 +263,10 @@ ULONG CDECL wined3d_device_decref(struct wined3d_device *device) if (!refcount) { + wined3d_mutex_lock(); device->adapter->adapter_ops->adapter_destroy_device(device); TRACE("Destroyed device %p.\n", device); + wined3d_mutex_unlock(); } return refcount; diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 58aaf44fc45..c265bdc8c95 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -187,6 +187,7 @@ ULONG CDECL wined3d_decref(struct wined3d *wined3d) { unsigned int i; + wined3d_mutex_lock(); for (i = 0; i < wined3d->adapter_count; ++i) { struct wined3d_adapter *adapter = wined3d->adapters[i]; @@ -194,6 +195,7 @@ ULONG CDECL wined3d_decref(struct wined3d *wined3d) adapter->adapter_ops->adapter_destroy(adapter); } heap_free(wined3d); + wined3d_mutex_unlock(); } return refcount; diff --git a/dlls/wined3d/palette.c b/dlls/wined3d/palette.c index 85105d1f8de..4bc453bde79 100644 --- a/dlls/wined3d/palette.c +++ b/dlls/wined3d/palette.c @@ -47,7 +47,11 @@ ULONG CDECL wined3d_palette_decref(struct wined3d_palette *palette) TRACE("%p decreasing refcount to %u.\n", palette, refcount); if (!refcount) + { + wined3d_mutex_lock(); wined3d_cs_destroy_object(palette->device->cs, wined3d_palette_destroy_object, palette); + wined3d_mutex_unlock(); + } return refcount; } diff --git a/dlls/wined3d/query.c b/dlls/wined3d/query.c index 8ee7ae07886..1b38eb5e311 100644 --- a/dlls/wined3d/query.c +++ b/dlls/wined3d/query.c @@ -444,9 +444,11 @@ ULONG CDECL wined3d_query_decref(struct wined3d_query *query) { struct wined3d_device *device = query->device; + wined3d_mutex_lock(); query->parent_ops->wined3d_object_destroyed(query->parent); wined3d_cs_destroy_object(device->cs, wined3d_query_destroy_object, query); device->adapter->adapter_ops->adapter_destroy_query(query); + wined3d_mutex_unlock(); } return refcount; diff --git a/dlls/wined3d/sampler.c b/dlls/wined3d/sampler.c index 7eb3a2ae0be..bba3165316e 100644 --- a/dlls/wined3d/sampler.c +++ b/dlls/wined3d/sampler.c @@ -41,8 +41,10 @@ ULONG CDECL wined3d_sampler_decref(struct wined3d_sampler *sampler) if (!refcount) { + wined3d_mutex_lock(); sampler->parent_ops->wined3d_object_destroyed(sampler->parent); sampler->device->adapter->adapter_ops->adapter_destroy_sampler(sampler); + wined3d_mutex_unlock(); } return refcount; diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index fb7115a26dd..957710dbd43 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -3439,8 +3439,10 @@ ULONG CDECL wined3d_shader_decref(struct wined3d_shader *shader) if (!refcount) { + wined3d_mutex_lock(); shader->parent_ops->wined3d_object_destroyed(shader->parent); wined3d_cs_destroy_object(shader->device->cs, wined3d_shader_destroy_object, shader); + wined3d_mutex_unlock(); } return refcount; diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 8316269afcf..c7f041066d1 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -62,8 +62,10 @@ ULONG CDECL wined3d_blend_state_decref(struct wined3d_blend_state *state) if (!refcount) { + wined3d_mutex_lock(); state->parent_ops->wined3d_object_destroyed(state->parent); wined3d_cs_destroy_object(device->cs, wined3d_blend_state_destroy_object, state); + wined3d_mutex_unlock(); } return refcount; @@ -136,8 +138,10 @@ ULONG CDECL wined3d_depth_stencil_state_decref(struct wined3d_depth_stencil_stat if (!refcount) { + wined3d_mutex_lock(); state->parent_ops->wined3d_object_destroyed(state->parent); wined3d_cs_destroy_object(device->cs, wined3d_depth_stencil_state_destroy_object, state); + wined3d_mutex_unlock(); } return refcount; @@ -199,8 +203,10 @@ ULONG CDECL wined3d_rasterizer_state_decref(struct wined3d_rasterizer_state *sta if (!refcount) { + wined3d_mutex_lock(); state->parent_ops->wined3d_object_destroyed(state->parent); wined3d_cs_destroy_object(device->cs, wined3d_rasterizer_state_destroy_object, state); + wined3d_mutex_unlock(); } return refcount; diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c index 39a19984498..8590a2a1c1f 100644 --- a/dlls/wined3d/stateblock.c +++ b/dlls/wined3d/stateblock.c @@ -585,8 +585,10 @@ ULONG CDECL wined3d_stateblock_decref(struct wined3d_stateblock *stateblock) if (!refcount) { + wined3d_mutex_lock(); wined3d_stateblock_state_cleanup(&stateblock->stateblock_state); heap_free(stateblock); + wined3d_mutex_unlock(); } return refcount; diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 339bf4e205a..f031daef373 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -1536,6 +1536,11 @@ ULONG CDECL wined3d_texture_decref(struct wined3d_texture *texture) if (!refcount) { + bool in_cs_thread = GetCurrentThreadId() == texture->resource.device->cs->thread_id; + + /* This is called from the CS thread to destroy temporary textures. */ + if (!in_cs_thread) + wined3d_mutex_lock(); /* Wait for the texture to become idle if it's using user memory, * since the application is allowed to free that memory once the * texture is destroyed. Note that this implies that @@ -1550,6 +1555,8 @@ ULONG CDECL wined3d_texture_decref(struct wined3d_texture *texture) } } texture->resource.device->adapter->adapter_ops->adapter_destroy_texture(texture); + if (!in_cs_thread) + wined3d_mutex_unlock(); } return refcount; diff --git a/dlls/wined3d/vertexdeclaration.c b/dlls/wined3d/vertexdeclaration.c index 45a01f4bdd4..a778352d2cf 100644 --- a/dlls/wined3d/vertexdeclaration.c +++ b/dlls/wined3d/vertexdeclaration.c @@ -68,9 +68,11 @@ ULONG CDECL wined3d_vertex_declaration_decref(struct wined3d_vertex_declaration if (!refcount) { + wined3d_mutex_lock(); declaration->parent_ops->wined3d_object_destroyed(declaration->parent); wined3d_cs_destroy_object(declaration->device->cs, wined3d_vertex_declaration_destroy_object, declaration); + wined3d_mutex_unlock(); } return refcount; diff --git a/dlls/wined3d/view.c b/dlls/wined3d/view.c index a8b3a7b4f75..94bbe27bd5c 100644 --- a/dlls/wined3d/view.c +++ b/dlls/wined3d/view.c @@ -376,7 +376,11 @@ ULONG CDECL wined3d_rendertarget_view_decref(struct wined3d_rendertarget_view *v TRACE("%p decreasing refcount to %u.\n", view, refcount); if (!refcount) + { + wined3d_mutex_lock(); view->resource->device->adapter->adapter_ops->adapter_destroy_rendertarget_view(view); + wined3d_mutex_unlock(); + } return refcount; } @@ -923,7 +927,11 @@ ULONG CDECL wined3d_shader_resource_view_decref(struct wined3d_shader_resource_v TRACE("%p decreasing refcount to %u.\n", view, refcount); if (!refcount) + { + wined3d_mutex_lock(); view->resource->device->adapter->adapter_ops->adapter_destroy_shader_resource_view(view); + wined3d_mutex_unlock(); + } return refcount; } @@ -1441,7 +1449,11 @@ ULONG CDECL wined3d_unordered_access_view_decref(struct wined3d_unordered_access TRACE("%p decreasing refcount to %u.\n", view, refcount); if (!refcount) + { + wined3d_mutex_lock(); view->resource->device->adapter->adapter_ops->adapter_destroy_unordered_access_view(view); + wined3d_mutex_unlock(); + } return refcount; }

1 0