August 2023 - Wine-commits - list.winehq.org

Esme Povirk : user32/tests: Distinguish between extra and missing messages.
by Alexandre Julliard 28 Aug '23

28 Aug '23

Module: wine Branch: master Commit: 33c2aa3ae168dd68201543ad3fa30e2e1d66ba9d URL: https://gitlab.winehq.org/wine/wine/-/commit/33c2aa3ae168dd68201543ad3fa30e… Author: Esme Povirk <esme(a)codeweavers.com> Date: Wed Aug 2 13:47:21 2023 -0500 user32/tests: Distinguish between extra and missing messages. This may not be very clever, but it should make the output much more readable when sequences fail. --- dlls/user32/tests/msg.c | 33 +++++++++++++++++++++++++++------ 1 file changed, 27 insertions(+), 6 deletions(-) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index 54d036ba57b..cd540db2580 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -2693,6 +2693,17 @@ static BOOL messages_equal(const struct message *expected, const struct recvd_me return TRUE; } +static BOOL sequence_contains_message(const struct message *expected, const struct recvd_message *actual) +{ + while (expected->message) + { + if (messages_equal(expected, actual, FALSE, __FILE__, __LINE__)) + return TRUE; + expected++; + } + return FALSE; +} + static void dump_sequence(const struct message *expected, const char *context, const char *file, int line) { const struct recvd_message *actual = sequence; @@ -2707,17 +2718,21 @@ static void dump_sequence(const struct message *expected, const char *context, c count, message_type_name(expected->flags), expected->message, actual->output ); } - if (!messages_equal(expected, actual, FALSE, file, line) && - can_skip_message(expected)) + if (messages_equal(expected, actual, FALSE, file, line)) + { + expected++; + actual++; + count++; + } + else if (can_skip_message(expected) || sequence_contains_message(expected, actual)) { expected++; + count++; } else { - expected++; actual++; } - count++; } /* optional trailing messages */ @@ -2844,6 +2859,7 @@ static void ok_sequence_(const struct message *expected_list, const char *contex if ((expected->flags & parent) != (actual->flags & parent)) dump++; expected++; + count++; actual++; } /* @@ -2852,6 +2868,7 @@ static void ok_sequence_(const struct message *expected_list, const char *contex else if (can_skip_message(expected)) { expected++; + count++; } else if (todo) { @@ -2860,13 +2877,17 @@ static void ok_sequence_(const struct message *expected_list, const char *contex dump++; goto done; } - else + else if (sequence_contains_message(expected, actual)) { dump++; expected++; + count++; + } + else + { + dump++; actual++; } - count++; winetest_pop_context(); winetest_push_context("%s: %u", context, count);

1 0

Esme Povirk : user32/tests: Always generate a description for WM_NCCALCSIZE.
by Alexandre Julliard 28 Aug '23

28 Aug '23

Module: wine Branch: master Commit: afb00f7d987617a7351204c2f590d3e708030906 URL: https://gitlab.winehq.org/wine/wine/-/commit/afb00f7d987617a7351204c2f590d3… Author: Esme Povirk <esme(a)codeweavers.com> Date: Wed Aug 2 13:56:16 2023 -0500 user32/tests: Always generate a description for WM_NCCALCSIZE. It's confusing to look at a dumped sequence and see empty lines. --- dlls/user32/tests/msg.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index cd540db2580..c8ea036d8e6 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -2505,6 +2505,10 @@ static void add_message_(int line, const struct recvd_message *msg) } else { + RECT *rect = (RECT*)msg->lParam; + + sprintf(seq->output, "%s: %p WM_NCCALCSIZE: %s", + msg->descr, msg->hwnd, wine_dbgstr_rect(rect)); seq->lParam = 0; } break;

1 0

Nikolay Sivov : tests: Add some 'inline' function modifier tests.
by Alexandre Julliard 28 Aug '23

28 Aug '23

Module: vkd3d Branch: master Commit: 30be83f91118e23af8dddaede0b0de008103f6e5 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/30be83f91118e23af8dddaede0b0d… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Aug 9 00:34:52 2023 +0200 tests: Add some 'inline' function modifier tests. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- tests/hlsl/function.shader_test | 38 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) diff --git a/tests/hlsl/function.shader_test b/tests/hlsl/function.shader_test index 4d4c2e2b..9573d0a9 100644 --- a/tests/hlsl/function.shader_test +++ b/tests/hlsl/function.shader_test @@ -295,3 +295,41 @@ float4 main() : sv_target [test] draw quad probe all rgba (2.0, 3.0, 6.0, 7.0) + +% Inline modifier + +[pixel shader todo] +inline float func(float a) +{ + return a + 1; +} + +float4 main() : sv_target +{ + float4 a = {func(1.0), func(2.0), func(5.0), func(6.0)}; + + return a; +} + +[test] +todo draw quad +todo probe all rgba (2.0, 3.0, 6.0, 7.0) + +% Inline modifier used on entry point + +[pixel shader todo] +float func(float a) +{ + return a + 1; +} + +inline float4 main() : sv_target +{ + float4 a = {func(1.0), func(2.0), func(5.0), func(6.0)}; + + return a; +} + +[test] +todo draw quad +todo probe all rgba (2.0, 3.0, 6.0, 7.0)

1 0

Nikolay Sivov : vkd3d-shader/hlsl: Ignore 'inline' modifier for functions.
by Alexandre Julliard 28 Aug '23

28 Aug '23

Module: vkd3d Branch: master Commit: 18c14774642f1b8ecb7a1011965c4dfbe9bbec2a URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/18c14774642f1b8ecb7a1011965c4… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Aug 9 01:09:30 2023 +0200 vkd3d-shader/hlsl: Ignore 'inline' modifier for functions. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- libs/vkd3d-shader/hlsl.h | 1 + libs/vkd3d-shader/hlsl.y | 7 +++++++ tests/hlsl/function.shader_test | 12 ++++++------ 3 files changed, 14 insertions(+), 6 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.h b/libs/vkd3d-shader/hlsl.h index 75a1e6e4..8bc72a8a 100644 --- a/libs/vkd3d-shader/hlsl.h +++ b/libs/vkd3d-shader/hlsl.h @@ -356,6 +356,7 @@ struct hlsl_attribute #define HLSL_MODIFIER_COLUMN_MAJOR 0x00000400 #define HLSL_STORAGE_IN 0x00000800 #define HLSL_STORAGE_OUT 0x00001000 +#define HLSL_MODIFIER_INLINE 0x00002000 #define HLSL_TYPE_MODIFIERS_MASK (HLSL_MODIFIER_PRECISE | HLSL_MODIFIER_VOLATILE | \ HLSL_MODIFIER_CONST | HLSL_MODIFIER_ROW_MAJOR | \ diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index 2fd8ceb9..43ea4b4d 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -5129,6 +5129,9 @@ func_prototype_no_attrs: struct hlsl_ir_var *var; struct hlsl_type *type; + /* Functions are unconditionally inlined. */ + modifiers &= ~HLSL_MODIFIER_INLINE; + if (modifiers & ~HLSL_MODIFIERS_MAJORITY_MASK) hlsl_error(ctx, &@1, VKD3D_SHADER_ERROR_HLSL_INVALID_MODIFIER, "Only majority modifiers are allowed on functions."); @@ -5970,6 +5973,10 @@ var_modifiers: { $$ = add_modifiers(ctx, $2, HLSL_STORAGE_IN | HLSL_STORAGE_OUT, &@1); } + | KW_INLINE var_modifiers + { + $$ = add_modifiers(ctx, $2, HLSL_MODIFIER_INLINE, &@1); + } complex_initializer: diff --git a/tests/hlsl/function.shader_test b/tests/hlsl/function.shader_test index 9573d0a9..0db0477e 100644 --- a/tests/hlsl/function.shader_test +++ b/tests/hlsl/function.shader_test @@ -298,7 +298,7 @@ probe all rgba (2.0, 3.0, 6.0, 7.0) % Inline modifier -[pixel shader todo] +[pixel shader] inline float func(float a) { return a + 1; @@ -312,12 +312,12 @@ float4 main() : sv_target } [test] -todo draw quad -todo probe all rgba (2.0, 3.0, 6.0, 7.0) +draw quad +probe all rgba (2.0, 3.0, 6.0, 7.0) % Inline modifier used on entry point -[pixel shader todo] +[pixel shader] float func(float a) { return a + 1; @@ -331,5 +331,5 @@ inline float4 main() : sv_target } [test] -todo draw quad -todo probe all rgba (2.0, 3.0, 6.0, 7.0) +draw quad +probe all rgba (2.0, 3.0, 6.0, 7.0)

1 0

Zebediah Figura : vkd3d-shader/spirv: Split spirv_compiler_has_combined_sampler() into two functions.
by Alexandre Julliard 28 Aug '23

28 Aug '23

Module: vkd3d Branch: master Commit: a1e10e5c90f90ed0a9c767d26c98fabf727f2e45 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/a1e10e5c90f90ed0a9c767d26c98f… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Aug 9 19:14:54 2023 -0500 vkd3d-shader/spirv: Split spirv_compiler_has_combined_sampler() into two functions. These functions do not really share any code in common. --- libs/vkd3d-shader/spirv.c | 43 +++++++++++++++++++++++++++++++++---------- 1 file changed, 33 insertions(+), 10 deletions(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index d79796bc..982b8a14 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -2594,8 +2594,8 @@ static struct vkd3d_push_constant_buffer_binding *spirv_compiler_find_push_const return NULL; } -static bool spirv_compiler_has_combined_sampler(const struct spirv_compiler *compiler, - const struct vkd3d_shader_resource *resource, const struct vkd3d_shader_sampler *sampler) +static bool spirv_compiler_has_combined_sampler_for_resource(const struct spirv_compiler *compiler, + const struct vkd3d_shader_resource *resource) { const struct vkd3d_shader_interface_info *shader_interface = &compiler->shader_interface; const struct vkd3d_shader_combined_resource_sampler *combined_sampler; @@ -2604,10 +2604,35 @@ static bool spirv_compiler_has_combined_sampler(const struct spirv_compiler *com if (!shader_interface->combined_sampler_count) return false; - if (resource && (resource->reg.reg.type == VKD3DSPR_UAV || resource->range.last != resource->range.first)) + if (resource->reg.reg.type == VKD3DSPR_UAV || resource->range.last != resource->range.first) return false; - if (sampler && sampler->range.first != sampler->range.last) + for (i = 0; i < shader_interface->combined_sampler_count; ++i) + { + combined_sampler = &shader_interface->combined_samplers[i]; + + if (!spirv_compiler_check_shader_visibility(compiler, combined_sampler->shader_visibility)) + continue; + + if ((combined_sampler->resource_space == resource->range.space + && combined_sampler->resource_index == resource->range.first)) + return true; + } + + return false; +} + +static bool spirv_compiler_has_combined_sampler_for_sampler(const struct spirv_compiler *compiler, + const struct vkd3d_shader_sampler *sampler) +{ + const struct vkd3d_shader_interface_info *shader_interface = &compiler->shader_interface; + const struct vkd3d_shader_combined_resource_sampler *combined_sampler; + unsigned int i; + + if (!shader_interface->combined_sampler_count) + return false; + + if (sampler->range.last != sampler->range.first) return false; for (i = 0; i < shader_interface->combined_sampler_count; ++i) @@ -2617,10 +2642,8 @@ static bool spirv_compiler_has_combined_sampler(const struct spirv_compiler *com if (!spirv_compiler_check_shader_visibility(compiler, combined_sampler->shader_visibility)) continue; - if ((!resource || (combined_sampler->resource_space == resource->range.space - && combined_sampler->resource_index == resource->range.first)) - && (!sampler || (combined_sampler->sampler_space == sampler->range.space - && combined_sampler->sampler_index == sampler->range.first))) + if (combined_sampler->sampler_space == sampler->range.space + && combined_sampler->sampler_index == sampler->range.first) return true; } @@ -5648,7 +5671,7 @@ static void spirv_compiler_emit_dcl_sampler(struct spirv_compiler *compiler, reg_symbol.info.sampler.range = sampler->range; spirv_compiler_put_symbol(compiler, &reg_symbol); - if (spirv_compiler_has_combined_sampler(compiler, NULL, sampler)) + if (spirv_compiler_has_combined_sampler_for_sampler(compiler, sampler)) return; type_id = vkd3d_spirv_get_op_type_sampler(builder); @@ -5860,7 +5883,7 @@ static void spirv_compiler_emit_resource_declaration(struct spirv_compiler *comp sampled_type = vkd3d_component_type_from_data_type(resource_data_type); - if (spirv_compiler_has_combined_sampler(compiler, resource, NULL)) + if (spirv_compiler_has_combined_sampler_for_resource(compiler, resource)) { spirv_compiler_emit_combined_sampler_declarations(compiler, reg, &resource->range, resource_type, sampled_type, structure_stride, raw, resource_type_info);

1 0

Zebediah Figura : vkd3d-shader/spirv: Declare samplers from the descriptor info.
by Alexandre Julliard 28 Aug '23

28 Aug '23

Module: vkd3d Branch: master Commit: 547768bcdd66e4962f5c0ded26ef74ac1df1d573 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/547768bcdd66e4962f5c0ded26ef7… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Aug 9 19:42:42 2023 -0500 vkd3d-shader/spirv: Declare samplers from the descriptor info. --- libs/vkd3d-shader/spirv.c | 72 ++++++++++++++++++++++++++++++++++++----------- 1 file changed, 55 insertions(+), 17 deletions(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index 982b8a14..92beb12f 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -2623,7 +2623,7 @@ static bool spirv_compiler_has_combined_sampler_for_resource(const struct spirv_ } static bool spirv_compiler_has_combined_sampler_for_sampler(const struct spirv_compiler *compiler, - const struct vkd3d_shader_sampler *sampler) + const struct vkd3d_shader_register_range *range) { const struct vkd3d_shader_interface_info *shader_interface = &compiler->shader_interface; const struct vkd3d_shader_combined_resource_sampler *combined_sampler; @@ -2632,7 +2632,7 @@ static bool spirv_compiler_has_combined_sampler_for_sampler(const struct spirv_c if (!shader_interface->combined_sampler_count) return false; - if (sampler->range.last != sampler->range.first) + if (range->last != range->first) return false; for (i = 0; i < shader_interface->combined_sampler_count; ++i) @@ -2642,8 +2642,8 @@ static bool spirv_compiler_has_combined_sampler_for_sampler(const struct spirv_c if (!spirv_compiler_check_shader_visibility(compiler, combined_sampler->shader_visibility)) continue; - if (combined_sampler->sampler_space == sampler->range.space - && combined_sampler->sampler_index == sampler->range.first) + if (combined_sampler->sampler_space == range->space + && combined_sampler->sampler_index == range->first) return true; } @@ -5656,29 +5656,34 @@ static void spirv_compiler_emit_dcl_immediate_constant_buffer(struct spirv_compi spirv_compiler_put_symbol(compiler, &reg_symbol); } -static void spirv_compiler_emit_dcl_sampler(struct spirv_compiler *compiler, - const struct vkd3d_shader_instruction *instruction) +static void spirv_compiler_emit_sampler_declaration(struct spirv_compiler *compiler, + const struct vkd3d_shader_register_range *range, unsigned int register_id) { - const struct vkd3d_shader_sampler *sampler = &instruction->declaration.sampler; const SpvStorageClass storage_class = SpvStorageClassUniformConstant; struct vkd3d_spirv_builder *builder = &compiler->spirv_builder; - const struct vkd3d_shader_register *reg = &sampler->src.reg; struct vkd3d_descriptor_variable_info var_info; struct vkd3d_symbol reg_symbol; uint32_t type_id, var_id; - vkd3d_symbol_make_sampler(&reg_symbol, reg); - reg_symbol.info.sampler.range = sampler->range; + const struct vkd3d_shader_register reg = + { + .type = VKD3DSPR_SAMPLER, + .idx[0].offset = register_id, + .idx_count = 1, + }; + + vkd3d_symbol_make_sampler(&reg_symbol, &reg); + reg_symbol.info.sampler.range = *range; spirv_compiler_put_symbol(compiler, &reg_symbol); - if (spirv_compiler_has_combined_sampler_for_sampler(compiler, sampler)) + if (spirv_compiler_has_combined_sampler_for_sampler(compiler, range)) return; type_id = vkd3d_spirv_get_op_type_sampler(builder); - var_id = spirv_compiler_build_descriptor_variable(compiler, storage_class, type_id, reg, - &sampler->range, VKD3D_SHADER_RESOURCE_NONE, false, &var_info); + var_id = spirv_compiler_build_descriptor_variable(compiler, storage_class, type_id, &reg, + range, VKD3D_SHADER_RESOURCE_NONE, false, &var_info); - vkd3d_symbol_make_register(&reg_symbol, reg); + vkd3d_symbol_make_register(&reg_symbol, &reg); vkd3d_symbol_set_register_info(&reg_symbol, var_id, storage_class, VKD3D_SHADER_COMPONENT_FLOAT, VKD3DSP_WRITEMASK_ALL); reg_symbol.descriptor_array = var_info.array_symbol; @@ -9214,9 +9219,6 @@ static int spirv_compiler_handle_instruction(struct spirv_compiler *compiler, case VKD3DSIH_DCL_IMMEDIATE_CONSTANT_BUFFER: spirv_compiler_emit_dcl_immediate_constant_buffer(compiler, instruction); break; - case VKD3DSIH_DCL_SAMPLER: - spirv_compiler_emit_dcl_sampler(compiler, instruction); - break; case VKD3DSIH_DCL: case VKD3DSIH_DCL_UAV_TYPED: spirv_compiler_emit_dcl_resource(compiler, instruction); @@ -9525,6 +9527,7 @@ static int spirv_compiler_handle_instruction(struct spirv_compiler *compiler, spirv_compiler_emit_cut_stream(compiler, instruction); break; case VKD3DSIH_DCL_HS_MAX_TESSFACTOR: + case VKD3DSIH_DCL_SAMPLER: case VKD3DSIH_DCL_TEMPS: case VKD3DSIH_HS_DECLS: case VKD3DSIH_NOP: @@ -9537,6 +9540,39 @@ static int spirv_compiler_handle_instruction(struct spirv_compiler *compiler, return ret; } +static void spirv_compiler_emit_descriptor_declarations(struct spirv_compiler *compiler) +{ + unsigned int i; + + for (i = 0; i < compiler->scan_descriptor_info->descriptor_count; ++i) + { + const struct vkd3d_shader_descriptor_info1 *descriptor = &compiler->scan_descriptor_info->descriptors[i]; + struct vkd3d_shader_register_range range; + + range.first = descriptor->register_index; + if (descriptor->count == ~0u) + range.last = ~0u; + else + range.last = descriptor->register_index + descriptor->count - 1; + range.space = descriptor->register_space; + + switch (descriptor->type) + { + case VKD3D_SHADER_DESCRIPTOR_TYPE_SAMPLER: + spirv_compiler_emit_sampler_declaration(compiler, &range, descriptor->register_id); + break; + + case VKD3D_SHADER_DESCRIPTOR_TYPE_CBV: + case VKD3D_SHADER_DESCRIPTOR_TYPE_SRV: + case VKD3D_SHADER_DESCRIPTOR_TYPE_UAV: + break; + + default: + vkd3d_unreachable(); + } + } +} + static void spirv_compiler_emit_sm1_constant_buffer(struct spirv_compiler *compiler, const struct vkd3d_shader_desc *desc, enum vkd3d_shader_d3dbc_constant_register set, enum vkd3d_data_type data_type) @@ -9572,6 +9608,8 @@ static int spirv_compiler_generate_spirv(struct spirv_compiler *compiler, if (parser->shader_desc.temp_count) spirv_compiler_emit_temps(compiler, parser->shader_desc.temp_count); + spirv_compiler_emit_descriptor_declarations(compiler); + spirv_compiler_emit_sm1_constant_buffer(compiler, &parser->shader_desc, VKD3D_SHADER_D3DBC_FLOAT_CONSTANT_REGISTER, VKD3D_DATA_FLOAT); spirv_compiler_emit_sm1_constant_buffer(compiler, &parser->shader_desc,

1 0

Zebediah Figura : vkd3d-shader/spirv: Declare constant buffers from the descriptor info.
by Alexandre Julliard 28 Aug '23

28 Aug '23

Module: vkd3d Branch: master Commit: e8b3561252342861627d235f3a9e4faaa3212848 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/e8b3561252342861627d235f3a9e4… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Aug 10 23:04:00 2023 -0500 vkd3d-shader/spirv: Declare constant buffers from the descriptor info. --- libs/vkd3d-shader/spirv.c | 61 +++++++++++++---------------------------------- 1 file changed, 16 insertions(+), 45 deletions(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index 92beb12f..7787935b 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -5566,8 +5566,8 @@ static uint32_t spirv_compiler_build_descriptor_variable(struct spirv_compiler * return var_id; } -static void spirv_compiler_emit_constant_buffer(struct spirv_compiler *compiler, unsigned int size, - const struct vkd3d_shader_register_range *range, const struct vkd3d_shader_register *reg) +static void spirv_compiler_emit_cbv_declaration(struct spirv_compiler *compiler, + const struct vkd3d_shader_register_range *range, unsigned int register_id, unsigned int size) { struct vkd3d_spirv_builder *builder = &compiler->spirv_builder; uint32_t vec4_id, array_type_id, length_id, struct_id, var_id; @@ -5576,13 +5576,20 @@ static void spirv_compiler_emit_constant_buffer(struct spirv_compiler *compiler, struct vkd3d_descriptor_variable_info var_info; struct vkd3d_symbol reg_symbol; + struct vkd3d_shader_register reg = + { + .type = VKD3DSPR_CONSTBUFFER, + .idx[0].offset = register_id, + .idx_count = 1, + }; + if ((push_cb = spirv_compiler_find_push_constant_buffer(compiler, range))) { /* Push constant buffers are handled in * spirv_compiler_emit_push_constant_buffers(). */ unsigned int cb_size_in_bytes = size * VKD3D_VEC4_SIZE * sizeof(uint32_t); - push_cb->reg = *reg; + push_cb->reg = reg; push_cb->size = size; if (cb_size_in_bytes > push_cb->pc.size) { @@ -5603,9 +5610,9 @@ static void spirv_compiler_emit_constant_buffer(struct spirv_compiler *compiler, vkd3d_spirv_build_op_name(builder, struct_id, "cb%u_struct", size); var_id = spirv_compiler_build_descriptor_variable(compiler, storage_class, struct_id, - reg, range, VKD3D_SHADER_RESOURCE_BUFFER, false, &var_info); + &reg, range, VKD3D_SHADER_RESOURCE_BUFFER, false, &var_info); - vkd3d_symbol_make_register(&reg_symbol, reg); + vkd3d_symbol_make_register(&reg_symbol, &reg); vkd3d_symbol_set_register_info(&reg_symbol, var_id, storage_class, VKD3D_SHADER_COMPONENT_FLOAT, VKD3DSP_WRITEMASK_ALL); reg_symbol.descriptor_array = var_info.array_symbol; @@ -5613,16 +5620,6 @@ static void spirv_compiler_emit_constant_buffer(struct spirv_compiler *compiler, spirv_compiler_put_symbol(compiler, &reg_symbol); } -static void spirv_compiler_emit_dcl_constant_buffer(struct spirv_compiler *compiler, - const struct vkd3d_shader_instruction *instruction) -{ - const struct vkd3d_shader_constant_buffer *cb = &instruction->declaration.cb; - - assert(!(instruction->flags & ~VKD3DSI_INDEXED_DYNAMIC)); - - spirv_compiler_emit_constant_buffer(compiler, cb->size, &cb->range, &cb->src.reg); -} - static void spirv_compiler_emit_dcl_immediate_constant_buffer(struct spirv_compiler *compiler, const struct vkd3d_shader_instruction *instruction) { @@ -9213,9 +9210,6 @@ static int spirv_compiler_handle_instruction(struct spirv_compiler *compiler, case VKD3DSIH_DCL_INDEXABLE_TEMP: spirv_compiler_emit_dcl_indexable_temp(compiler, instruction); break; - case VKD3DSIH_DCL_CONSTANT_BUFFER: - spirv_compiler_emit_dcl_constant_buffer(compiler, instruction); - break; case VKD3DSIH_DCL_IMMEDIATE_CONSTANT_BUFFER: spirv_compiler_emit_dcl_immediate_constant_buffer(compiler, instruction); break; @@ -9526,6 +9520,7 @@ static int spirv_compiler_handle_instruction(struct spirv_compiler *compiler, case VKD3DSIH_CUT_STREAM: spirv_compiler_emit_cut_stream(compiler, instruction); break; + case VKD3DSIH_DCL_CONSTANT_BUFFER: case VKD3DSIH_DCL_HS_MAX_TESSFACTOR: case VKD3DSIH_DCL_SAMPLER: case VKD3DSIH_DCL_TEMPS: @@ -9563,6 +9558,9 @@ static void spirv_compiler_emit_descriptor_declarations(struct spirv_compiler *c break; case VKD3D_SHADER_DESCRIPTOR_TYPE_CBV: + spirv_compiler_emit_cbv_declaration(compiler, &range, descriptor->register_id, descriptor->buffer_size); + break; + case VKD3D_SHADER_DESCRIPTOR_TYPE_SRV: case VKD3D_SHADER_DESCRIPTOR_TYPE_UAV: break; @@ -9573,26 +9571,6 @@ static void spirv_compiler_emit_descriptor_declarations(struct spirv_compiler *c } } -static void spirv_compiler_emit_sm1_constant_buffer(struct spirv_compiler *compiler, - const struct vkd3d_shader_desc *desc, enum vkd3d_shader_d3dbc_constant_register set, - enum vkd3d_data_type data_type) -{ - struct vkd3d_shader_register_range range = {.space = 0, .first = set, .last = set}; - uint32_t count = desc->flat_constant_count[set].external; - struct vkd3d_shader_register reg = - { - .type = VKD3DSPR_CONSTBUFFER, - .idx[0].offset = set, /* register ID */ - .idx[1].offset = set, /* register index */ - .idx[2].offset = count, /* size */ - .idx_count = 3, - .data_type = data_type, - }; - - if (count) - spirv_compiler_emit_constant_buffer(compiler, count, &range, &reg); -} - static int spirv_compiler_generate_spirv(struct spirv_compiler *compiler, const struct vkd3d_shader_compile_info *compile_info, struct vkd3d_shader_parser *parser, struct vkd3d_shader_code *spirv) @@ -9610,13 +9588,6 @@ static int spirv_compiler_generate_spirv(struct spirv_compiler *compiler, spirv_compiler_emit_descriptor_declarations(compiler); - spirv_compiler_emit_sm1_constant_buffer(compiler, &parser->shader_desc, - VKD3D_SHADER_D3DBC_FLOAT_CONSTANT_REGISTER, VKD3D_DATA_FLOAT); - spirv_compiler_emit_sm1_constant_buffer(compiler, &parser->shader_desc, - VKD3D_SHADER_D3DBC_INT_CONSTANT_REGISTER, VKD3D_DATA_INT); - spirv_compiler_emit_sm1_constant_buffer(compiler, &parser->shader_desc, - VKD3D_SHADER_D3DBC_BOOL_CONSTANT_REGISTER, VKD3D_DATA_UINT); - compiler->location.column = 0; compiler->location.line = 1;

1 0

Zebediah Figura : vkd3d-shader/spirv: Declare SRVs and UAVs from the descriptor info.
by Alexandre Julliard 28 Aug '23

28 Aug '23

Module: vkd3d Branch: master Commit: 9624e2f9041bdc671f5595bcf2b1027ed1378954 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/9624e2f9041bdc671f5595bcf2b10… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Aug 10 23:07:51 2023 -0500 vkd3d-shader/spirv: Declare SRVs and UAVs from the descriptor info. --- libs/vkd3d-shader/spirv.c | 129 +++++++++++-------------------- libs/vkd3d-shader/vkd3d_shader_private.h | 24 ++++++ 2 files changed, 68 insertions(+), 85 deletions(-)

1 0

Nikolay Sivov : tests: Enable compiler backwards compatibility mode only for shaders that require it.
by Alexandre Julliard 28 Aug '23

28 Aug '23

Module: vkd3d Branch: master Commit: 269747dbf3ee32bf23e6d1ab388d2a058ca90f9f URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/269747dbf3ee32bf23e6d1ab388d2… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Aug 25 15:05:51 2023 +0200 tests: Enable compiler backwards compatibility mode only for shaders that require it. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- tests/hlsl/combined-samplers.shader_test | 2 ++ tests/hlsl/texture-ordering.shader_test | 3 +++ tests/shader_runner.c | 4 ++-- tests/shader_runner_d3d11.c | 3 +-- tests/shader_runner_d3d12.c | 3 +-- tests/shader_runner_vulkan.c | 4 ++++ 6 files changed, 13 insertions(+), 6 deletions(-) diff --git a/tests/hlsl/combined-samplers.shader_test b/tests/hlsl/combined-samplers.shader_test index 16db3129..57644c26 100644 --- a/tests/hlsl/combined-samplers.shader_test +++ b/tests/hlsl/combined-samplers.shader_test @@ -34,6 +34,8 @@ size (1, 1) size (1, 1) 4.0 4.0 4.0 1.0 +[require] +options: backcompat [pixel shader] sampler sam; diff --git a/tests/hlsl/texture-ordering.shader_test b/tests/hlsl/texture-ordering.shader_test index eb3d5c90..2291ddf8 100644 --- a/tests/hlsl/texture-ordering.shader_test +++ b/tests/hlsl/texture-ordering.shader_test @@ -83,6 +83,9 @@ size (1, 1) % The "allocation size" for textures affects the starting register id for the next resource in the % table, and may be larger than the "bind count". +[require] +options: backcompat + [pixel shader] // Name Type Format Dim HLSL Bind Count // ------------------------------ ---------- ------- ----------- -------------- ------ diff --git a/tests/shader_runner.c b/tests/shader_runner.c index 126cf6ab..05edf5da 100644 --- a/tests/shader_runner.c +++ b/tests/shader_runner.c @@ -148,6 +148,7 @@ static void parse_require_directive(struct shader_runner *runner, const char *li { 0, "none" }, { D3DCOMPILE_PACK_MATRIX_ROW_MAJOR, "row-major" }, { D3DCOMPILE_PACK_MATRIX_COLUMN_MAJOR, "column-major" }, + { D3DCOMPILE_ENABLE_BACKWARDS_COMPATIBILITY, "backcompat" }, }; runner->compile_options = 0; @@ -773,7 +774,6 @@ static HRESULT map_unidentified_hrs(HRESULT hr) static void compile_shader(struct shader_runner *runner, const char *source, size_t len, const char *type, HRESULT expect) { - UINT flags = runner->compile_options | D3DCOMPILE_ENABLE_BACKWARDS_COMPATIBILITY; ID3D10Blob *blob = NULL, *errors = NULL; char profile[7]; HRESULT hr; @@ -789,7 +789,7 @@ static void compile_shader(struct shader_runner *runner, const char *source, siz }; sprintf(profile, "%s_%s", type, shader_models[runner->minimum_shader_model]); - hr = D3DCompile(source, len, NULL, NULL, NULL, "main", profile, flags, 0, &blob, &errors); + hr = D3DCompile(source, len, NULL, NULL, NULL, "main", profile, runner->compile_options, 0, &blob, &errors); hr = map_unidentified_hrs(hr); ok(hr == expect, "Got unexpected hr %#x.\n", hr); if (hr == S_OK) diff --git a/tests/shader_runner_d3d11.c b/tests/shader_runner_d3d11.c index 788d8af4..25b585b1 100644 --- a/tests/shader_runner_d3d11.c +++ b/tests/shader_runner_d3d11.c @@ -74,7 +74,6 @@ static struct d3d11_shader_runner *d3d11_shader_runner(struct shader_runner *r) static ID3D10Blob *compile_shader(const struct d3d11_shader_runner *runner, const char *source, const char *type) { - UINT flags = runner->r.compile_options | D3DCOMPILE_ENABLE_BACKWARDS_COMPATIBILITY; ID3D10Blob *blob = NULL, *errors = NULL; char profile[7]; HRESULT hr; @@ -90,7 +89,7 @@ static ID3D10Blob *compile_shader(const struct d3d11_shader_runner *runner, cons }; sprintf(profile, "%s_%s", type, shader_models[runner->r.minimum_shader_model]); - hr = D3DCompile(source, strlen(source), NULL, NULL, NULL, "main", profile, flags, 0, &blob, &errors); + hr = D3DCompile(source, strlen(source), NULL, NULL, NULL, "main", profile, runner->r.compile_options, 0, &blob, &errors); ok(hr == S_OK, "Failed to compile shader, hr %#lx.\n", hr); if (errors) { diff --git a/tests/shader_runner_d3d12.c b/tests/shader_runner_d3d12.c index bdd47087..d620f1e2 100644 --- a/tests/shader_runner_d3d12.c +++ b/tests/shader_runner_d3d12.c @@ -58,7 +58,6 @@ static struct d3d12_shader_runner *d3d12_shader_runner(struct shader_runner *r) static ID3D10Blob *compile_shader(const struct d3d12_shader_runner *runner, const char *source, const char *type) { - UINT flags = runner->r.compile_options | D3DCOMPILE_ENABLE_BACKWARDS_COMPATIBILITY; ID3D10Blob *blob = NULL, *errors = NULL; char profile[7]; HRESULT hr; @@ -74,7 +73,7 @@ static ID3D10Blob *compile_shader(const struct d3d12_shader_runner *runner, cons }; sprintf(profile, "%s_%s", type, shader_models[runner->r.minimum_shader_model]); - hr = D3DCompile(source, strlen(source), NULL, NULL, NULL, "main", profile, flags, 0, &blob, &errors); + hr = D3DCompile(source, strlen(source), NULL, NULL, NULL, "main", profile, runner->r.compile_options, 0, &blob, &errors); ok(FAILED(hr) == !blob, "Got unexpected hr %#x, blob %p.\n", hr, blob); if (errors) { diff --git a/tests/shader_runner_vulkan.c b/tests/shader_runner_vulkan.c index 716b922c..a8e59eef 100644 --- a/tests/shader_runner_vulkan.c +++ b/tests/shader_runner_vulkan.c @@ -430,6 +430,10 @@ static bool compile_shader(const struct vulkan_shader_runner *runner, const char compile_options &= ~(D3DCOMPILE_PACK_MATRIX_ROW_MAJOR | D3DCOMPILE_PACK_MATRIX_COLUMN_MAJOR); } + /* FIXME: ignore compatibility flag for now */ + if (compile_options & D3DCOMPILE_ENABLE_BACKWARDS_COMPATIBILITY) + compile_options &= ~D3DCOMPILE_ENABLE_BACKWARDS_COMPATIBILITY; + if (compile_options) fatal_error("Unsupported compiler options %#x.\n", compile_options); }

1 0

Piotr Caban : msvcr110: Add Context::IsCurrentTaskCollectionCanceling implementation.
by Alexandre Julliard 28 Aug '23

28 Aug '23

Module: wine Branch: master Commit: 3f55fb72caea5e32d81abfec9a4ea7d64a91a5b8 URL: https://gitlab.winehq.org/wine/wine/-/commit/3f55fb72caea5e32d81abfec9a4ea7… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Aug 25 19:47:25 2023 +0200 msvcr110: Add Context::IsCurrentTaskCollectionCanceling implementation. --- dlls/msvcrt/concurrency.c | 50 +++++++++++++++++++++++++++++++++++++++-------- 1 file changed, 42 insertions(+), 8 deletions(-) diff --git a/dlls/msvcrt/concurrency.c b/dlls/msvcrt/concurrency.c index eb9e8f9ee32..395188c257d 100644 --- a/dlls/msvcrt/concurrency.c +++ b/dlls/msvcrt/concurrency.c @@ -103,6 +103,7 @@ typedef struct { unsigned int id; union allocator_cache_entry *allocator_cache[8]; LONG blocked; + struct _StructuredTaskCollection *task_collection; } ExternalContextBase; extern const vtable_ptr ExternalContextBase_vtable; static void ExternalContextBase_ctor(ExternalContextBase*); @@ -175,7 +176,7 @@ typedef struct } SpinWait; #define FINISHED_INITIAL 0x80000000 -typedef struct +typedef struct _StructuredTaskCollection { void *unk1; unsigned int unk2; @@ -187,6 +188,8 @@ typedef struct void *event; } _StructuredTaskCollection; +bool __thiscall _StructuredTaskCollection__IsCanceling(_StructuredTaskCollection*); + typedef enum { TASK_COLLECTION_SUCCESS = 1, @@ -851,7 +854,17 @@ void __cdecl Context__SpinYield(void) /* ?IsCurrentTaskCollectionCanceling(a)Context@Concurrency@@SA_NXZ */ bool __cdecl Context_IsCurrentTaskCollectionCanceling(void) { - FIXME("()\n"); + ExternalContextBase *ctx = (ExternalContextBase*)try_get_current_context(); + + TRACE("()\n"); + + if (ctx && ctx->context.vtable != &ExternalContextBase_vtable) { + ERR("unknown context set\n"); + return FALSE; + } + + if (ctx && ctx->task_collection) + return _StructuredTaskCollection__IsCanceling(ctx->task_collection); return FALSE; } @@ -2166,23 +2179,44 @@ static LONG CALLBACK execute_chore_except(EXCEPTION_POINTERS *pexc, void *_data) return EXCEPTION_EXECUTE_HANDLER; } +static void CALLBACK execute_chore_finally(BOOL normal, void *data) +{ + ExternalContextBase *ctx = (ExternalContextBase*)try_get_current_context(); + _StructuredTaskCollection *old_collection = data; + + if (ctx && ctx->context.vtable == &ExternalContextBase_vtable) + ctx->task_collection = old_collection; +} + static void execute_chore(_UnrealizedChore *chore, _StructuredTaskCollection *task_collection) { + ExternalContextBase *ctx = (ExternalContextBase*)try_get_current_context(); struct execute_chore_data data = { chore, task_collection }; + _StructuredTaskCollection *old_collection; TRACE("(%p %p)\n", chore, task_collection); - __TRY + if (ctx && ctx->context.vtable == &ExternalContextBase_vtable) { - if (!((ULONG_PTR)task_collection->exception & ~STRUCTURED_TASK_COLLECTION_STATUS_MASK) && - chore->chore_proc) - chore->chore_proc(chore); + old_collection = ctx->task_collection; + ctx->task_collection = task_collection; } - __EXCEPT_CTX(execute_chore_except, &data) + + __TRY { + __TRY + { + if (!((ULONG_PTR)task_collection->exception & ~STRUCTURED_TASK_COLLECTION_STATUS_MASK) && + chore->chore_proc) + chore->chore_proc(chore); + } + __EXCEPT_CTX(execute_chore_except, &data) + { + } + __ENDTRY } - __ENDTRY + __FINALLY_CTX(execute_chore_finally, old_collection) } static void CALLBACK chore_wrapper_finally(BOOL normal, void *data)

1 0