- Wine-Commits - list.winehq.org

Conor McCarthy : vkd3d-shader/dxil: Implement the DXIL STORE instruction.
by Alexandre Julliard Dec. 11, 2023

Dec. 11, 2023

Module: vkd3d Branch: master Commit: 3db7c2a62df0a732eafe8e0fbd27ce5b9bb48ed2 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/3db7c2a62df0a732eafe8e0fbd27c… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Tue Nov 21 14:21:49 2023 +1000 vkd3d-shader/dxil: Implement the DXIL STORE instruction. --- libs/vkd3d-shader/dxil.c | 60 +++++++++++++++++++++++++++++-- tests/hlsl/expr-indexing.shader_test | 8 ++--- tests/hlsl/non-const-indexing.shader_test | 20 +++++------ 3 files changed, 72 insertions(+), 16 deletions(-) diff --git a/libs/vkd3d-shader/dxil.c b/libs/vkd3d-shader/dxil.c index 9d104561..9d1c69f1 100644 --- a/libs/vkd3d-shader/dxil.c +++ b/libs/vkd3d-shader/dxil.c @@ -2860,17 +2860,19 @@ static const struct vkd3d_shader_immediate_constant_buffer *resolve_forward_init assert(index); --index; - if (!(value = sm6_parser_get_value_safe(sm6, index)) || !sm6_value_is_icb(value)) + if (!(value = sm6_parser_get_value_safe(sm6, index)) || (!sm6_value_is_icb(value) && !sm6_value_is_undef(value))) { WARN("Invalid initialiser index %zu.\n", index); vkd3d_shader_parser_error(&sm6->p, VKD3D_SHADER_ERROR_DXIL_INVALID_OPERAND, "Global variable initialiser value index %zu is invalid.", index); return NULL; } - else + else if (sm6_value_is_icb(value)) { return value->u.icb; } + /* In VSIR, initialisation with undefined values of objects is implied, not explicit. */ + return NULL; } static enum vkd3d_result sm6_parser_globals_init(struct sm6_parser *sm6) @@ -4282,6 +4284,57 @@ static void sm6_parser_emit_ret(struct sm6_parser *sm6, const struct dxil_record ins->handler_idx = VKD3DSIH_NOP; } +static void sm6_parser_emit_store(struct sm6_parser *sm6, const struct dxil_record *record, + struct vkd3d_shader_instruction *ins, struct sm6_value *dst) +{ + struct vkd3d_shader_src_param *src_param; + struct vkd3d_shader_dst_param *dst_param; + const struct sm6_type *pointee_type; + const struct sm6_value *ptr, *src; + unsigned int i = 0, alignment; + uint64_t alignment_code; + + if (!(ptr = sm6_parser_get_value_by_ref(sm6, record, NULL, &i)) + || !sm6_value_validate_is_register(ptr, sm6) + || !sm6_value_validate_is_pointer(ptr, sm6)) + { + return; + } + + pointee_type = ptr->type->u.pointer.type; + if (!(src = sm6_parser_get_value_by_ref(sm6, record, pointee_type, &i))) + return; + if (!sm6_value_validate_is_numeric(src, sm6)) + return; + + if (pointee_type != src->type) + { + WARN("Type mismatch.\n"); + vkd3d_shader_parser_warning(&sm6->p, VKD3D_SHADER_WARNING_DXIL_TYPE_MISMATCH, + "Type mismatch in pointer store arguments."); + } + + if (!dxil_record_validate_operand_count(record, i + 2, i + 2, sm6)) + return; + + alignment_code = record->operands[i++]; + if (!bitcode_parse_alignment(alignment_code, &alignment)) + WARN("Invalid alignment %"PRIu64".\n", alignment_code); + + if (record->operands[i]) + WARN("Ignoring volatile modifier.\n"); + + vsir_instruction_init(ins, &sm6->p.location, VKD3DSIH_MOV); + + src_param = instruction_src_params_alloc(ins, 1, sm6); + src_param_init_from_value(&src_param[0], src); + + dst_param = instruction_dst_params_alloc(ins, 1, sm6); + dst_param_init(dst_param); + dst_param->reg = ptr->u.reg; + dst_param->reg.alignment = alignment; +} + static void sm6_parser_emit_vselect(struct sm6_parser *sm6, const struct dxil_record *record, struct vkd3d_shader_instruction *ins, struct sm6_value *dst) { @@ -4688,6 +4741,9 @@ static enum vkd3d_result sm6_parser_function_init(struct sm6_parser *sm6, const is_terminator = true; ret_found = true; break; + case FUNC_CODE_INST_STORE: + sm6_parser_emit_store(sm6, record, ins, dst); + break; case FUNC_CODE_INST_VSELECT: sm6_parser_emit_vselect(sm6, record, ins, dst); break; diff --git a/tests/hlsl/expr-indexing.shader_test b/tests/hlsl/expr-indexing.shader_test index c11fa654..3dcc5727 100644 --- a/tests/hlsl/expr-indexing.shader_test +++ b/tests/hlsl/expr-indexing.shader_test @@ -26,7 +26,7 @@ float4 main() : sv_target uniform 0 float4 1.0 2.0 3.0 4.0 uniform 4 float4 5.0 6.0 7.0 8.0 uniform 8 float 2 -todo(sm>=6) draw quad +draw quad probe all rgba (10.0, 10.0, 10.0, 10.0) @@ -56,10 +56,10 @@ float4 main() : sv_target [test] uniform 0 float4 1.0 2.0 3.0 4.0 uniform 4 float 0 -todo(sm>=6) draw quad +draw quad probe all rgba (4.0, 4.0, 4.0, 4.0) uniform 4 float 2 -todo(sm>=6) draw quad +draw quad probe all rgba (1.0, 1.0, 1.0, 1.0) @@ -99,5 +99,5 @@ float4 main() : sv_target [test] uniform 0 float4 1.0 2.0 3.0 4.0 uniform 4 float 1 -todo(sm>=6) draw quad +draw quad probe all rgba (2.0, 2.0, 2.0, 2.0) diff --git a/tests/hlsl/non-const-indexing.shader_test b/tests/hlsl/non-const-indexing.shader_test index 00fea3b3..e7b814d3 100644 --- a/tests/hlsl/non-const-indexing.shader_test +++ b/tests/hlsl/non-const-indexing.shader_test @@ -155,16 +155,16 @@ float4 main() : sv_target [test] uniform 0 int 0 uniform 1 int 0 -todo(sm>=6) draw quad -todo(sm>=6) probe all rgba (100, 6, 7, 8) +draw quad +probe all rgba (100, 6, 7, 8) uniform 0 int 2 uniform 1 int 2 -todo(sm>=6) draw quad -todo(sm>=6) probe all rgba (5, 6, 100, 8) +draw quad +probe all rgba (5, 6, 100, 8) uniform 0 int 1 uniform 1 int 3 -todo(sm>=6) draw quad -todo(sm>=6) probe all rgba (5, 6, 7, 4) +draw quad +probe all rgba (5, 6, 7, 4) [pixel shader] @@ -192,8 +192,8 @@ uniform 0 float4 1 2 3 4 uniform 4 float4 5 6 7 8 uniform 8 int 3 uniform 9 int 4 -todo(sm>=6) draw quad -todo(sm>=6) probe all rgba (1126, 3344, 5566, 3788) +draw quad +probe all rgba (1126, 3344, 5566, 3788) [pixel shader] @@ -249,5 +249,5 @@ uniform 8 float 3.0 uniform 12 float 4.0 uniform 16 uint4 3 1 0 2 uniform 20 uint4 0 3 1 2 -todo(sm>=6) draw quad -todo(sm>=6) probe all rgba (4.0, 3.0, 2.0, 1.0) +draw quad +probe all rgba (4.0, 3.0, 2.0, 1.0)

1 0

Conor McCarthy : tests/shader-runner: Test an uninitialised indexable temp.
by Alexandre Julliard Dec. 11, 2023

Dec. 11, 2023

Module: vkd3d Branch: master Commit: df82c61482f413a4f4e368aab1a73002bb4ef5dc URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/df82c61482f413a4f4e368aab1a73… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Mon Dec 4 12:41:11 2023 +1000 tests/shader-runner: Test an uninitialised indexable temp. --- tests/hlsl/non-const-indexing.shader_test | 57 +++++++++++++++++++++++++++++++ 1 file changed, 57 insertions(+) diff --git a/tests/hlsl/non-const-indexing.shader_test b/tests/hlsl/non-const-indexing.shader_test index 5c8e1db4..00fea3b3 100644 --- a/tests/hlsl/non-const-indexing.shader_test +++ b/tests/hlsl/non-const-indexing.shader_test @@ -194,3 +194,60 @@ uniform 8 int 3 uniform 9 int 4 todo(sm>=6) draw quad todo(sm>=6) probe all rgba (1126, 3344, 5566, 3788) + + +[pixel shader] +uniform float4 f[4]; +uniform uint4 u; +uniform uint4 v; + +float4 main() : sv_target +{ + float temp[4]; + temp[0] = f[u.x].x; + temp[1] = f[u.y].x; + temp[2] = f[u.z].x; + temp[3] = f[u.w].x; + return float4(temp[v.x], temp[v.y], temp[v.z], temp[v.w]); +} + +% FXC is incapable of compiling this correctly, but results differ for SM1-3 vs SM4-5. +[require] +shader model < 4.0 + +[test] +uniform 0 float 1.0 +uniform 4 float 2.0 +uniform 8 float 3.0 +uniform 12 float 4.0 +uniform 16 uint4 3 1 0 2 +uniform 20 uint4 0 3 1 2 +draw quad +todo probe all rgba (1.0, 1.0, 1.0, 1.0) + +[require] +shader model >= 4.0 +shader model < 6.0 + +[test] +uniform 0 float 1.0 +uniform 4 float 2.0 +uniform 8 float 3.0 +uniform 12 float 4.0 +uniform 16 uint4 3 1 0 2 +uniform 20 uint4 0 3 1 2 +draw quad +todo probe all rgba (4.0, 4.0, 4.0, 4.0) + +[require] +shader model >= 6.0 + +[test] +uniform 0 float 1.0 +uniform 4 float 2.0 +uniform 8 float 3.0 +uniform 12 float 4.0 +uniform 16 uint4 3 1 0 2 +uniform 20 uint4 0 3 1 2 +todo(sm>=6) draw quad +todo(sm>=6) probe all rgba (4.0, 3.0, 2.0, 1.0)

1 0

Aurimas Fišeras : po: Update Lithuanian translation.
by Alexandre Julliard Dec. 11, 2023

Dec. 11, 2023

Module: wine Branch: master Commit: 740519bd7543c7d1e1d04bfe6c04f00e58ee4b37 URL: https://gitlab.winehq.org/wine/wine/-/commit/740519bd7543c7d1e1d04bfe6c04f0… Author: Aurimas Fišeras <aurimas(a)members.fsf.org> Date: Fri Dec 8 23:57:33 2023 +0200 po: Update Lithuanian translation. --- po/lt.po | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/po/lt.po b/po/lt.po index b2beabb57a8..c1c8737a86c 100644 --- a/po/lt.po +++ b/po/lt.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: https://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2023-12-08 00:07+0200\n" +"PO-Revision-Date: 2023-12-08 23:56+0200\n" "Last-Translator: Aurimas Fišeras <aurimas(a)members.fsf.org>\n" "Language-Team: Lithuanian <komp_lt(a)konf.lt>\n" "Language: lt\n" @@ -13738,7 +13738,7 @@ msgid "" "called procedure are inherited by the caller.\n" msgstr "" "CALL <komandųfailovardas> naudojama komandų failo viduje komandoms iš kito\n" -"komandų failo vykdyti. Kai komandų failas egzistuoja, valdymas grąžinamas\n" +"komandų failo vykdyti. Kai komandų failas išeina, valdymas grąžinamas\n" "kvietusiam failui. CALL komanda gali pateikti parametrus kviečiamai\n" "procedūrai.\n" "\n" @@ -14725,17 +14725,15 @@ msgid "&Run..." msgstr "&Vykdyti..." #: programs/explorer/explorer.rc:36 -#, fuzzy -#| msgid "E&xit Windows" msgid "E&xit desktop" -msgstr "Iš&eiti" +msgstr "Iš&eiti iš darbalaukio" #: programs/explorer/explorer.rc:37 -#, fuzzy -#| msgid "Are you sure you want to delete these values?" msgid "" "Are you sure you want to close all programs and exit the virtual desktop?" -msgstr "Ar tikrai norite pašalinti šias reikšmes?" +msgstr "" +"Ar tikrai norite uždaryti visas programas ir išeiti iš virtualaus " +"darbalaukio?" #: programs/findstr/findstr.rc:28 msgid "Usage: findstr /options string\n"

1 0

Zebediah Figura : vkd3d-shader/dxil: No longer synthesize DCL instructions.
by Alexandre Julliard Dec. 11, 2023

Dec. 11, 2023

Module: vkd3d Branch: master Commit: d49bccea9a12877a9b44d61ab30f26879bc6b8da URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/d49bccea9a12877a9b44d61ab30f2… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Oct 24 21:14:30 2023 -0500 vkd3d-shader/dxil: No longer synthesize DCL instructions. --- libs/vkd3d-shader/dxil.c | 54 ------------------------------------------------ 1 file changed, 54 deletions(-) diff --git a/libs/vkd3d-shader/dxil.c b/libs/vkd3d-shader/dxil.c index 4ce92507..6752cd14 100644 --- a/libs/vkd3d-shader/dxil.c +++ b/libs/vkd3d-shader/dxil.c @@ -2987,45 +2987,6 @@ static void sm6_parser_init_signature(struct sm6_parser *sm6, const struct shade } } -static void sm6_parser_emit_signature(struct sm6_parser *sm6, const struct shader_signature *s, - enum vkd3d_shader_opcode handler_idx, enum vkd3d_shader_opcode siv_handler_idx, - struct vkd3d_shader_dst_param *params) -{ - struct vkd3d_shader_instruction *ins; - struct vkd3d_shader_dst_param *param; - const struct signature_element *e; - unsigned int i; - - for (i = 0; i < s->element_count; ++i) - { - e = &s->elements[i]; - - /* Do not check e->used_mask because in some cases it is zero for used elements. - * TODO: scan ahead for used I/O elements. */ - - if (e->sysval_semantic != VKD3D_SHADER_SV_NONE && e->sysval_semantic != VKD3D_SHADER_SV_TARGET) - { - ins = sm6_parser_add_instruction(sm6, siv_handler_idx); - param = &ins->declaration.register_semantic.reg; - ins->declaration.register_semantic.sysval_semantic = vkd3d_siv_from_sysval(e->sysval_semantic); - } - else - { - ins = sm6_parser_add_instruction(sm6, handler_idx); - param = &ins->declaration.dst; - } - - ins->flags = e->interpolation_mode; - *param = params[i]; - - if (e->register_count > 1) - { - param->reg.idx[0].rel_addr = NULL; - param->reg.idx[0].offset = e->register_count; - } - } -} - static void sm6_parser_init_output_signature(struct sm6_parser *sm6, const struct shader_signature *output_signature) { sm6_parser_init_signature(sm6, output_signature, VKD3DSPR_OUTPUT, sm6->output_params); @@ -3036,19 +2997,6 @@ static void sm6_parser_init_input_signature(struct sm6_parser *sm6, const struct sm6_parser_init_signature(sm6, input_signature, VKD3DSPR_INPUT, sm6->input_params); } -static void sm6_parser_emit_output_signature(struct sm6_parser *sm6, const struct shader_signature *output_signature) -{ - sm6_parser_emit_signature(sm6, output_signature, VKD3DSIH_DCL_OUTPUT, VKD3DSIH_DCL_OUTPUT_SIV, sm6->output_params); -} - -static void sm6_parser_emit_input_signature(struct sm6_parser *sm6, const struct shader_signature *input_signature) -{ - sm6_parser_emit_signature(sm6, input_signature, - (sm6->p.shader_version.type == VKD3D_SHADER_TYPE_PIXEL) ? VKD3DSIH_DCL_INPUT_PS : VKD3DSIH_DCL_INPUT, - (sm6->p.shader_version.type == VKD3D_SHADER_TYPE_PIXEL) ? VKD3DSIH_DCL_INPUT_PS_SIV : VKD3DSIH_DCL_INPUT_SIV, - sm6->input_params); -} - static const struct sm6_value *sm6_parser_next_function_definition(struct sm6_parser *sm6) { size_t i, count = sm6->function_count; @@ -6111,8 +6059,6 @@ static enum vkd3d_result sm6_parser_init(struct sm6_parser *sm6, const uint32_t "Out of memory emitting shader signature declarations."); return VKD3D_ERROR_OUT_OF_MEMORY; } - sm6_parser_emit_output_signature(sm6, output_signature); - sm6_parser_emit_input_signature(sm6, input_signature); sm6->p.shader_desc.ssa_count = sm6->ssa_next_id;

1 0

Zebediah Figura : vkd3d-shader/tpf: Do not uninvert used masks for domain shader patch constants.
by Alexandre Julliard Dec. 11, 2023

Dec. 11, 2023

Module: vkd3d Branch: master Commit: cabf9996f94255be579dda64e5f20669fa60a8da URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/cabf9996f94255be579dda64e5f20… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Oct 23 20:52:24 2023 -0500 vkd3d-shader/tpf: Do not uninvert used masks for domain shader patch constants. --- libs/vkd3d-shader/dxbc.c | 4 ---- libs/vkd3d-shader/tpf.c | 16 ++++++++++++++++ 2 files changed, 16 insertions(+), 4 deletions(-) diff --git a/libs/vkd3d-shader/dxbc.c b/libs/vkd3d-shader/dxbc.c index 7834c1e1..63deaaad 100644 --- a/libs/vkd3d-shader/dxbc.c +++ b/libs/vkd3d-shader/dxbc.c @@ -431,10 +431,6 @@ static int shader_parse_signature(const struct vkd3d_shader_dxbc_section_desc *s case TAG_OSG5: if (e[i].sysval_semantic == VKD3D_SHADER_SV_NONE) e[i].sysval_semantic = map_fragment_output_sysval(e[i].semantic_name); - /* Fall through. */ - case TAG_PCSG: - case TAG_PSG1: - e[i].used_mask = e[i].mask & ~e[i].used_mask; break; } diff --git a/libs/vkd3d-shader/tpf.c b/libs/vkd3d-shader/tpf.c index 163cd90e..1b009c13 100644 --- a/libs/vkd3d-shader/tpf.c +++ b/libs/vkd3d-shader/tpf.c @@ -2544,6 +2544,16 @@ static bool shader_sm4_init(struct vkd3d_shader_sm4_parser *sm4, const uint32_t return true; } +static void uninvert_used_masks(struct shader_signature *signature) +{ + for (unsigned int i = 0; i < signature->element_count; ++i) + { + struct signature_element *e = &signature->elements[i]; + + e->used_mask = e->mask & ~e->used_mask; + } +} + static bool shader_sm4_parser_validate_signature(struct vkd3d_shader_sm4_parser *sm4, const struct shader_signature *signature, unsigned int *masks, const char *name) { @@ -2639,6 +2649,12 @@ int vkd3d_shader_sm4_parser_create(const struct vkd3d_shader_compile_info *compi return VKD3D_ERROR_INVALID_ARGUMENT; } + /* DXBC stores used masks inverted for output signatures, for some reason. + * We return them un-inverted. */ + uninvert_used_masks(&shader_desc->output_signature); + if (sm4->p.shader_version.type == VKD3D_SHADER_TYPE_HULL) + uninvert_used_masks(&shader_desc->patch_constant_signature); + if (!shader_sm4_parser_validate_signature(sm4, &shader_desc->input_signature, sm4->input_register_masks, "Input") || !shader_sm4_parser_validate_signature(sm4, &shader_desc->output_signature,

1 0

Zebediah Figura : vkd3d-shader/spirv: Declare I/O registers from the signature.
by Alexandre Julliard Dec. 11, 2023

Dec. 11, 2023

Module: vkd3d Branch: master Commit: 66cb2815f0662713c3255113255cfd7cf5e406fb URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/66cb2815f0662713c3255113255cf… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Oct 19 23:46:48 2023 -0500 vkd3d-shader/spirv: Declare I/O registers from the signature. Instead of parsing DCL instructions. This allows sm1 to work without further effort, and simplifies sm6 code. --- libs/vkd3d-shader/spirv.c | 162 +++++++++++++++++++++++----------------------- 1 file changed, 82 insertions(+), 80 deletions(-)

1 0

Zebediah Figura : vkd3d-shader/dxil: Map SEMANTIC_KIND_TARGET to VKD3D_SHADER_SV_TARGET.
by Alexandre Julliard Dec. 11, 2023

Dec. 11, 2023

Module: vkd3d Branch: master Commit: 75348dff12a2e19781c62f1eb79144ad60904f23 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/75348dff12a2e19781c62f1eb7914… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Nov 20 15:26:36 2023 -0600 vkd3d-shader/dxil: Map SEMANTIC_KIND_TARGET to VKD3D_SHADER_SV_TARGET. --- libs/vkd3d-shader/dxil.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/vkd3d-shader/dxil.c b/libs/vkd3d-shader/dxil.c index a1065c8b..4ce92507 100644 --- a/libs/vkd3d-shader/dxil.c +++ b/libs/vkd3d-shader/dxil.c @@ -5040,7 +5040,7 @@ static const enum vkd3d_shader_sysval_semantic sysval_semantic_table[] = { [SEMANTIC_KIND_ARBITRARY] = VKD3D_SHADER_SV_NONE, [SEMANTIC_KIND_POSITION] = VKD3D_SHADER_SV_POSITION, - [SEMANTIC_KIND_TARGET] = VKD3D_SHADER_SV_NONE, + [SEMANTIC_KIND_TARGET] = VKD3D_SHADER_SV_TARGET, }; static enum vkd3d_shader_sysval_semantic sysval_semantic_from_dxil_semantic_kind(enum dxil_semantic_kind kind)

1 0

Zebediah Figura : vkd3d-shader/spirv: Do not use the output_info array for patch constants.
by Alexandre Julliard Dec. 11, 2023

Dec. 11, 2023

Module: vkd3d Branch: master Commit: 8876030590eeabf1f3fec31ef5d15b9cd9eed78b URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/8876030590eeabf1f3fec31ef5d15… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Sun Oct 22 21:29:13 2023 -0500 vkd3d-shader/spirv: Do not use the output_info array for patch constants. --- libs/vkd3d-shader/spirv.c | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index dc3d9631..b010edab 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -5151,9 +5151,12 @@ static void spirv_compiler_emit_output(struct spirv_compiler *compiler, const st storage_class = SpvStorageClassOutput; - if (get_shader_output_swizzle(compiler, signature_element->register_index) != VKD3D_SHADER_NO_SWIZZLE - || (compiler->output_info[element_idx].id && compiler->output_info[element_idx].array_element_mask) - || needs_private_io_variable(builtin)) + if (needs_private_io_variable(builtin)) + use_private_variable = true; + + if (!is_patch_constant + && (get_shader_output_swizzle(compiler, signature_element->register_index) != VKD3D_SHADER_NO_SWIZZLE + || (compiler->output_info[element_idx].id && compiler->output_info[element_idx].array_element_mask))) { use_private_variable = true; } @@ -5168,7 +5171,7 @@ static void spirv_compiler_emit_output(struct spirv_compiler *compiler, const st return; } - if (compiler->output_info[element_idx].id) + if (!is_patch_constant && compiler->output_info[element_idx].id) { id = compiler->output_info[element_idx].id; } @@ -5220,8 +5223,11 @@ static void spirv_compiler_emit_output(struct spirv_compiler *compiler, const st spirv_compiler_decorate_xfb_output(compiler, id, output_component_count, signature_element); - compiler->output_info[element_idx].id = id; - compiler->output_info[element_idx].component_type = component_type; + if (!is_patch_constant) + { + compiler->output_info[element_idx].id = id; + compiler->output_info[element_idx].component_type = component_type; + } var_id = id; if (use_private_variable) @@ -6442,7 +6448,6 @@ static void spirv_compiler_emit_default_control_point_phase(struct spirv_compile static void spirv_compiler_leave_shader_phase(struct spirv_compiler *compiler) { - const struct shader_signature *signature = &compiler->output_signature; struct vkd3d_spirv_builder *builder = &compiler->spirv_builder; if (is_in_control_point_phase(compiler) && compiler->emit_default_control_point_phase) @@ -6460,7 +6465,6 @@ static void spirv_compiler_leave_shader_phase(struct spirv_compiler *compiler) /* Fork and join phases share output registers (patch constants). * Control point phase has separate output registers. */ - memset(compiler->output_info, 0, signature->element_count * sizeof(*compiler->output_info)); memset(compiler->private_output_variable, 0, sizeof(compiler->private_output_variable)); memset(compiler->private_output_variable_write_mask, 0, sizeof(compiler->private_output_variable_write_mask)); }

1 0

Tag wine-9.0-rc1 : Alexandre Julliard : Release 9.0-rc1
by Alexandre Julliard Dec. 8, 2023

Dec. 8, 2023

Module: wine Branch: refs/tags/wine-9.0-rc1 Tag: af348af35eae212ffd2982c22c80d7bf47d56bf3 URL: https://gitlab.winehq.org/wine/wine/-/tags/af348af35eae212ffd2982c22c80d7bf… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 8 22:35:51 2023 +0100 Release 9.0-rc1

1 0

Alexandre Julliard : Release 9.0-rc1.
by Alexandre Julliard Dec. 8, 2023

Dec. 8, 2023

Module: wine Branch: master Commit: 93f7ef86701f0b5f0828c8e0c4581b00873a7676 URL: https://gitlab.winehq.org/wine/wine/-/commit/93f7ef86701f0b5f0828c8e0c4581b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 8 22:35:51 2023 +0100 Release 9.0-rc1. --- ANNOUNCE | 950 ++++++++++++++++++++++++++++++++++---------------------------- AUTHORS | 1 + VERSION | 2 +- configure | 18 +- 4 files changed, 537 insertions(+), 434 deletions(-)

1 0