- Wine-Commits - list.winehq.org

Zebediah Figura : vkd3d-shader/hlsl: Record partial allocations in allocate_range().
by Alexandre Julliard Nov. 7, 2023

Nov. 7, 2023

Module: vkd3d Branch: master Commit: f0a6c7de1d87dcecc1e97c9059e0e13b2bdb0b7c URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/f0a6c7de1d87dcecc1e97c9059e0e… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Fri Oct 27 10:28:53 2023 -0500 vkd3d-shader/hlsl: Record partial allocations in allocate_range(). --- libs/vkd3d-shader/hlsl_codegen.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/libs/vkd3d-shader/hlsl_codegen.c b/libs/vkd3d-shader/hlsl_codegen.c index 456c393e..76a010fb 100644 --- a/libs/vkd3d-shader/hlsl_codegen.c +++ b/libs/vkd3d-shader/hlsl_codegen.c @@ -3587,6 +3587,8 @@ static struct hlsl_reg allocate_range(struct hlsl_ctx *ctx, struct register_allo for (i = 0; i < reg_size / 4; ++i) record_allocation(ctx, allocator, reg_idx + i, VKD3DSP_WRITEMASK_ALL, first_write, last_read); + if (reg_size % 4) + record_allocation(ctx, allocator, reg_idx + (reg_size / 4), (1u << (reg_size % 4)) - 1, first_write, last_read); ret.id = reg_idx; ret.allocation_size = align(reg_size, 4) / 4;

1 0

Giovanni Mascellani : ci: Expect builds to always succeed, even when tests are allowed to fail.
by Alexandre Julliard Nov. 7, 2023

Nov. 7, 2023

Module: vkd3d Branch: master Commit: f8fcfc52d8c2fef861ddbee02d63bca5a9cbc020 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/f8fcfc52d8c2fef861ddbee02d63b… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Mon Nov 6 14:58:24 2023 +0100 ci: Expect builds to always succeed, even when tests are allowed to fail. --- gitlab/build-linux | 9 ++++++--- gitlab/build-mac | 9 ++++++--- gitlab/build.yml | 18 +++++++++++++----- 3 files changed, 25 insertions(+), 11 deletions(-) diff --git a/gitlab/build-linux b/gitlab/build-linux index 545601bc..4a8c793b 100755 --- a/gitlab/build-linux +++ b/gitlab/build-linux @@ -12,10 +12,13 @@ rm -fr build mkdir build cd build export LD_LIBRARY_PATH=/usr/local/lib -../configure --enable-demos DXCOMPILER_LIBS="-L/usr/local/lib" CFLAGS="-g -O2 -Werror" CPPFLAGS="-DVKD3D_SHADER_UNSUPPORTED_DXIL" && \ - make -j$(nproc) && \ +if ../configure --enable-demos DXCOMPILER_LIBS="-L/usr/local/lib" CFLAGS="-g -O2 -Werror" CPPFLAGS="-DVKD3D_SHADER_UNSUPPORTED_DXIL" && \ + make -j$(nproc) ; then make -j$(nproc) check || \ - touch ../pipeline_failed + touch ../tests_failed +else + touch ../build_failed +fi mkdir -p ../artifacts/$COMMIT rsync -Rr config.log doc/* test-suite.log tests/*.log tests/*/*.log ../artifacts/$COMMIT || true diff --git a/gitlab/build-mac b/gitlab/build-mac index 6a795d02..27c70d31 100755 --- a/gitlab/build-mac +++ b/gitlab/build-mac @@ -11,10 +11,13 @@ set -Eeuxo pipefail rm -fr build mkdir build cd build -../configure CFLAGS="-g -O2 -Wno-implicit-fallthrough -Wno-enum-conversion -Werror" && \ - make -j$(sysctl -n hw.ncpu) && \ +if ../configure CFLAGS="-g -O2 -Wno-implicit-fallthrough -Wno-enum-conversion -Werror" && \ + make -j$(sysctl -n hw.ncpu) ; then make -j$(sysctl -n hw.ncpu) check || \ - touch ../pipeline_failed + touch ../tests_failed +else + touch ../build_failed +fi mkdir -p ../artifacts/$COMMIT rsync -Rr config.log test-suite.log tests/*.log tests/*/*.log ../artifacts/$COMMIT || true diff --git a/gitlab/build.yml b/gitlab/build.yml index fd2b63ff..9695a304 100644 --- a/gitlab/build.yml +++ b/gitlab/build.yml @@ -18,7 +18,8 @@ - cat /proc/meminfo > artifacts/meminfo.txt - vulkaninfo > artifacts/vulkaninfo.txt - git rebase $CI_MERGE_REQUEST_DIFF_BASE_SHA --exec ./gitlab/build-linux - - if [ -f pipeline_failed ] ; then exit 1 ; fi + - if [ -f build_failed ] ; then exit 1 ; fi + - if [ -f tests_failed ] ; then exit 2 ; fi artifacts: when: always paths: @@ -34,7 +35,9 @@ build-radv-64: build-llvmpipe-64: extends: .build-linux - allow_failure: true + allow_failure: + exit_codes: + - 2 variables: VK_LOADER_DRIVERS_SELECT: 'lvp_*' VKD3D_SHADER_CONFIG: 'force_validation' @@ -50,7 +53,9 @@ build-radv-32: build-llvmpipe-32: extends: .build-linux - allow_failure: true + allow_failure: + exit_codes: + - 2 variables: VK_LOADER_DRIVERS_SELECT: 'lvp_*' CC: 'gcc -m32' @@ -121,7 +126,9 @@ build-mac: stage: build rules: - if: $CI_PIPELINE_SOURCE == 'merge_request_event' - allow_failure: true + allow_failure: + exit_codes: + - 2 interruptible: true needs: [] dependencies: [] @@ -149,7 +156,8 @@ build-mac: - cd ../.. - export PATH="$PWD/wine/build/tools/widl:$PATH" - git rebase $CI_MERGE_REQUEST_DIFF_BASE_SHA --exec ./gitlab/build-mac - - if [ -f pipeline_failed ] ; then exit 1 ; fi + - if [ -f build_failed ] ; then exit 1 ; fi + - if [ -f tests_failed ] ; then exit 2 ; fi variables: VKD3D_DISABLE_EXTENSIONS: "VK_EXT_descriptor_indexing" VKD3D_SHADER_CONFIG: 'force_validation'

1 0

Giovanni Mascellani : vkd3d-shader/ir: Check that REP blocks are correctly nested.
by Alexandre Julliard Nov. 7, 2023

Nov. 7, 2023

Module: vkd3d Branch: master Commit: 93632fb40710fb852e9659db9e2155a82a2475d9 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/93632fb40710fb852e9659db9e215… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Mon Nov 6 13:56:38 2023 +0100 vkd3d-shader/ir: Check that REP blocks are correctly nested. --- libs/vkd3d-shader/ir.c | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/libs/vkd3d-shader/ir.c b/libs/vkd3d-shader/ir.c index 71a23fa0..bc48df8c 100644 --- a/libs/vkd3d-shader/ir.c +++ b/libs/vkd3d-shader/ir.c @@ -1684,6 +1684,23 @@ static void vsir_validate_instruction(struct validation_context *ctx) --ctx->depth; break; + case VKD3DSIH_REP: + vsir_validate_dst_count(ctx, instruction, 0); + vsir_validate_src_count(ctx, instruction, 1); + if (!vkd3d_array_reserve((void **)&ctx->blocks, &ctx->blocks_capacity, ctx->depth + 1, sizeof(*ctx->blocks))) + return; + ctx->blocks[ctx->depth++] = instruction->handler_idx; + break; + + case VKD3DSIH_ENDREP: + vsir_validate_dst_count(ctx, instruction, 0); + vsir_validate_src_count(ctx, instruction, 0); + if (ctx->depth == 0 || ctx->blocks[ctx->depth - 1] != VKD3DSIH_REP) + validator_error(ctx, VKD3D_SHADER_ERROR_VSIR_INVALID_INSTRUCTION_NESTING, "ENDREP instruction doesn't terminate REP block."); + else + --ctx->depth; + break; + default: break; }

1 0

Giovanni Mascellani : vkd3d-shader/ir: Do not enfore DCL_TEMPS count for hull shaders.
by Alexandre Julliard Nov. 7, 2023

Nov. 7, 2023

Module: vkd3d Branch: master Commit: 0a7e200f893a8cae07215fc502c640780bff57ec URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/0a7e200f893a8cae07215fc502c64… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Mon Nov 6 13:49:35 2023 +0100 vkd3d-shader/ir: Do not enfore DCL_TEMPS count for hull shaders. Hull shaders have a different temps count for each phase, and the parser only reports the count for the patch constant phase. In order to properly check for temps count on hull shaders, we first need to decode its phases. --- libs/vkd3d-shader/ir.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libs/vkd3d-shader/ir.c b/libs/vkd3d-shader/ir.c index 40db494f..c954ad16 100644 --- a/libs/vkd3d-shader/ir.c +++ b/libs/vkd3d-shader/ir.c @@ -1631,7 +1631,8 @@ static void vsir_validate_instruction(struct validation_context *ctx) if (ctx->dcl_temps_found && ctx->parser->shader_version.type != VKD3D_SHADER_TYPE_HULL) validator_error(ctx, VKD3D_SHADER_ERROR_VSIR_DUPLICATE_DCL_TEMPS, "Duplicate DCL_TEMPS instruction."); ctx->dcl_temps_found = true; - if (instruction->declaration.count != ctx->parser->shader_desc.temp_count) + if (instruction->declaration.count != ctx->parser->shader_desc.temp_count && + ctx->parser->shader_version.type != VKD3D_SHADER_TYPE_HULL) validator_error(ctx, VKD3D_SHADER_ERROR_VSIR_INVALID_DCL_TEMPS, "Invalid DCL_TEMPS count %u, expected %u.", instruction->declaration.count, ctx->parser->shader_desc.temp_count); break;

1 0

Giovanni Mascellani : vkd3d-shader/ir: Check that LOOP blocks are correctly nested.
by Alexandre Julliard Nov. 7, 2023

Nov. 7, 2023

Module: vkd3d Branch: master Commit: 92c36615ed9f341e57b5b89f18482e4714ac8c95 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/92c36615ed9f341e57b5b89f18482… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Mon Nov 6 13:54:07 2023 +0100 vkd3d-shader/ir: Check that LOOP blocks are correctly nested. --- libs/vkd3d-shader/ir.c | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/libs/vkd3d-shader/ir.c b/libs/vkd3d-shader/ir.c index 57180c91..71a23fa0 100644 --- a/libs/vkd3d-shader/ir.c +++ b/libs/vkd3d-shader/ir.c @@ -1667,6 +1667,23 @@ static void vsir_validate_instruction(struct validation_context *ctx) --ctx->depth; break; + case VKD3DSIH_LOOP: + vsir_validate_dst_count(ctx, instruction, 0); + vsir_validate_src_count(ctx, instruction, 0); + if (!vkd3d_array_reserve((void **)&ctx->blocks, &ctx->blocks_capacity, ctx->depth + 1, sizeof(*ctx->blocks))) + return; + ctx->blocks[ctx->depth++] = instruction->handler_idx; + break; + + case VKD3DSIH_ENDLOOP: + vsir_validate_dst_count(ctx, instruction, 0); + vsir_validate_src_count(ctx, instruction, 0); + if (ctx->depth == 0 || ctx->blocks[ctx->depth - 1] != VKD3DSIH_LOOP) + validator_error(ctx, VKD3D_SHADER_ERROR_VSIR_INVALID_INSTRUCTION_NESTING, "ENDLOOP instruction doesn't terminate LOOP block."); + else + --ctx->depth; + break; + default: break; }

1 0

Giovanni Mascellani : vkd3d-shader/ir: Check that IF blocks are correctly nested.
by Alexandre Julliard Nov. 7, 2023

Nov. 7, 2023

Module: vkd3d Branch: master Commit: 2f7d52dba4bf0f06e300ba1d0d05bea80cf06935 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/2f7d52dba4bf0f06e300ba1d0d05b… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Mon Nov 6 13:47:34 2023 +0100 vkd3d-shader/ir: Check that IF blocks are correctly nested. --- libs/vkd3d-shader/ir.c | 35 ++++++++++++++++++++++++++++++++ libs/vkd3d-shader/vkd3d_shader_private.h | 1 + 2 files changed, 36 insertions(+) diff --git a/libs/vkd3d-shader/ir.c b/libs/vkd3d-shader/ir.c index c954ad16..57180c91 100644 --- a/libs/vkd3d-shader/ir.c +++ b/libs/vkd3d-shader/ir.c @@ -1477,6 +1477,10 @@ struct validation_context struct vkd3d_shader_parser *parser; size_t instruction_idx; bool dcl_temps_found; + + enum vkd3d_shader_opcode *blocks; + size_t depth; + size_t blocks_capacity; }; static void VKD3D_PRINTF_FUNC(3, 4) validator_error(struct validation_context *ctx, @@ -1637,6 +1641,32 @@ static void vsir_validate_instruction(struct validation_context *ctx) instruction->declaration.count, ctx->parser->shader_desc.temp_count); break; + case VKD3DSIH_IF: + vsir_validate_dst_count(ctx, instruction, 0); + vsir_validate_src_count(ctx, instruction, 1); + if (!vkd3d_array_reserve((void **)&ctx->blocks, &ctx->blocks_capacity, ctx->depth + 1, sizeof(*ctx->blocks))) + return; + ctx->blocks[ctx->depth++] = instruction->handler_idx; + break; + + case VKD3DSIH_ELSE: + vsir_validate_dst_count(ctx, instruction, 0); + vsir_validate_src_count(ctx, instruction, 0); + if (ctx->depth == 0 || ctx->blocks[ctx->depth - 1] != VKD3DSIH_IF) + validator_error(ctx, VKD3D_SHADER_ERROR_VSIR_INVALID_INSTRUCTION_NESTING, "ELSE instruction doesn't terminate IF block."); + else + ctx->blocks[ctx->depth - 1] = instruction->handler_idx; + break; + + case VKD3DSIH_ENDIF: + vsir_validate_dst_count(ctx, instruction, 0); + vsir_validate_src_count(ctx, instruction, 0); + if (ctx->depth == 0 || (ctx->blocks[ctx->depth - 1] != VKD3DSIH_IF && ctx->blocks[ctx->depth - 1] != VKD3DSIH_ELSE)) + validator_error(ctx, VKD3D_SHADER_ERROR_VSIR_INVALID_INSTRUCTION_NESTING, "ENDIF instruction doesn't terminate IF/ELSE block."); + else + --ctx->depth; + break; + default: break; } @@ -1651,4 +1681,9 @@ void vsir_validate(struct vkd3d_shader_parser *parser) for (ctx.instruction_idx = 0; ctx.instruction_idx < parser->instructions.count; ++ctx.instruction_idx) vsir_validate_instruction(&ctx); + + if (ctx.depth != 0) + validator_error(&ctx, VKD3D_SHADER_ERROR_VSIR_INVALID_INSTRUCTION_NESTING, "%zu nested blocks were not closed.", ctx.depth); + + free(ctx.blocks); } diff --git a/libs/vkd3d-shader/vkd3d_shader_private.h b/libs/vkd3d-shader/vkd3d_shader_private.h index ab730011..55808785 100644 --- a/libs/vkd3d-shader/vkd3d_shader_private.h +++ b/libs/vkd3d-shader/vkd3d_shader_private.h @@ -210,6 +210,7 @@ enum vkd3d_shader_error VKD3D_SHADER_ERROR_VSIR_DUPLICATE_DCL_TEMPS = 9013, VKD3D_SHADER_ERROR_VSIR_INVALID_DCL_TEMPS = 9014, VKD3D_SHADER_ERROR_VSIR_INVALID_INDEX = 9015, + VKD3D_SHADER_ERROR_VSIR_INVALID_INSTRUCTION_NESTING = 9016, }; enum vkd3d_shader_opcode

1 0

Giovanni Mascellani : vkd3d-shader/ir: Emit an ERR() on validation errors.
by Alexandre Julliard Nov. 7, 2023

Nov. 7, 2023

Module: vkd3d Branch: master Commit: ca3f594ae31f6fe5a2dc6d46ac428029adfe4848 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/ca3f594ae31f6fe5a2dc6d46ac428… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Mon Nov 6 13:15:23 2023 +0100 vkd3d-shader/ir: Emit an ERR() on validation errors. --- libs/vkd3d-shader/ir.c | 1 + 1 file changed, 1 insertion(+) diff --git a/libs/vkd3d-shader/ir.c b/libs/vkd3d-shader/ir.c index 758b594b..40db494f 100644 --- a/libs/vkd3d-shader/ir.c +++ b/libs/vkd3d-shader/ir.c @@ -1492,6 +1492,7 @@ static void VKD3D_PRINTF_FUNC(3, 4) validator_error(struct validation_context *c va_end(args); vkd3d_shader_parser_error(ctx->parser, error, "instruction %zu: %s", ctx->instruction_idx + 1, buf.buffer); + ERR("VSIR validation error: instruction %zu: %s\n", ctx->instruction_idx + 1, buf.buffer); vkd3d_string_buffer_cleanup(&buf); }

1 0

Francisco Casas : vkd3d-shader/tpf: Move sm4_register_from_node() up.
by Alexandre Julliard Nov. 7, 2023

Nov. 7, 2023

Module: vkd3d Branch: master Commit: 281796c526ce77619937e68d56c32ad1a1dabe66 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/281796c526ce77619937e68d56c32… Author: Francisco Casas <fcasas(a)codeweavers.com> Date: Fri Oct 6 11:52:45 2023 -0300 vkd3d-shader/tpf: Move sm4_register_from_node() up. --- libs/vkd3d-shader/tpf.c | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/libs/vkd3d-shader/tpf.c b/libs/vkd3d-shader/tpf.c index 70ee4124..b7fcfca5 100644 --- a/libs/vkd3d-shader/tpf.c +++ b/libs/vkd3d-shader/tpf.c @@ -3637,6 +3637,17 @@ struct sm4_instruction unsigned int idx_count; }; +static void sm4_register_from_node(struct vkd3d_shader_register *reg, uint32_t *writemask, + const struct hlsl_ir_node *instr) +{ + assert(instr->reg.allocated); + reg->type = VKD3DSPR_TEMP; + reg->dimension = VSIR_DIMENSION_VEC4; + reg->idx[0].offset = instr->reg.id; + reg->idx_count = 1; + *writemask = instr->reg.writemask; +} + static void sm4_register_from_deref(struct hlsl_ctx *ctx, struct vkd3d_shader_register *reg, uint32_t *writemask, const struct hlsl_deref *deref) { @@ -3778,17 +3789,6 @@ static void sm4_src_from_deref(const struct tpf_writer *tpf, struct vkd3d_shader } } -static void sm4_register_from_node(struct vkd3d_shader_register *reg, uint32_t *writemask, - const struct hlsl_ir_node *instr) -{ - assert(instr->reg.allocated); - reg->type = VKD3DSPR_TEMP; - reg->dimension = VSIR_DIMENSION_VEC4; - reg->idx[0].offset = instr->reg.id; - reg->idx_count = 1; - *writemask = instr->reg.writemask; -} - static void sm4_dst_from_node(struct vkd3d_shader_dst_param *dst, const struct hlsl_ir_node *instr) { sm4_register_from_node(&dst->reg, &dst->write_mask, instr);

1 0

Francisco Casas : vkd3d-shader/tpf: Support relative addressing for indexable temps in SM4.
by Alexandre Julliard Nov. 7, 2023

Nov. 7, 2023

Module: vkd3d Branch: master Commit: 0ef25ad137d076490b87edabfd573546ae9b8ff4 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/0ef25ad137d076490b87edabfd573… Author: Francisco Casas <fcasas(a)codeweavers.com> Date: Fri Oct 6 13:16:48 2023 -0300 vkd3d-shader/tpf: Support relative addressing for indexable temps in SM4. For relative addressing, the vkd3d_shader_registers must point to another vkd3d_shader_src_param. For now, use the sm4_instruction to save them, since the only purpose of this struct is to be used as paramter for write_sm4_instruction. --- libs/vkd3d-shader/tpf.c | 86 +++++++++++++++++++++++-------- tests/hlsl/function-return.shader_test | 22 ++++---- tests/hlsl/matrix-indexing.shader_test | 6 +-- tests/hlsl/non-const-indexing.shader_test | 66 ++++++++++++------------ tests/hlsl/return.shader_test | 22 ++++---- 5 files changed, 123 insertions(+), 79 deletions(-)

1 0

Francisco Casas : vkd3d-shader/tpf: Support writing relative addressing indexes.
by Alexandre Julliard Nov. 7, 2023

Nov. 7, 2023

Module: vkd3d Branch: master Commit: e10d41d7994ab2d6d1d424d7f1fd737e08891b69 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/e10d41d7994ab2d6d1d424d7f1fd7… Author: Francisco Casas <fcasas(a)codeweavers.com> Date: Fri Oct 6 02:06:23 2023 -0300 vkd3d-shader/tpf: Support writing relative addressing indexes. --- libs/vkd3d-shader/tpf.c | 40 ++++++++++++++++++++++++++++++++-------- 1 file changed, 32 insertions(+), 8 deletions(-) diff --git a/libs/vkd3d-shader/tpf.c b/libs/vkd3d-shader/tpf.c index 79ea39d3..70ee4124 100644 --- a/libs/vkd3d-shader/tpf.c +++ b/libs/vkd3d-shader/tpf.c @@ -3915,6 +3915,36 @@ static uint32_t sm4_encode_register(const struct tpf_writer *tpf, const struct v return token; } +static void sm4_write_register_index(const struct tpf_writer *tpf, const struct vkd3d_shader_register *reg, + unsigned int j) +{ + unsigned int addressing = sm4_get_index_addressing_from_reg(reg, j); + struct vkd3d_bytecode_buffer *buffer = tpf->buffer; + unsigned int k; + + if (addressing & VKD3D_SM4_ADDRESSING_RELATIVE) + { + const struct vkd3d_shader_src_param *idx_src = reg->idx[j].rel_addr; + uint32_t idx_src_token; + + assert(idx_src); + assert(!idx_src->modifiers); + assert(idx_src->reg.type != VKD3DSPR_IMMCONST); + idx_src_token = sm4_encode_register(tpf, &idx_src->reg, VKD3D_SM4_SWIZZLE_SCALAR, idx_src->swizzle); + + put_u32(buffer, idx_src_token); + for (k = 0; k < idx_src->reg.idx_count; ++k) + { + put_u32(buffer, idx_src->reg.idx[k].offset); + assert(!idx_src->reg.idx[k].rel_addr); + } + } + else + { + put_u32(tpf->buffer, reg->idx[j].offset); + } +} + static void sm4_write_dst_register(const struct tpf_writer *tpf, const struct vkd3d_shader_dst_param *dst) { struct vkd3d_bytecode_buffer *buffer = tpf->buffer; @@ -3925,10 +3955,7 @@ static void sm4_write_dst_register(const struct tpf_writer *tpf, const struct vk put_u32(buffer, token); for (j = 0; j < dst->reg.idx_count; ++j) - { - put_u32(buffer, dst->reg.idx[j].offset); - assert(!dst->reg.idx[j].rel_addr); - } + sm4_write_register_index(tpf, &dst->reg, j); } static void sm4_write_src_register(const struct tpf_writer *tpf, const struct vkd3d_shader_src_param *src) @@ -3978,10 +4005,7 @@ static void sm4_write_src_register(const struct tpf_writer *tpf, const struct vk } for (j = 0; j < src->reg.idx_count; ++j) - { - put_u32(buffer, src->reg.idx[j].offset); - assert(!src->reg.idx[j].rel_addr); - } + sm4_write_register_index(tpf, &src->reg, j); if (src->reg.type == VKD3DSPR_IMMCONST) {

1 0