- Wine-Devel - list.winehq.org

[PATCH 2/4] dmsynth: Pass the master clock on to the sink
by Michael Stefaniuc Jan. 20, 2022

Jan. 20, 2022

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/dmsynth/synth.c | 7 +++++-- dlls/dmusic/port.c | 3 --- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/dmsynth/synth.c b/dlls/dmsynth/synth.c index 3d3af80d005..51b33e8df8d 100644 --- a/dlls/dmsynth/synth.c +++ b/dlls/dmsynth/synth.c @@ -305,9 +305,12 @@ static HRESULT WINAPI IDirectMusicSynth8Impl_SetMasterClock(IDirectMusicSynth8 * { IDirectMusicSynth8Impl *This = impl_from_IDirectMusicSynth8(iface); - FIXME("(%p)->(%p): stub\n", This, clock); + TRACE("(%p)->(%p)\n", This, clock); - return S_OK; + if (!This->sink) + return DMUS_E_NOSYNTHSINK; + + return IDirectMusicSynthSink_SetMasterClock(This->sink, clock); } static HRESULT WINAPI IDirectMusicSynth8Impl_GetLatencyClock(IDirectMusicSynth8 *iface, diff --git a/dlls/dmusic/port.c b/dlls/dmusic/port.c index 165bd520191..88c7c60a50d 100644 --- a/dlls/dmusic/port.c +++ b/dlls/dmusic/port.c @@ -856,9 +856,6 @@ HRESULT synth_port_create(IDirectMusic8Impl *parent, DMUS_PORTPARAMS *port_param if (SUCCEEDED(hr)) hr = IDirectMusicSynth_SetMasterClock(obj->synth, obj->pLatencyClock); - if (SUCCEEDED(hr)) - hr = IDirectMusicSynthSink_SetMasterClock(obj->synth_sink, obj->pLatencyClock); - if (SUCCEEDED(hr)) hr = IDirectMusicSynth_Open(obj->synth, port_params); -- 2.31.1

1 0

[PATCH 1/4] dmusic: Call SetSynkSink() first to initialize the Synth
by Michael Stefaniuc Jan. 20, 2022

Jan. 20, 2022

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/dmusic/port.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/dmusic/port.c b/dlls/dmusic/port.c index 7bd2afdb9a3..165bd520191 100644 --- a/dlls/dmusic/port.c +++ b/dlls/dmusic/port.c @@ -851,13 +851,13 @@ HRESULT synth_port_create(IDirectMusic8Impl *parent, DMUS_PORTPARAMS *port_param hr = CoCreateInstance(&CLSID_DirectMusicSynthSink, NULL, CLSCTX_INPROC_SERVER, &IID_IDirectMusicSynthSink, (void**)&obj->synth_sink); if (SUCCEEDED(hr)) - hr = IDirectMusicSynth_SetMasterClock(obj->synth, obj->pLatencyClock); + hr = IDirectMusicSynth_SetSynthSink(obj->synth, obj->synth_sink); if (SUCCEEDED(hr)) - hr = IDirectMusicSynthSink_SetMasterClock(obj->synth_sink, obj->pLatencyClock); + hr = IDirectMusicSynth_SetMasterClock(obj->synth, obj->pLatencyClock); if (SUCCEEDED(hr)) - hr = IDirectMusicSynth_SetSynthSink(obj->synth, obj->synth_sink); + hr = IDirectMusicSynthSink_SetMasterClock(obj->synth_sink, obj->pLatencyClock); if (SUCCEEDED(hr)) hr = IDirectMusicSynth_Open(obj->synth, port_params); -- 2.31.1

1 0

[PATCH vkd3d v2 2/8] tests: Test struct initializers.
by Francisco Casas Jan. 20, 2022

Jan. 20, 2022

Signed-off-by: Francisco Casas <fcasas(a)codeweavers.com> --- Makefile.am | 2 + tests/hlsl-initializer-struct.shader_test | 77 +++++++++++++++++++++++ 2 files changed, 79 insertions(+) create mode 100644 tests/hlsl-initializer-struct.shader_test diff --git a/Makefile.am b/Makefile.am index 3545d74b..051053cd 100644 --- a/Makefile.am +++ b/Makefile.am @@ -70,6 +70,7 @@ vkd3d_shader_tests = \ tests/hlsl-function-overload.shader_test \ tests/hlsl-initializer-local-array.shader_test \ tests/hlsl-initializer-static-array.shader_test \ + tests/hlsl-initializer-struct.shader_test \ tests/hlsl-intrinsic-override.shader_test \ tests/hlsl-invalid.shader_test \ tests/hlsl-majority-pragma.shader_test \ @@ -293,6 +294,7 @@ XFAIL_TESTS = \ tests/hlsl-array-dimension.shader_test \ tests/hlsl-initializer-local-array.shader_test \ tests/hlsl-initializer-static-array.shader_test \ + tests/hlsl-initializer-struct.shader_test \ tests/hlsl-bool-cast.shader_test \ tests/hlsl-duplicate-modifiers.shader_test \ tests/hlsl-for.shader_test \ diff --git a/tests/hlsl-initializer-struct.shader_test b/tests/hlsl-initializer-struct.shader_test new file mode 100644 index 00000000..ab9ac0f3 --- /dev/null +++ b/tests/hlsl-initializer-struct.shader_test @@ -0,0 +1,77 @@ +[pixel shader] +struct stu { + int3 aaa; + float3 bbb; + double2 ccc; + float4 ddd; + int eee; +}; + +float4 main() : sv_target +{ + struct stu val = { + 11, 12, 13, + 21, 22, 23, + 31, 32, + 41, 42, 43, 44, + 51 + }; + return val.ddd; +} + +[test] +draw quad +probe all rgba (41, 42, 43, 44) + + +[pixel shader] +struct stu { + int3 aaa; + float3 bbb[2]; + double2 ccc; + float4 ddd[3][2]; + int eee; +}; + +float4 main() : sv_target +{ + struct stu val = { + 11, 12, 13, + 211, 212, 213, 221, 222, 223, + 31, 32, + 4111, 4112, 4113, 4114, 4121, 4122, 4123, 4124, + 4211, 4212, 4213, 4214, 4221, 4222, 4223, 4224, + 4311, 4312, 4313, 4314, 4321, 4322, 4323, 4324, + 51 + }; + return val.ddd[2][0]; +} + +[test] +draw quad +probe all rgba (4311, 4312, 4313, 4314) + + +[pixel shader] +struct stu { + int3 aaa; + struct { + float4 foo; + int2 bar; + } bbb[3]; +}; + +float4 main() : sv_target +{ + struct stu val = { + 1, 2, 3, + 11, 12, 13, 14, 15, 16, + 21, 22, 23, 24, 25, 26, + 31, 32, 33, 34, 35, 36 + }; + return val.bbb[1].foo; +} + +[test] +draw quad +probe all rgba (21, 22, 23, 24) -- 2.25.1

2 1

[PATCH] widl: Allow optional interface parameter on the [activatable] attribute.
by Bernhard Kölbl Jan. 20, 2022

Jan. 20, 2022

As per MIDL 3.0. Needed for some WinRT runtime classes. Signed-off-by: Bernhard Kölbl <besentv(a)gmail.com> --- tools/widl/parser.y | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/tools/widl/parser.y b/tools/widl/parser.y index fa863921c92..04365d62280 100644 --- a/tools/widl/parser.y +++ b/tools/widl/parser.y @@ -278,6 +278,7 @@ static typelib_t *current_typelib; %type <expr_list> m_exprs /* exprs expr_list */ expr_list_int_const %type <expr> contract_req %type <expr> static_attr +%type <expr> activatable_attr %type <type> delegatedef %type <stgclass> storage_cls_spec %type <type_qualifier> type_qualifier m_type_qual_list @@ -580,8 +581,16 @@ static_attr: decl_spec ',' contract_req { if ($1->type->type_type != TYPE_INTER $$ = make_exprt(EXPR_MEMBER, declare_var(NULL, $1, make_declarator(NULL), 0), $3); } +/* The interface part of the activatable attribute is only checked +for the type, but won't be further used by the following nonterminal. */ +activatable_attr: + contract_req { $$ = $1; } + | decl_spec ',' contract_req { if ($1->type->type_type != TYPE_INTERFACE) + error_loc("type %s is not an interface\n", $1->type->name); + $$ = $3; } + attribute: { $$ = NULL; } - | tACTIVATABLE '(' contract_req ')' { $$ = make_attrp(ATTR_ACTIVATABLE, $3); } + | tACTIVATABLE '(' activatable_attr ')' { $$ = make_attrp(ATTR_ACTIVATABLE, $3); } | tAGGREGATABLE { $$ = make_attr(ATTR_AGGREGATABLE); } | tANNOTATION '(' aSTRING ')' { $$ = make_attrp(ATTR_ANNOTATION, $3); } | tAPPOBJECT { $$ = make_attr(ATTR_APPOBJECT); } -- 2.34.1

1 0

[PATCH 5/5] wined3d: Properly compare integers in wined3d_so_desc_compare().
by Henri Verbeet Jan. 20, 2022

Jan. 20, 2022

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/device.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 93c738ad955..71b5aaa5742 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -5733,11 +5733,11 @@ static int wined3d_so_desc_compare(const void *key, const struct wine_rb_entry * unsigned int i; int ret; - if ((ret = (k->element_count - desc->element_count))) + if ((ret = wined3d_uint32_compare(k->element_count, desc->element_count))) return ret; - if ((ret = (k->buffer_stride_count - desc->buffer_stride_count))) + if ((ret = wined3d_uint32_compare(k->buffer_stride_count, desc->buffer_stride_count))) return ret; - if ((ret = (k->rasterizer_stream_idx - desc->rasterizer_stream_idx))) + if ((ret = wined3d_uint32_compare(k->rasterizer_stream_idx, desc->rasterizer_stream_idx))) return ret; for (i = 0; i < k->element_count; ++i) @@ -5745,25 +5745,25 @@ static int wined3d_so_desc_compare(const void *key, const struct wine_rb_entry * const struct wined3d_stream_output_element *b = &desc->elements[i]; const struct wined3d_stream_output_element *a = &k->elements[i]; - if ((ret = (a->stream_idx - b->stream_idx))) + if ((ret = wined3d_uint32_compare(a->stream_idx, b->stream_idx))) return ret; if ((ret = (!a->semantic_name - !b->semantic_name))) return ret; if (a->semantic_name && (ret = strcmp(a->semantic_name, b->semantic_name))) return ret; - if ((ret = (a->semantic_idx - b->semantic_idx))) + if ((ret = wined3d_uint32_compare(a->semantic_idx, b->semantic_idx))) return ret; - if ((ret = (a->component_idx - b->component_idx))) + if ((ret = wined3d_uint32_compare(a->component_idx, b->component_idx))) return ret; - if ((ret = (a->component_count - b->component_count))) + if ((ret = wined3d_uint32_compare(a->component_count, b->component_count))) return ret; - if ((ret = (a->output_slot - b->output_slot))) + if ((ret = wined3d_uint32_compare(a->output_slot, b->output_slot))) return ret; } for (i = 0; i < k->buffer_stride_count; ++i) { - if ((ret = (k->buffer_strides[i] - desc->buffer_strides[i]))) + if ((ret = wined3d_uint32_compare(k->buffer_strides[i], desc->buffer_strides[i]))) return ret; } -- 2.30.2

1 0

[PATCH 4/5] wined3d: Properly compare integers in wined3d_pipeline_layout_vk_compare().
by Henri Verbeet Jan. 20, 2022

Jan. 20, 2022

As pointed out by Giovanni, modular subtraction doesn't produce a total order; in particular, it's not transitive. For the values likely to be encountered by wined3d_pipeline_layout_vk_compare(), this is perhaps unlikely to be an issue in practice. However, that's not necessarily the case for e.g. handles or masks. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/context_vk.c | 5 +++-- dlls/wined3d/wined3d_private.h | 5 +++++ 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/context_vk.c b/dlls/wined3d/context_vk.c index fd6d810f0e2..cf6247387ca 100644 --- a/dlls/wined3d/context_vk.c +++ b/dlls/wined3d/context_vk.c @@ -1797,9 +1797,10 @@ static int wined3d_pipeline_layout_vk_compare(const void *key, const struct wine const struct wined3d_pipeline_layout_key_vk *a = key; const struct wined3d_pipeline_layout_key_vk *b = &WINE_RB_ENTRY_VALUE(entry, const struct wined3d_pipeline_layout_vk, entry)->key; + int ret; - if (a->binding_count != b->binding_count) - return a->binding_count - b->binding_count; + if ((ret = wined3d_uint32_compare(a->binding_count, b->binding_count))) + return ret; return memcmp(a->bindings, b->bindings, a->binding_count * sizeof(*a->bindings)); } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 5fa51a844ac..c9d83b3fbc7 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -447,6 +447,11 @@ static inline unsigned int wined3d_popcount(unsigned int x) #endif } +static inline int wined3d_uint32_compare(uint32_t x, uint32_t y) +{ + return (x > y) - (x < y); +} + #define ORM_BACKBUFFER 0 #define ORM_FBO 1 -- 2.30.2

1 0

[PATCH 3/5] wined3d: Use wined3d_mask_from_size() in wined3d_ffp_get_fs_settings().
by Henri Verbeet Jan. 20, 2022

Jan. 20, 2022

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/utils.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 4724393905b..69c73487240 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -6549,7 +6549,7 @@ void wined3d_ffp_get_fs_settings(const struct wined3d_context *context, const st } else { - settings->texcoords_initialized = (1u << WINED3D_MAX_TEXTURES) - 1; + settings->texcoords_initialized = wined3d_mask_from_size(WINED3D_MAX_TEXTURES); } settings->pointsprite = state->render_states[WINED3D_RS_POINTSPRITEENABLE] -- 2.30.2

1 0

[PATCH 2/5] wined3d: Use wined3d_mask_from_size() in wined3d_ffp_get_vs_settings().
by Henri Verbeet Jan. 20, 2022

Jan. 20, 2022

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/utils.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 5e375f43a48..4724393905b 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -6734,7 +6734,7 @@ void wined3d_ffp_get_vs_settings(const struct wined3d_context *context, settings->texgen[i] = state->texture_states[i][WINED3D_TSS_TEXCOORD_INDEX]; } if (d3d_info->full_ffp_varyings) - settings->texcoords = (1u << WINED3D_MAX_TEXTURES) - 1; + settings->texcoords = wined3d_mask_from_size(WINED3D_MAX_TEXTURES); if (d3d_info->emulated_flatshading) settings->flatshading = state->render_states[WINED3D_RS_SHADEMODE] == WINED3D_SHADE_FLAT; @@ -6783,7 +6783,7 @@ void wined3d_ffp_get_vs_settings(const struct wined3d_context *context, settings->texgen[i] = state->texture_states[i][WINED3D_TSS_TEXCOORD_INDEX]; } if (d3d_info->full_ffp_varyings) - settings->texcoords = (1u << WINED3D_MAX_TEXTURES) - 1; + settings->texcoords = wined3d_mask_from_size(WINED3D_MAX_TEXTURES); for (i = 0; i < WINED3D_MAX_ACTIVE_LIGHTS; ++i) { -- 2.30.2

1 0

[PATCH 1/5] wined3d: Discard texture resources before unloading them in wined3d_texture_destroy_object().
by Henri Verbeet Jan. 20, 2022

Jan. 20, 2022

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/texture.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index a638ec4eeae..34d76249084 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -1507,6 +1507,16 @@ static void wined3d_texture_destroy_object(void *object) heap_free(texture->dirty_regions); } + /* Discard the contents of resources with CPU access, to avoid downloading + * them to SYSMEM on unload. */ + if (resource->access & WINED3D_RESOURCE_ACCESS_CPU) + { + for (i = 0; i < sub_count; ++i) + { + wined3d_texture_validate_location(texture, i, WINED3D_LOCATION_DISCARDED); + wined3d_texture_invalidate_location(texture, i, ~WINED3D_LOCATION_DISCARDED); + } + } resource->resource_ops->resource_unload(resource); } -- 2.30.2

1 0

[PATCH] d3d11/tests: Ignore random WARP failures in test_pipeline_statistics_query.
by Stefan Dösinger Jan. 20, 2022

Jan. 20, 2022

Signed-off-by: Stefan Dösinger <stefan(a)codeweavers.com> --- dlls/d3d11/tests/d3d11.c | 36 ++++++++++++++++++++++++------------ 1 file changed, 24 insertions(+), 12 deletions(-) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 4b06ba2c4d8..0ab38e366d3 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -5900,6 +5900,7 @@ static void test_occlusion_query(void) static void test_pipeline_statistics_query(void) { + static const D3D11_QUERY_DATA_PIPELINE_STATISTICS zero_data = {0}; static const struct vec4 red = {1.0f, 0.0f, 0.0f, 1.0f}; static const float white[] = {1.0f, 1.0f, 1.0f, 1.0f}; @@ -5947,18 +5948,29 @@ static void test_pipeline_statistics_query(void) ID3D11DeviceContext_End(context, query); get_query_data(context, query, &data, sizeof(data)); - ok(data.IAVertices == 4, "Got unexpected IAVertices count: %u.\n", (unsigned int)data.IAVertices); - ok(data.IAPrimitives == 2, "Got unexpected IAPrimitives count: %u.\n", (unsigned int)data.IAPrimitives); - ok(data.VSInvocations == 4, "Got unexpected VSInvocations count: %u.\n", (unsigned int)data.VSInvocations); - ok(!data.GSInvocations, "Got unexpected GSInvocations count: %u.\n", (unsigned int)data.GSInvocations); - ok(!data.GSPrimitives, "Got unexpected GSPrimitives count: %u.\n", (unsigned int)data.GSPrimitives); - ok(data.CInvocations == 2, "Got unexpected CInvocations count: %u.\n", (unsigned int)data.CInvocations); - ok(data.CPrimitives == 2, "Got unexpected CPrimitives count: %u.\n", (unsigned int)data.CPrimitives); - todo_wine - ok(!data.PSInvocations, "Got unexpected PSInvocations count: %u.\n", (unsigned int)data.PSInvocations); - ok(!data.HSInvocations, "Got unexpected HSInvocations count: %u.\n", (unsigned int)data.HSInvocations); - ok(!data.DSInvocations, "Got unexpected DSInvocations count: %u.\n", (unsigned int)data.DSInvocations); - ok(!data.CSInvocations, "Got unexpected CSInvocations count: %u.\n", (unsigned int)data.CSInvocations); + + /* WARP devices randomly return all-zeroed structures as if the draw did not happen. Flushing and + * sleeping a second before ending the query reduces the likelyhood of hitting the bug a lot, but + * does not eliminate it entirely. To make things work reliably ignore such broken results. */ + if (is_warp_device(device) && !memcmp(&data, &zero_data, sizeof(data))) + { + win_skip("WARP device randomly returns zeroed query results.\n"); + } + else + { + ok(data.IAVertices == 4, "Got unexpected IAVertices count: %u.\n", (unsigned int)data.IAVertices); + ok(data.IAPrimitives == 2, "Got unexpected IAPrimitives count: %u.\n", (unsigned int)data.IAPrimitives); + ok(data.VSInvocations == 4, "Got unexpected VSInvocations count: %u.\n", (unsigned int)data.VSInvocations); + ok(!data.GSInvocations, "Got unexpected GSInvocations count: %u.\n", (unsigned int)data.GSInvocations); + ok(!data.GSPrimitives, "Got unexpected GSPrimitives count: %u.\n", (unsigned int)data.GSPrimitives); + ok(data.CInvocations == 2, "Got unexpected CInvocations count: %u.\n", (unsigned int)data.CInvocations); + ok(data.CPrimitives == 2, "Got unexpected CPrimitives count: %u.\n", (unsigned int)data.CPrimitives); + todo_wine + ok(!data.PSInvocations, "Got unexpected PSInvocations count: %u.\n", (unsigned int)data.PSInvocations); + ok(!data.HSInvocations, "Got unexpected HSInvocations count: %u.\n", (unsigned int)data.HSInvocations); + ok(!data.DSInvocations, "Got unexpected DSInvocations count: %u.\n", (unsigned int)data.DSInvocations); + ok(!data.CSInvocations, "Got unexpected CSInvocations count: %u.\n", (unsigned int)data.CSInvocations); + } ID3D11DeviceContext_Begin(context, query); draw_color_quad(&test_context, &red); -- 2.34.1

3 2