November 2023 - Wine-commits

Giovanni Mascellani : vkd3d-shader/ir: Validate the register dimension.
by Alexandre Julliard 02 Nov '23

02 Nov '23

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 index count.
by Alexandre Julliard 02 Nov '23

02 Nov '23

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 DCL_TEMPS instruction.
by Alexandre Julliard 02 Nov '23

02 Nov '23

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 index of a TEMP register.
by Alexandre Julliard 02 Nov '23

02 Nov '23

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 02 Nov '23

02 Nov '23

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 02 Nov '23

02 Nov '23

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

Nikolay Sivov : vkd3d-shader/hlsl: Add a keyword for fx_5_0 techniques.
by Alexandre Julliard 02 Nov '23

02 Nov '23

Module: vkd3d Branch: master Commit: ea8ff5394ceb5f83bc36dbbda7d9d0738ba10971 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/ea8ff5394ceb5f83bc36dbbda7d9d… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Nov 1 21:54:17 2023 +0100 vkd3d-shader/hlsl: Add a keyword for fx_5_0 techniques. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- libs/vkd3d-shader/hlsl.l | 1 + libs/vkd3d-shader/hlsl.y | 1 + tests/hlsl/technique-fx_2.shader_test | 2 +- 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/libs/vkd3d-shader/hlsl.l b/libs/vkd3d-shader/hlsl.l index 527d853a..a6b78ddf 100644 --- a/libs/vkd3d-shader/hlsl.l +++ b/libs/vkd3d-shader/hlsl.l @@ -133,6 +133,7 @@ switch {return KW_SWITCH; } tbuffer {return KW_TBUFFER; } technique {return KW_TECHNIQUE; } technique10 {return KW_TECHNIQUE10; } +technique11 {return KW_TECHNIQUE11; } texture {return KW_TEXTURE; } texture1D {return KW_TEXTURE1D; } Texture1D {return KW_TEXTURE1D; } diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index 71c0ae46..8acfc666 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -4832,6 +4832,7 @@ static void check_duplicated_switch_cases(struct hlsl_ctx *ctx, const struct hls %token KW_TBUFFER %token KW_TECHNIQUE %token KW_TECHNIQUE10 +%token KW_TECHNIQUE11 %token KW_TEXTURE %token KW_TEXTURE1D %token KW_TEXTURE1DARRAY diff --git a/tests/hlsl/technique-fx_2.shader_test b/tests/hlsl/technique-fx_2.shader_test index 9eaa9a65..978dece1 100644 --- a/tests/hlsl/technique-fx_2.shader_test +++ b/tests/hlsl/technique-fx_2.shader_test @@ -15,7 +15,7 @@ float4 main() : sv_target return technique10; } -[pixel shader fail todo] +[pixel shader fail] float4 main() : sv_target { float4 technique11 = {0, 0, 0, 0};

1 0

Nikolay Sivov : vkd3d-shader/hlsl: Use case-insensitive match for the "technique" keyword.
by Alexandre Julliard 02 Nov '23

02 Nov '23

Module: vkd3d Branch: master Commit: 53b0101a53dca6d1dcda20559edb35238e07c5b0 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/53b0101a53dca6d1dcda20559edb3… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Nov 1 22:16:47 2023 +0100 vkd3d-shader/hlsl: Use case-insensitive match for the "technique" keyword. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- libs/vkd3d-shader/hlsl.l | 2 +- tests/hlsl/technique-fx_2.shader_test | 4 ++-- tests/hlsl/technique-fx_4.shader_test | 2 +- tests/hlsl/technique-fx_5.shader_test | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.l b/libs/vkd3d-shader/hlsl.l index a6b78ddf..83fe1d34 100644 --- a/libs/vkd3d-shader/hlsl.l +++ b/libs/vkd3d-shader/hlsl.l @@ -131,7 +131,7 @@ string {return KW_STRING; } struct {return KW_STRUCT; } switch {return KW_SWITCH; } tbuffer {return KW_TBUFFER; } -technique {return KW_TECHNIQUE; } +(?i:technique) {return KW_TECHNIQUE; } technique10 {return KW_TECHNIQUE10; } technique11 {return KW_TECHNIQUE11; } texture {return KW_TEXTURE; } diff --git a/tests/hlsl/technique-fx_2.shader_test b/tests/hlsl/technique-fx_2.shader_test index 978dece1..6e130747 100644 --- a/tests/hlsl/technique-fx_2.shader_test +++ b/tests/hlsl/technique-fx_2.shader_test @@ -1,7 +1,7 @@ [require] shader model < 3.0 -[pixel shader fail todo] +[pixel shader fail] float4 main() : sv_target { float4 teChnique = {0, 0, 0, 0}; @@ -30,7 +30,7 @@ float4 main() : sv_target return float4(0, 0, 0, 0); } -[pixel shader fail todo] +[pixel shader fail] typedef float4 Technique; float4 main() : sv_target diff --git a/tests/hlsl/technique-fx_4.shader_test b/tests/hlsl/technique-fx_4.shader_test index 8102e78b..230553e5 100644 --- a/tests/hlsl/technique-fx_4.shader_test +++ b/tests/hlsl/technique-fx_4.shader_test @@ -2,7 +2,7 @@ shader model >= 4.0 shader model < 6.0 -[pixel shader fail todo] +[pixel shader fail] float4 main() : sv_target { float4 teChnique = {0, 0, 0, 0}; diff --git a/tests/hlsl/technique-fx_5.shader_test b/tests/hlsl/technique-fx_5.shader_test index 047ed2f2..f0b51198 100644 --- a/tests/hlsl/technique-fx_5.shader_test +++ b/tests/hlsl/technique-fx_5.shader_test @@ -2,7 +2,7 @@ shader model >= 5.0 shader model < 6.0 -[pixel shader fail todo] +[pixel shader fail] float4 main() : sv_target { float4 teChnique = {0, 0, 0, 0};

1 0

Nikolay Sivov : vkd3d-shader/hlsl: Parse empty technique declarations.
by Alexandre Julliard 02 Nov '23

02 Nov '23

Module: vkd3d Branch: master Commit: dbcc4c4e401332a390a8d4e06cf92bfe50baae6f URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/dbcc4c4e401332a390a8d4e06cf92… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Nov 1 22:53:29 2023 +0100 vkd3d-shader/hlsl: Parse empty technique declarations. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- libs/vkd3d-shader/hlsl.y | 43 +++++++++++++++++++++++++++++++++++ tests/hlsl/technique-fx_2.shader_test | 6 ++--- tests/hlsl/technique-fx_4.shader_test | 4 ++-- tests/hlsl/technique-fx_5.shader_test | 4 ++-- 4 files changed, 50 insertions(+), 7 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index 8acfc666..3c30c0cb 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -4955,6 +4955,7 @@ static void check_duplicated_switch_cases(struct hlsl_ctx *ctx, const struct hls %type <name> any_identifier %type <name> var_identifier +%type <name> technique_name %type <parameter> parameter @@ -4996,8 +4997,50 @@ hlsl_prog: destroy_block($2); } | hlsl_prog preproc_directive + | hlsl_prog technique | hlsl_prog ';' +technique_name: + %empty + { + $$ = NULL; + } + | any_identifier + +pass_list: + %empty + +technique9: + KW_TECHNIQUE technique_name '{' pass_list '}' + { + hlsl_fixme(ctx, &@$, "Unsupported \'technique\' declaration."); + } + +technique10: + KW_TECHNIQUE10 technique_name '{' pass_list '}' + { + if (ctx->profile->type == VKD3D_SHADER_TYPE_EFFECT && ctx->profile->major_version == 2) + hlsl_error(ctx, &@1, VKD3D_SHADER_ERROR_HLSL_INVALID_SYNTAX, + "The 'technique10' keyword is invalid for this profile."); + + hlsl_fixme(ctx, &@$, "Unsupported \'technique10\' declaration."); + } + +technique11: + KW_TECHNIQUE11 technique_name '{' pass_list '}' + { + if (ctx->profile->type == VKD3D_SHADER_TYPE_EFFECT && ctx->profile->major_version == 2) + hlsl_error(ctx, &@1, VKD3D_SHADER_ERROR_HLSL_INVALID_SYNTAX, + "The 'technique11' keyword is invalid for this profile."); + + hlsl_fixme(ctx, &@$, "Unsupported \'technique11\' declaration."); + } + +technique: + technique9 + | technique10 + | technique11 + buffer_declaration: buffer_type any_identifier colon_attribute { diff --git a/tests/hlsl/technique-fx_2.shader_test b/tests/hlsl/technique-fx_2.shader_test index 6e130747..90c734d5 100644 --- a/tests/hlsl/technique-fx_2.shader_test +++ b/tests/hlsl/technique-fx_2.shader_test @@ -76,7 +76,7 @@ technique10 float4 f; % fx_5_0 keyword fails with fx_2_0 profile -[effect fail] +[effect fail todo] technique { } @@ -85,7 +85,7 @@ technique11 { } -[effect fail] +[effect fail todo] technique { } @@ -94,7 +94,7 @@ tEchnique10 { } -[effect fail] +[effect fail todo] technique { } diff --git a/tests/hlsl/technique-fx_4.shader_test b/tests/hlsl/technique-fx_4.shader_test index 230553e5..fb8a3e67 100644 --- a/tests/hlsl/technique-fx_4.shader_test +++ b/tests/hlsl/technique-fx_4.shader_test @@ -46,7 +46,7 @@ technique11 { } -[effect fail] +[effect fail todo] technique { } @@ -55,7 +55,7 @@ tEchnique10 { } -[effect fail] +[effect fail todo] technique { } diff --git a/tests/hlsl/technique-fx_5.shader_test b/tests/hlsl/technique-fx_5.shader_test index f0b51198..aeea1a84 100644 --- a/tests/hlsl/technique-fx_5.shader_test +++ b/tests/hlsl/technique-fx_5.shader_test @@ -46,7 +46,7 @@ technique11 { } -[effect fail] +[effect fail todo] technique { } @@ -55,7 +55,7 @@ tEchnique10 { } -[effect fail] +[effect fail todo] technique { }

1 0

Conor McCarthy : vkd3d-shader/dxil: Allow empty struct types.
by Alexandre Julliard 02 Nov '23

02 Nov '23

Module: vkd3d Branch: master Commit: 7419f4e31d2617b29717a1efcf57c25dc930030f URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/7419f4e31d2617b29717a1efcf57c… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Thu Nov 2 13:56:25 2023 +1000 vkd3d-shader/dxil: Allow empty struct types. --- libs/vkd3d-shader/dxil.c | 2 +- tests/hlsl/object-field-offsets.shader_test | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/libs/vkd3d-shader/dxil.c b/libs/vkd3d-shader/dxil.c index 18004139..94f5b862 100644 --- a/libs/vkd3d-shader/dxil.c +++ b/libs/vkd3d-shader/dxil.c @@ -1374,7 +1374,7 @@ static enum vkd3d_result sm6_parser_type_table_init(struct sm6_parser *sm6) case TYPE_CODE_STRUCT_ANON: case TYPE_CODE_STRUCT_NAMED: - if (!dxil_record_validate_operand_min_count(record, 2, sm6)) + if (!dxil_record_validate_operand_min_count(record, 1, sm6)) return VKD3D_ERROR_INVALID_SHADER; if (record->code == TYPE_CODE_STRUCT_NAMED && !struct_name) { diff --git a/tests/hlsl/object-field-offsets.shader_test b/tests/hlsl/object-field-offsets.shader_test index 9cc4581b..8afd9af7 100644 --- a/tests/hlsl/object-field-offsets.shader_test +++ b/tests/hlsl/object-field-offsets.shader_test @@ -45,7 +45,7 @@ float4 main() : sv_target [test] uniform 0 float4 1.0 2.0 3.0 4.0 uniform 4 float4 5.0 6.0 7.0 8.0 -todo(sm>=6) draw quad +draw quad probe all rgba (1.0, 2.0, 5.0, 0.0)

1 0