November 2023 - Wine-Commits

Giovanni Mascellani : vkd3d-shader/ir: Validate the index of a TEMP register.
by Alexandre Julliard Nov. 2, 2023

Nov. 2, 2023

Module: vkd3d Branch: master Commit: af72466db1a92466b62ae67659c761b4681f1249 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/af72466db1a92466b62ae67659c76… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Tue Oct 24 19:55:37 2023 -0500 vkd3d-shader/ir: Validate the index of a TEMP register. --- libs/vkd3d-shader/ir.c | 28 ++++++++++++++++++++++++++++ libs/vkd3d-shader/vkd3d_shader_private.h | 3 +++ 2 files changed, 31 insertions(+) diff --git a/libs/vkd3d-shader/ir.c b/libs/vkd3d-shader/ir.c index 96d77e99..8cf92656 100644 --- a/libs/vkd3d-shader/ir.c +++ b/libs/vkd3d-shader/ir.c @@ -1473,6 +1473,7 @@ struct validation_context { struct vkd3d_shader_parser *parser; size_t instruction_idx; + bool dcl_temps_found; }; static void VKD3D_PRINTF_FUNC(3, 4) validator_error(struct validation_context *ctx, @@ -1514,6 +1515,25 @@ static void vsir_validate_register(struct validation_context *ctx, if (reg->idx_count > ARRAY_SIZE(reg->idx)) validator_error(ctx, VKD3D_SHADER_ERROR_VSIR_INVALID_INDEX_COUNT, "Invalid register index count %u.", reg->idx_count); + + switch (reg->type) + { + case VKD3DSPR_TEMP: + if (reg->idx_count != 1) + validator_error(ctx, VKD3D_SHADER_ERROR_VSIR_INVALID_INDEX_COUNT, "Invalid index count %u for a TEMP register.", + reg->idx_count); + + if (reg->idx_count >= 1 && reg->idx[0].rel_addr) + validator_error(ctx, VKD3D_SHADER_ERROR_VSIR_INVALID_INDEX, "Non-NULL relative address for a TEMP register."); + + if (reg->idx_count >= 1 && reg->idx[0].offset >= ctx->parser->shader_desc.temp_count) + validator_error(ctx, VKD3D_SHADER_ERROR_VSIR_INVALID_INDEX, "TEMP register index %u exceeds the declared count %u.", + reg->idx[0].offset, ctx->parser->shader_desc.temp_count); + break; + + default: + break; + } } static void vsir_validate_dst_param(struct validation_context *ctx, @@ -1602,6 +1622,14 @@ static void vsir_validate_instruction(struct validation_context *ctx) case VKD3DSIH_DCL_TEMPS: vsir_validate_dst_count(ctx, instruction, 0); vsir_validate_src_count(ctx, instruction, 0); + /* TODO Check that each phase in a hull shader has at most + * one occurrence. */ + 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) + 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; default: diff --git a/libs/vkd3d-shader/vkd3d_shader_private.h b/libs/vkd3d-shader/vkd3d_shader_private.h index 7578820c..912267e0 100644 --- a/libs/vkd3d-shader/vkd3d_shader_private.h +++ b/libs/vkd3d-shader/vkd3d_shader_private.h @@ -206,6 +206,9 @@ enum vkd3d_shader_error VKD3D_SHADER_ERROR_VSIR_INVALID_INDEX_COUNT = 9010, VKD3D_SHADER_ERROR_VSIR_INVALID_DEST_COUNT = 9011, VKD3D_SHADER_ERROR_VSIR_INVALID_SOURCE_COUNT = 9012, + VKD3D_SHADER_ERROR_VSIR_DUPLICATE_DCL_TEMPS = 9013, + VKD3D_SHADER_ERROR_VSIR_INVALID_DCL_TEMPS = 9014, + VKD3D_SHADER_ERROR_VSIR_INVALID_INDEX = 9015, }; enum vkd3d_shader_opcode

1 0

Conor McCarthy : vkd3d-shader/dxil: Always apply the signature element start column to used_mask.
by Alexandre Julliard Nov. 2, 2023

Nov. 2, 2023

Module: vkd3d Branch: master Commit: 7ca6a5452a87ce4cf9d7b65e21bbaf2033671738 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/7ca6a5452a87ce4cf9d7b65e21bba… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Tue Oct 31 12:38:34 2023 +1000 vkd3d-shader/dxil: Always apply the signature element start column to used_mask. The used_mask value loaded from an additional tag/value pair is relative to the start column. --- libs/vkd3d-shader/dxil.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/libs/vkd3d-shader/dxil.c b/libs/vkd3d-shader/dxil.c index 99cf3e36..18004139 100644 --- a/libs/vkd3d-shader/dxil.c +++ b/libs/vkd3d-shader/dxil.c @@ -4070,10 +4070,12 @@ static enum vkd3d_result sm6_parser_read_signature(struct sm6_parser *sm6, const return VKD3D_ERROR_INVALID_SHADER; } - e->mask = vkd3d_write_mask_from_component_count(column_count) << index; + e->mask = vkd3d_write_mask_from_component_count(column_count); e->used_mask = e->mask; + e->mask <<= index; signature_element_read_additional_element_values(e, element_node, sm6); + e->used_mask <<= index; m = element_node->operands[4]; if (!sm6_metadata_value_is_node(m))

1 0

Nikolay Sivov : tests: Add some tests for using technique blocks when compiling for pixel/vertex profiles.
by Alexandre Julliard Nov. 2, 2023

Nov. 2, 2023

Module: vkd3d Branch: master Commit: c588f33822c10cc896947d31d279065654f748e6 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/c588f33822c10cc896947d31d2790… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Nov 1 19:44:39 2023 +0100 tests: Add some tests for using technique blocks when compiling for pixel/vertex profiles. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- tests/hlsl/technique-fx_2.shader_test | 37 +++++++++++++++++++++++++++++++++++ tests/hlsl/technique-fx_4.shader_test | 37 +++++++++++++++++++++++++++++++++++ tests/hlsl/technique-fx_5.shader_test | 37 +++++++++++++++++++++++++++++++++++ 3 files changed, 111 insertions(+) diff --git a/tests/hlsl/technique-fx_2.shader_test b/tests/hlsl/technique-fx_2.shader_test index 149506e6..9eaa9a65 100644 --- a/tests/hlsl/technique-fx_2.shader_test +++ b/tests/hlsl/technique-fx_2.shader_test @@ -102,3 +102,40 @@ technique tEchnique11 { } + +% Regular shaders with technique blocks +[vertex shader todo] +float4 main() : sv_position +{ + return 0; +} + +technique +{ +} + +technique10 +{ +} + +technique11 +{ +} + +[pixel shader todo] +float4 main() : sv_target +{ + return 0; +} + +tEchnique +{ +} + +technique10 +{ +} + +technique11 +{ +} diff --git a/tests/hlsl/technique-fx_4.shader_test b/tests/hlsl/technique-fx_4.shader_test index dd4fdc27..8102e78b 100644 --- a/tests/hlsl/technique-fx_4.shader_test +++ b/tests/hlsl/technique-fx_4.shader_test @@ -81,3 +81,40 @@ float4 technIque10; [effect todo] float4 technIque11; + +% Regular shaders with technique blocks +[vertex shader todo] +float4 main() : sv_position +{ + return 0; +} + +technique +{ +} + +technique10 +{ +} + +technique11 +{ +} + +[pixel shader todo] +float4 main() : sv_target +{ + return 0; +} + +tEchnique +{ +} + +technique10 +{ +} + +technique11 +{ +} diff --git a/tests/hlsl/technique-fx_5.shader_test b/tests/hlsl/technique-fx_5.shader_test index ae253234..047ed2f2 100644 --- a/tests/hlsl/technique-fx_5.shader_test +++ b/tests/hlsl/technique-fx_5.shader_test @@ -81,3 +81,40 @@ float4 technIque10; [effect todo] float4 technIque11; + +% Regular shaders with technique blocks +[vertex shader todo] +float4 main() : sv_position +{ + return 0; +} + +technique +{ +} + +technique10 +{ +} + +technique11 +{ +} + +[pixel shader todo] +float4 main() : sv_target +{ + return 0; +} + +tEchnique +{ +} + +technique10 +{ +} + +technique11 +{ +}

1 0

Giovanni Mascellani : vkd3d-shader/ir: Validate the DCL_TEMPS instruction.
by Alexandre Julliard Nov. 2, 2023

Nov. 2, 2023

Module: vkd3d Branch: master Commit: 4140b87499a8d684113aaec02f27af90689409a4 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/4140b87499a8d684113aaec02f27a… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Tue Oct 24 20:08:00 2023 -0500 vkd3d-shader/ir: Validate the DCL_TEMPS instruction. --- libs/vkd3d-shader/ir.c | 29 +++++++++++++++++++++++++++++ libs/vkd3d-shader/vkd3d_shader_private.h | 2 ++ 2 files changed, 31 insertions(+) diff --git a/libs/vkd3d-shader/ir.c b/libs/vkd3d-shader/ir.c index 1b52f866..96d77e99 100644 --- a/libs/vkd3d-shader/ir.c +++ b/libs/vkd3d-shader/ir.c @@ -1560,6 +1560,24 @@ static void vsir_validate_src_param(struct validation_context *ctx, src->modifiers); } +static void vsir_validate_dst_count(struct validation_context *ctx, + const struct vkd3d_shader_instruction *instruction, unsigned int count) +{ + if (instruction->dst_count != count) + validator_error(ctx, VKD3D_SHADER_ERROR_VSIR_INVALID_DEST_COUNT, + "Invalid destination count %u for an instruction of type %#x, expected %u.", + instruction->dst_count, instruction->handler_idx, count); +} + +static void vsir_validate_src_count(struct validation_context *ctx, + const struct vkd3d_shader_instruction *instruction, unsigned int count) +{ + if (instruction->src_count != count) + validator_error(ctx, VKD3D_SHADER_ERROR_VSIR_INVALID_SOURCE_COUNT, + "Invalid source count %u for an instruction of type %#x, expected %u.", + instruction->src_count, instruction->handler_idx, count); +} + static void vsir_validate_instruction(struct validation_context *ctx) { const struct vkd3d_shader_instruction *instruction = &ctx->parser->instructions.elements[ctx->instruction_idx]; @@ -1578,6 +1596,17 @@ static void vsir_validate_instruction(struct validation_context *ctx) validator_error(ctx, VKD3D_SHADER_ERROR_VSIR_INVALID_HANDLER, "Invalid instruction handler %#x.", instruction->handler_idx); } + + switch (instruction->handler_idx) + { + case VKD3DSIH_DCL_TEMPS: + vsir_validate_dst_count(ctx, instruction, 0); + vsir_validate_src_count(ctx, instruction, 0); + break; + + default: + break; + } } void vsir_validate(struct vkd3d_shader_parser *parser) diff --git a/libs/vkd3d-shader/vkd3d_shader_private.h b/libs/vkd3d-shader/vkd3d_shader_private.h index 8e744593..7578820c 100644 --- a/libs/vkd3d-shader/vkd3d_shader_private.h +++ b/libs/vkd3d-shader/vkd3d_shader_private.h @@ -204,6 +204,8 @@ enum vkd3d_shader_error VKD3D_SHADER_ERROR_VSIR_INVALID_DATA_TYPE = 9008, VKD3D_SHADER_ERROR_VSIR_INVALID_DIMENSION = 9009, VKD3D_SHADER_ERROR_VSIR_INVALID_INDEX_COUNT = 9010, + VKD3D_SHADER_ERROR_VSIR_INVALID_DEST_COUNT = 9011, + VKD3D_SHADER_ERROR_VSIR_INVALID_SOURCE_COUNT = 9012, }; enum vkd3d_shader_opcode

1 0

Giovanni Mascellani : vkd3d-shader/ir: Validate the register index count.
by Alexandre Julliard Nov. 2, 2023

Nov. 2, 2023

Module: vkd3d Branch: master Commit: 79fa5fd8bbd534eec9fd9a09c7d9894dfa92e4d4 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/79fa5fd8bbd534eec9fd9a09c7d98… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Tue Oct 24 19:46:07 2023 -0500 vkd3d-shader/ir: Validate the register index count. --- libs/vkd3d-shader/ir.c | 4 ++++ libs/vkd3d-shader/vkd3d_shader_private.h | 1 + 2 files changed, 5 insertions(+) diff --git a/libs/vkd3d-shader/ir.c b/libs/vkd3d-shader/ir.c index fd594bad..1b52f866 100644 --- a/libs/vkd3d-shader/ir.c +++ b/libs/vkd3d-shader/ir.c @@ -1510,6 +1510,10 @@ static void vsir_validate_register(struct validation_context *ctx, if (reg->dimension >= VSIR_DIMENSION_COUNT) validator_error(ctx, VKD3D_SHADER_ERROR_VSIR_INVALID_DIMENSION, "Invalid register dimension %#x.", reg->dimension); + + if (reg->idx_count > ARRAY_SIZE(reg->idx)) + validator_error(ctx, VKD3D_SHADER_ERROR_VSIR_INVALID_INDEX_COUNT, "Invalid register index count %u.", + reg->idx_count); } static void vsir_validate_dst_param(struct validation_context *ctx, diff --git a/libs/vkd3d-shader/vkd3d_shader_private.h b/libs/vkd3d-shader/vkd3d_shader_private.h index f8d10061..8e744593 100644 --- a/libs/vkd3d-shader/vkd3d_shader_private.h +++ b/libs/vkd3d-shader/vkd3d_shader_private.h @@ -203,6 +203,7 @@ enum vkd3d_shader_error VKD3D_SHADER_ERROR_VSIR_INVALID_PRECISION = 9007, VKD3D_SHADER_ERROR_VSIR_INVALID_DATA_TYPE = 9008, VKD3D_SHADER_ERROR_VSIR_INVALID_DIMENSION = 9009, + VKD3D_SHADER_ERROR_VSIR_INVALID_INDEX_COUNT = 9010, }; enum vkd3d_shader_opcode

1 0

Giovanni Mascellani : vkd3d-shader/ir: Validate the register dimension.
by Alexandre Julliard Nov. 2, 2023

Nov. 2, 2023

Module: vkd3d Branch: master Commit: 26e4191d4bb29fd05296f28c2c37e33a8eed4da9 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/26e4191d4bb29fd05296f28c2c37e… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Tue Oct 24 19:43:31 2023 -0500 vkd3d-shader/ir: Validate the register dimension. --- libs/vkd3d-shader/ir.c | 4 ++++ libs/vkd3d-shader/tpf.c | 2 ++ libs/vkd3d-shader/vkd3d_shader_private.h | 3 +++ 3 files changed, 9 insertions(+) diff --git a/libs/vkd3d-shader/ir.c b/libs/vkd3d-shader/ir.c index 76987310..fd594bad 100644 --- a/libs/vkd3d-shader/ir.c +++ b/libs/vkd3d-shader/ir.c @@ -1506,6 +1506,10 @@ static void vsir_validate_register(struct validation_context *ctx, if (reg->data_type >= VKD3D_DATA_COUNT) validator_error(ctx, VKD3D_SHADER_ERROR_VSIR_INVALID_DATA_TYPE, "Invalid register data type %#x.", reg->data_type); + + if (reg->dimension >= VSIR_DIMENSION_COUNT) + validator_error(ctx, VKD3D_SHADER_ERROR_VSIR_INVALID_DIMENSION, "Invalid register dimension %#x.", + reg->dimension); } static void vsir_validate_dst_param(struct validation_context *ctx, diff --git a/libs/vkd3d-shader/tpf.c b/libs/vkd3d-shader/tpf.c index a49457dc..afdf8473 100644 --- a/libs/vkd3d-shader/tpf.c +++ b/libs/vkd3d-shader/tpf.c @@ -549,6 +549,8 @@ static enum vkd3d_sm4_dimension sm4_dimension_from_vsir_dimension(enum vsir_dime return VKD3D_SM4_DIMENSION_SCALAR; case VSIR_DIMENSION_VEC4: return VKD3D_SM4_DIMENSION_VEC4; + case VSIR_DIMENSION_COUNT: + vkd3d_unreachable(); } vkd3d_unreachable(); } diff --git a/libs/vkd3d-shader/vkd3d_shader_private.h b/libs/vkd3d-shader/vkd3d_shader_private.h index 4c483520..f8d10061 100644 --- a/libs/vkd3d-shader/vkd3d_shader_private.h +++ b/libs/vkd3d-shader/vkd3d_shader_private.h @@ -202,6 +202,7 @@ enum vkd3d_shader_error VKD3D_SHADER_ERROR_VSIR_INVALID_SWIZZLE = 9006, VKD3D_SHADER_ERROR_VSIR_INVALID_PRECISION = 9007, VKD3D_SHADER_ERROR_VSIR_INVALID_DATA_TYPE = 9008, + VKD3D_SHADER_ERROR_VSIR_INVALID_DIMENSION = 9009, }; enum vkd3d_shader_opcode @@ -601,6 +602,8 @@ enum vsir_dimension VSIR_DIMENSION_NONE, VSIR_DIMENSION_SCALAR, VSIR_DIMENSION_VEC4, + + VSIR_DIMENSION_COUNT, }; enum vkd3d_shader_src_modifier

1 0

Giovanni Mascellani : vkd3d-shader/ir: Validate the register precision.
by Alexandre Julliard Nov. 2, 2023

Nov. 2, 2023

Module: vkd3d Branch: master Commit: 72d0f765f245e71d867e3419c9e83d73dc874edd URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/72d0f765f245e71d867e3419c9e83… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Tue Oct 24 19:37:40 2023 -0500 vkd3d-shader/ir: Validate the register precision. --- libs/vkd3d-shader/ir.c | 4 ++++ libs/vkd3d-shader/vkd3d_shader_private.h | 3 +++ 2 files changed, 7 insertions(+) diff --git a/libs/vkd3d-shader/ir.c b/libs/vkd3d-shader/ir.c index c8cbf1e4..03813656 100644 --- a/libs/vkd3d-shader/ir.c +++ b/libs/vkd3d-shader/ir.c @@ -1498,6 +1498,10 @@ static void vsir_validate_register(struct validation_context *ctx, if (reg->type >= VKD3DSPR_COUNT) validator_error(ctx, VKD3D_SHADER_ERROR_VSIR_INVALID_REGISTER_TYPE, "Invalid register type %#x.", reg->type); + + if (reg->precision >= VKD3D_SHADER_REGISTER_PRECISION_COUNT) + validator_error(ctx, VKD3D_SHADER_ERROR_VSIR_INVALID_PRECISION, "Invalid register precision %#x.", + reg->precision); } static void vsir_validate_dst_param(struct validation_context *ctx, diff --git a/libs/vkd3d-shader/vkd3d_shader_private.h b/libs/vkd3d-shader/vkd3d_shader_private.h index 7a921578..6bb0882e 100644 --- a/libs/vkd3d-shader/vkd3d_shader_private.h +++ b/libs/vkd3d-shader/vkd3d_shader_private.h @@ -200,6 +200,7 @@ enum vkd3d_shader_error VKD3D_SHADER_ERROR_VSIR_INVALID_MODIFIERS = 9004, VKD3D_SHADER_ERROR_VSIR_INVALID_SHIFT = 9005, VKD3D_SHADER_ERROR_VSIR_INVALID_SWIZZLE = 9006, + VKD3D_SHADER_ERROR_VSIR_INVALID_PRECISION = 9007, }; enum vkd3d_shader_opcode @@ -556,6 +557,8 @@ enum vkd3d_shader_register_precision VKD3D_SHADER_REGISTER_PRECISION_MIN_INT_16, VKD3D_SHADER_REGISTER_PRECISION_MIN_UINT_16, + VKD3D_SHADER_REGISTER_PRECISION_COUNT, + VKD3D_SHADER_REGISTER_PRECISION_INVALID = ~0u, };

1 0

Giovanni Mascellani : vkd3d-shader/ir: Validate the register data type.
by Alexandre Julliard Nov. 2, 2023

Nov. 2, 2023

Module: vkd3d Branch: master Commit: f3a20be35a307f430614841730df3709672fb4fe URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/f3a20be35a307f430614841730df3… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Tue Oct 24 19:41:09 2023 -0500 vkd3d-shader/ir: Validate the register data type. --- libs/vkd3d-shader/ir.c | 4 ++++ libs/vkd3d-shader/vkd3d_shader_private.h | 3 +++ 2 files changed, 7 insertions(+) diff --git a/libs/vkd3d-shader/ir.c b/libs/vkd3d-shader/ir.c index 03813656..76987310 100644 --- a/libs/vkd3d-shader/ir.c +++ b/libs/vkd3d-shader/ir.c @@ -1502,6 +1502,10 @@ static void vsir_validate_register(struct validation_context *ctx, if (reg->precision >= VKD3D_SHADER_REGISTER_PRECISION_COUNT) validator_error(ctx, VKD3D_SHADER_ERROR_VSIR_INVALID_PRECISION, "Invalid register precision %#x.", reg->precision); + + if (reg->data_type >= VKD3D_DATA_COUNT) + validator_error(ctx, VKD3D_SHADER_ERROR_VSIR_INVALID_DATA_TYPE, "Invalid register data type %#x.", + reg->data_type); } static void vsir_validate_dst_param(struct validation_context *ctx, diff --git a/libs/vkd3d-shader/vkd3d_shader_private.h b/libs/vkd3d-shader/vkd3d_shader_private.h index 6bb0882e..4c483520 100644 --- a/libs/vkd3d-shader/vkd3d_shader_private.h +++ b/libs/vkd3d-shader/vkd3d_shader_private.h @@ -201,6 +201,7 @@ enum vkd3d_shader_error VKD3D_SHADER_ERROR_VSIR_INVALID_SHIFT = 9005, VKD3D_SHADER_ERROR_VSIR_INVALID_SWIZZLE = 9006, VKD3D_SHADER_ERROR_VSIR_INVALID_PRECISION = 9007, + VKD3D_SHADER_ERROR_VSIR_INVALID_DATA_TYPE = 9008, }; enum vkd3d_shader_opcode @@ -580,6 +581,8 @@ enum vkd3d_data_type VKD3D_DATA_UINT8, VKD3D_DATA_UINT64, VKD3D_DATA_BOOL, + + VKD3D_DATA_COUNT, }; static inline bool data_type_is_integer(enum vkd3d_data_type data_type)

1 0

Giovanni Mascellani : vkd3d-shader/dxil: Use vsir_register_init() to initialize registers.
by Alexandre Julliard Nov. 2, 2023

Nov. 2, 2023

Module: vkd3d Branch: master Commit: f3c1a15a6f1188c3e4631fed9e861d626efdda3b URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/f3c1a15a6f1188c3e4631fed9e861… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Mon Oct 30 17:01:36 2023 +0100 vkd3d-shader/dxil: Use vsir_register_init() to initialize registers. --- libs/vkd3d-shader/dxil.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/libs/vkd3d-shader/dxil.c b/libs/vkd3d-shader/dxil.c index 86e12afe..99cf3e36 100644 --- a/libs/vkd3d-shader/dxil.c +++ b/libs/vkd3d-shader/dxil.c @@ -2347,9 +2347,7 @@ static enum vkd3d_result sm6_parser_constants_init(struct sm6_parser *sm6, const dst = sm6_parser_get_current_value(sm6); dst->type = type; dst->value_type = VALUE_TYPE_REG; - dst->u.reg.type = reg_type; - dst->u.reg.dimension = VSIR_DIMENSION_SCALAR; - dst->u.reg.data_type = reg_data_type; + vsir_register_init(&dst->u.reg, reg_type, reg_data_type, 0); switch (record->code) {

1 0

Giovanni Mascellani : vkd3d-shader: Deduplicate profile version comparison functions.
by Alexandre Julliard Nov. 2, 2023

Nov. 2, 2023

Module: vkd3d Branch: master Commit: 2ba8c5771c51f78b1cdb39d20d7a878b06fbf018 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/2ba8c5771c51f78b1cdb39d20d7a8… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Mon Oct 30 17:14:26 2023 +0100 vkd3d-shader: Deduplicate profile version comparison functions. --- libs/vkd3d-shader/d3d_asm.c | 19 +++++++------------ libs/vkd3d-shader/d3dbc.c | 16 +++------------- libs/vkd3d-shader/vkd3d_shader_private.h | 10 ++++++++++ 3 files changed, 20 insertions(+), 25 deletions(-) diff --git a/libs/vkd3d-shader/d3d_asm.c b/libs/vkd3d-shader/d3d_asm.c index 40daa535..eae7e6b7 100644 --- a/libs/vkd3d-shader/d3d_asm.c +++ b/libs/vkd3d-shader/d3d_asm.c @@ -358,11 +358,6 @@ struct vkd3d_d3d_asm_compiler struct vkd3d_d3d_asm_colours colours; }; -static int shader_ver_ge(const struct vkd3d_shader_version *v, int major, int minor) -{ - return v->major > major || (v->major == major && v->minor >= minor); -} - static int VKD3D_PRINTF_FUNC(2, 3) shader_addline(struct vkd3d_string_buffer *buffer, const char *format, ...) { va_list args; @@ -684,7 +679,7 @@ static void shader_dump_decl_usage(struct vkd3d_d3d_asm_compiler *compiler, else { /* Pixel shaders 3.0 don't have usage semantics. */ - if (!shader_ver_ge(&compiler->shader_version, 3, 0) + if (!vkd3d_shader_ver_ge(&compiler->shader_version, 3, 0) && compiler->shader_version.type == VKD3D_SHADER_TYPE_PIXEL) return; else @@ -908,7 +903,7 @@ static void shader_dump_register(struct vkd3d_d3d_asm_compiler *compiler, const case VKD3DSPR_TEXCRDOUT: /* Vertex shaders >= 3.0 use general purpose output registers * (VKD3DSPR_OUTPUT), which can include an address token. */ - if (shader_ver_ge(&compiler->shader_version, 3, 0)) + if (vkd3d_shader_ver_ge(&compiler->shader_version, 3, 0)) shader_addline(buffer, "o"); else shader_addline(buffer, "oT"); @@ -1174,7 +1169,7 @@ static void shader_dump_register(struct vkd3d_d3d_asm_compiler *compiler, const { if (offset != ~0u) { - bool is_sm_5_1 = shader_ver_ge(&compiler->shader_version, 5, 1); + bool is_sm_5_1 = vkd3d_shader_ver_ge(&compiler->shader_version, 5, 1); if (reg->idx[0].rel_addr || reg->type == VKD3DSPR_IMMCONSTBUFFER || reg->type == VKD3DSPR_INCONTROLPOINT || (reg->type == VKD3DSPR_INPUT @@ -1570,7 +1565,7 @@ static void shader_dump_instruction_flags(struct vkd3d_d3d_asm_compiler *compile break; case VKD3DSIH_TEX: - if (shader_ver_ge(&compiler->shader_version, 2, 0) && (ins->flags & VKD3DSI_TEXLD_PROJECT)) + if (vkd3d_shader_ver_ge(&compiler->shader_version, 2, 0) && (ins->flags & VKD3DSI_TEXLD_PROJECT)) shader_addline(buffer, "p"); break; @@ -1582,7 +1577,7 @@ static void shader_dump_instruction_flags(struct vkd3d_d3d_asm_compiler *compile static void shader_dump_register_space(struct vkd3d_d3d_asm_compiler *compiler, unsigned int register_space) { - if (shader_ver_ge(&compiler->shader_version, 5, 1)) + if (vkd3d_shader_ver_ge(&compiler->shader_version, 5, 1)) shader_print_uint_literal(compiler, ", space=", register_space, ""); } @@ -1626,9 +1621,9 @@ static void shader_dump_instruction(struct vkd3d_d3d_asm_compiler *compiler, case VKD3DSIH_DCL_CONSTANT_BUFFER: vkd3d_string_buffer_printf(buffer, " "); shader_dump_register(compiler, &ins->declaration.cb.src.reg, true); - if (shader_ver_ge(&compiler->shader_version, 6, 0)) + if (vkd3d_shader_ver_ge(&compiler->shader_version, 6, 0)) shader_print_subscript(compiler, ins->declaration.cb.size, NULL); - else if (shader_ver_ge(&compiler->shader_version, 5, 1)) + else if (vkd3d_shader_ver_ge(&compiler->shader_version, 5, 1)) shader_print_subscript(compiler, ins->declaration.cb.size / VKD3D_VEC4_SIZE / sizeof(float), NULL); shader_addline(buffer, ", %s", ins->flags & VKD3DSI_INDEXED_DYNAMIC ? "dynamicIndexed" : "immediateIndexed"); diff --git a/libs/vkd3d-shader/d3dbc.c b/libs/vkd3d-shader/d3dbc.c index a41aaaa6..b1e2dc91 100644 --- a/libs/vkd3d-shader/d3dbc.c +++ b/libs/vkd3d-shader/d3dbc.c @@ -402,16 +402,6 @@ static uint32_t read_u32(const uint32_t **ptr) return *(*ptr)++; } -static bool shader_ver_ge(const struct vkd3d_shader_version *v, unsigned int major, unsigned int minor) -{ - return v->major > major || (v->major == major && v->minor >= minor); -} - -static bool shader_ver_le(const struct vkd3d_shader_version *v, unsigned int major, unsigned int minor) -{ - return v->major < major || (v->major == major && v->minor <= minor); -} - static bool has_relative_address(uint32_t param) { enum vkd3d_sm1_address_mode_type address_mode; @@ -434,8 +424,8 @@ static const struct vkd3d_sm1_opcode_info *shader_sm1_get_opcode_info( return NULL; if (opcode == info->sm1_opcode - && shader_ver_ge(&sm1->p.shader_version, info->min_version.major, info->min_version.minor) - && (shader_ver_le(&sm1->p.shader_version, info->max_version.major, info->max_version.minor) + && vkd3d_shader_ver_ge(&sm1->p.shader_version, info->min_version.major, info->min_version.minor) + && (vkd3d_shader_ver_le(&sm1->p.shader_version, info->max_version.major, info->max_version.minor) || !info->max_version.major)) return info; } @@ -1263,7 +1253,7 @@ static enum vkd3d_result shader_sm1_init(struct vkd3d_shader_sm1_parser *sm1, return VKD3D_ERROR_INVALID_SHADER; } - if (!shader_ver_le(&version, 3, 0)) + if (!vkd3d_shader_ver_le(&version, 3, 0)) { vkd3d_shader_error(message_context, &location, VKD3D_SHADER_ERROR_D3DBC_INVALID_VERSION_TOKEN, "Invalid shader version %u.%u (token 0x%08x).", version.major, version.minor, code[0]); diff --git a/libs/vkd3d-shader/vkd3d_shader_private.h b/libs/vkd3d-shader/vkd3d_shader_private.h index 0146a976..7a921578 100644 --- a/libs/vkd3d-shader/vkd3d_shader_private.h +++ b/libs/vkd3d-shader/vkd3d_shader_private.h @@ -1082,6 +1082,16 @@ struct vkd3d_shader_instruction } declaration; }; +static inline bool vkd3d_shader_ver_ge(const struct vkd3d_shader_version *v, unsigned int major, unsigned int minor) +{ + return v->major > major || (v->major == major && v->minor >= minor); +} + +static inline bool vkd3d_shader_ver_le(const struct vkd3d_shader_version *v, unsigned int major, unsigned int minor) +{ + return v->major < major || (v->major == major && v->minor <= minor); +} + void vsir_instruction_init(struct vkd3d_shader_instruction *ins, const struct vkd3d_shader_location *location, enum vkd3d_shader_opcode handler_idx);

1 0