May 2023 - Wine-Commits - list.winehq.org

Conor McCarthy : vkd3d-shader/tpf: Remove an unnecessary carriage return from a parser error message.
by Alexandre Julliard May 9, 2023

May 9, 2023

Module: vkd3d Branch: master Commit: 3e50c4d13b57e73f8586550c54871331c9b7430a URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/3e50c4d13b57e73f8586550c54871… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Thu May 4 23:29:59 2023 +1000 vkd3d-shader/tpf: Remove an unnecessary carriage return from a parser error message. --- libs/vkd3d-shader/tpf.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/vkd3d-shader/tpf.c b/libs/vkd3d-shader/tpf.c index dc4ed790..795f8980 100644 --- a/libs/vkd3d-shader/tpf.c +++ b/libs/vkd3d-shader/tpf.c @@ -742,7 +742,7 @@ static void shader_sm4_set_descriptor_register_range(struct vkd3d_shader_sm4_par { FIXME("Invalid register range [%u:%u].\n", range->first, range->last); vkd3d_shader_parser_error(&sm4->p, VKD3D_SHADER_ERROR_TPF_INVALID_REGISTER_RANGE, - "Last register %u must not be less than first register %u in range.\n", range->last, range->first); + "Last register %u must not be less than first register %u in range.", range->last, range->first); } }

1 0

Conor McCarthy : vkd3d-shader/tpf: Validate input/output registers.
by Alexandre Julliard May 9, 2023

May 9, 2023

Module: vkd3d Branch: master Commit: d565fbdcd64722cb66c492156424a9a9e01a5d95 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/d565fbdcd64722cb66c492156424a… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Wed May 3 17:24:24 2023 +1000 vkd3d-shader/tpf: Validate input/output registers. --- libs/vkd3d-shader/tpf.c | 72 ++++++++++++++++++++++++++++---- libs/vkd3d-shader/vkd3d_shader_private.h | 1 + 2 files changed, 65 insertions(+), 8 deletions(-) diff --git a/libs/vkd3d-shader/tpf.c b/libs/vkd3d-shader/tpf.c index 77fea973..74c00b5a 100644 --- a/libs/vkd3d-shader/tpf.c +++ b/libs/vkd3d-shader/tpf.c @@ -565,6 +565,9 @@ struct vkd3d_shader_sm4_parser unsigned int output_map[MAX_REG_OUTPUT]; enum vkd3d_shader_opcode phase; + unsigned int input_register_masks[MAX_REG_OUTPUT]; + unsigned int output_register_masks[MAX_REG_OUTPUT]; + unsigned int patch_constant_register_masks[MAX_REG_OUTPUT]; struct vkd3d_shader_parser p; }; @@ -1427,7 +1430,7 @@ static void map_register(const struct vkd3d_shader_sm4_parser *sm4, struct vkd3d if (reg_idx >= ARRAY_SIZE(sm4->output_map)) { - ERR("Invalid output index %u.\n", reg_idx); + /* Validated later */ break; } @@ -1772,10 +1775,20 @@ static bool register_is_control_point_input(const struct vkd3d_shader_register * || priv->p.shader_version.type == VKD3D_SHADER_TYPE_GEOMETRY)); } +static unsigned int mask_from_swizzle(unsigned int swizzle) +{ + return (1u << vkd3d_swizzle_get_component(swizzle, 0)) + | (1u << vkd3d_swizzle_get_component(swizzle, 1)) + | (1u << vkd3d_swizzle_get_component(swizzle, 2)) + | (1u << vkd3d_swizzle_get_component(swizzle, 3)); +} + static bool shader_sm4_validate_input_output_register(struct vkd3d_shader_sm4_parser *priv, - const struct vkd3d_shader_register *reg) + const struct vkd3d_shader_register *reg, unsigned int mask) { unsigned int idx_count = 1 + register_is_control_point_input(reg, priv); + const unsigned int *masks; + unsigned int register_idx; if (reg->idx_count != idx_count) { @@ -1785,6 +1798,41 @@ static bool shader_sm4_validate_input_output_register(struct vkd3d_shader_sm4_pa return false; } + switch (reg->type) + { + case VKD3DSPR_INPUT: + case VKD3DSPR_INCONTROLPOINT: + masks = priv->input_register_masks; + break; + case VKD3DSPR_OUTPUT: + masks = (priv->phase == VKD3DSIH_HS_FORK_PHASE || priv->phase == VKD3DSIH_HS_JOIN_PHASE) + ? priv->patch_constant_register_masks + : priv->output_register_masks; + break; + case VKD3DSPR_COLOROUT: + case VKD3DSPR_OUTCONTROLPOINT: + masks = priv->output_register_masks; + break; + case VKD3DSPR_PATCHCONST: + masks = priv->patch_constant_register_masks; + break; + + default: + vkd3d_unreachable(); + } + + register_idx = reg->idx[reg->idx_count - 1].offset; + /* The signature element registers have already been checked against MAX_REG_OUTPUT. */ + if (register_idx >= MAX_REG_OUTPUT || (masks[register_idx] & mask) != mask) + { + WARN("Failed to find signature element for register type %#x, index %u and mask %#x.\n", + reg->type, register_idx, mask); + vkd3d_shader_parser_error(&priv->p, VKD3D_SHADER_ERROR_TPF_INVALID_IO_REGISTER, + "Could not find signature element matching register type %#x, index %u and mask %#x.", + reg->type, register_idx, mask); + return false; + } + return true; } @@ -1839,7 +1887,8 @@ static bool shader_sm4_read_src_param(struct vkd3d_shader_sm4_parser *priv, cons } } - if (register_is_input_output(&src_param->reg) && !shader_sm4_validate_input_output_register(priv, &src_param->reg)) + if (register_is_input_output(&src_param->reg) && !shader_sm4_validate_input_output_register(priv, + &src_param->reg, mask_from_swizzle(src_param->swizzle))) return false; return true; @@ -1879,7 +1928,8 @@ static bool shader_sm4_read_dst_param(struct vkd3d_shader_sm4_parser *priv, cons dst_param->modifiers = 0; dst_param->shift = 0; - if (register_is_input_output(&dst_param->reg) && !shader_sm4_validate_input_output_register(priv, &dst_param->reg)) + if (register_is_input_output(&dst_param->reg) && !shader_sm4_validate_input_output_register(priv, + &dst_param->reg, dst_param->write_mask)) return false; return true; @@ -2201,7 +2251,7 @@ static bool shader_sm4_init(struct vkd3d_shader_sm4_parser *sm4, const uint32_t } static bool shader_sm4_parser_validate_signature(struct vkd3d_shader_sm4_parser *sm4, - const struct shader_signature *signature, const char *name) + const struct shader_signature *signature, unsigned int *masks, const char *name) { unsigned int i, register_idx, register_count, mask; @@ -2225,6 +2275,9 @@ static bool shader_sm4_parser_validate_signature(struct vkd3d_shader_sm4_parser vkd3d_shader_parser_warning(&sm4->p, VKD3D_SHADER_WARNING_TPF_MASK_NOT_CONTIGUOUS, "%s signature element %u mask %#x is not contiguous.", name, i, mask); } + + if (register_idx != ~0u) + masks[register_idx] |= mask; } return true; @@ -2263,9 +2316,12 @@ int vkd3d_shader_sm4_parser_create(const struct vkd3d_shader_compile_info *compi return VKD3D_ERROR_INVALID_ARGUMENT; } - if (!shader_sm4_parser_validate_signature(sm4, &shader_desc->input_signature, "Input") - || !shader_sm4_parser_validate_signature(sm4, &shader_desc->output_signature, "Output") - || !shader_sm4_parser_validate_signature(sm4, &shader_desc->patch_constant_signature, "Patch constant")) + 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, + sm4->output_register_masks, "Output") + || !shader_sm4_parser_validate_signature(sm4, &shader_desc->patch_constant_signature, + sm4->patch_constant_register_masks, "Patch constant")) { shader_sm4_destroy(&sm4->p); return VKD3D_ERROR_INVALID_SHADER; diff --git a/libs/vkd3d-shader/vkd3d_shader_private.h b/libs/vkd3d-shader/vkd3d_shader_private.h index 6a8881eb..08c5b053 100644 --- a/libs/vkd3d-shader/vkd3d_shader_private.h +++ b/libs/vkd3d-shader/vkd3d_shader_private.h @@ -76,6 +76,7 @@ enum vkd3d_shader_error VKD3D_SHADER_ERROR_TPF_OUT_OF_MEMORY = 1002, VKD3D_SHADER_ERROR_TPF_INVALID_REGISTER_INDEX_COUNT = 1003, VKD3D_SHADER_ERROR_TPF_TOO_MANY_REGISTERS = 1004, + VKD3D_SHADER_ERROR_TPF_INVALID_IO_REGISTER = 1005, VKD3D_SHADER_WARNING_TPF_MASK_NOT_CONTIGUOUS = 1300,

1 0

Conor McCarthy : vkd3d-shader/tpf: Validate signature element register indices.
by Alexandre Julliard May 9, 2023

May 9, 2023

Module: vkd3d Branch: master Commit: b8e6482365ed95fc09204b7e58429b76112a027a URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/b8e6482365ed95fc09204b7e58429… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Wed May 3 17:17:24 2023 +1000 vkd3d-shader/tpf: Validate signature element register indices. --- libs/vkd3d-shader/tpf.c | 31 +++++++++++++++++++++++++++++++ libs/vkd3d-shader/vkd3d_shader_private.h | 1 + 2 files changed, 32 insertions(+) diff --git a/libs/vkd3d-shader/tpf.c b/libs/vkd3d-shader/tpf.c index 33a00875..143df771 100644 --- a/libs/vkd3d-shader/tpf.c +++ b/libs/vkd3d-shader/tpf.c @@ -2200,6 +2200,29 @@ static bool shader_sm4_init(struct vkd3d_shader_sm4_parser *sm4, const uint32_t return true; } +static bool shader_sm4_parser_validate_signature(struct vkd3d_shader_sm4_parser *sm4, + const struct shader_signature *signature, const char *name) +{ + unsigned int i, register_idx, register_count; + + for (i = 0; i < signature->element_count; ++i) + { + register_idx = signature->elements[i].register_index; + register_count = signature->elements[i].register_count; + if (register_idx != ~0u && (register_idx >= MAX_REG_OUTPUT || MAX_REG_OUTPUT - register_idx < register_count)) + { + WARN("%s signature element %u unhandled register index %u, count %u.\n", + name, i, register_idx, register_count); + vkd3d_shader_parser_error(&sm4->p, VKD3D_SHADER_ERROR_TPF_TOO_MANY_REGISTERS, + "%s signature element %u register index %u, count %u exceeds maximum index of %u.", name, + i, register_idx, register_count, MAX_REG_OUTPUT - 1); + return false; + } + } + + return true; +} + int vkd3d_shader_sm4_parser_create(const struct vkd3d_shader_compile_info *compile_info, struct vkd3d_shader_message_context *message_context, struct vkd3d_shader_parser **parser) { @@ -2233,6 +2256,14 @@ int vkd3d_shader_sm4_parser_create(const struct vkd3d_shader_compile_info *compi return VKD3D_ERROR_INVALID_ARGUMENT; } + if (!shader_sm4_parser_validate_signature(sm4, &shader_desc->input_signature, "Input") + || !shader_sm4_parser_validate_signature(sm4, &shader_desc->output_signature, "Output") + || !shader_sm4_parser_validate_signature(sm4, &shader_desc->patch_constant_signature, "Patch constant")) + { + shader_sm4_destroy(&sm4->p); + return VKD3D_ERROR_INVALID_SHADER; + } + instructions = &sm4->p.instructions; while (sm4->ptr != sm4->end) { diff --git a/libs/vkd3d-shader/vkd3d_shader_private.h b/libs/vkd3d-shader/vkd3d_shader_private.h index f5c88d66..180aecc1 100644 --- a/libs/vkd3d-shader/vkd3d_shader_private.h +++ b/libs/vkd3d-shader/vkd3d_shader_private.h @@ -75,6 +75,7 @@ enum vkd3d_shader_error VKD3D_SHADER_ERROR_TPF_INVALID_REGISTER_RANGE = 1001, VKD3D_SHADER_ERROR_TPF_OUT_OF_MEMORY = 1002, VKD3D_SHADER_ERROR_TPF_INVALID_REGISTER_INDEX_COUNT = 1003, + VKD3D_SHADER_ERROR_TPF_TOO_MANY_REGISTERS = 1004, VKD3D_SHADER_ERROR_SPV_DESCRIPTOR_BINDING_NOT_FOUND = 2000, VKD3D_SHADER_ERROR_SPV_INVALID_REGISTER_TYPE = 2001,

1 0

Conor McCarthy : vkd3d-shader/tpf: Validate signature element masks.
by Alexandre Julliard May 9, 2023

May 9, 2023

Module: vkd3d Branch: master Commit: 2166088b0b63dc33dd028954ad67ce68ed2a5aa5 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/2166088b0b63dc33dd028954ad67c… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Wed May 3 17:19:32 2023 +1000 vkd3d-shader/tpf: Validate signature element masks. --- libs/vkd3d-shader/tpf.c | 9 ++++++++- libs/vkd3d-shader/vkd3d_shader_private.h | 2 ++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/libs/vkd3d-shader/tpf.c b/libs/vkd3d-shader/tpf.c index 143df771..77fea973 100644 --- a/libs/vkd3d-shader/tpf.c +++ b/libs/vkd3d-shader/tpf.c @@ -2203,7 +2203,7 @@ static bool shader_sm4_init(struct vkd3d_shader_sm4_parser *sm4, const uint32_t static bool shader_sm4_parser_validate_signature(struct vkd3d_shader_sm4_parser *sm4, const struct shader_signature *signature, const char *name) { - unsigned int i, register_idx, register_count; + unsigned int i, register_idx, register_count, mask; for (i = 0; i < signature->element_count; ++i) { @@ -2218,6 +2218,13 @@ static bool shader_sm4_parser_validate_signature(struct vkd3d_shader_sm4_parser i, register_idx, register_count, MAX_REG_OUTPUT - 1); return false; } + + if (!vkd3d_bitmask_is_contiguous(mask = signature->elements[i].mask)) + { + WARN("%s signature element %u mask %#x is not contiguous.\n", name, i, mask); + vkd3d_shader_parser_warning(&sm4->p, VKD3D_SHADER_WARNING_TPF_MASK_NOT_CONTIGUOUS, + "%s signature element %u mask %#x is not contiguous.", name, i, mask); + } } return true; diff --git a/libs/vkd3d-shader/vkd3d_shader_private.h b/libs/vkd3d-shader/vkd3d_shader_private.h index 180aecc1..6a8881eb 100644 --- a/libs/vkd3d-shader/vkd3d_shader_private.h +++ b/libs/vkd3d-shader/vkd3d_shader_private.h @@ -77,6 +77,8 @@ enum vkd3d_shader_error VKD3D_SHADER_ERROR_TPF_INVALID_REGISTER_INDEX_COUNT = 1003, VKD3D_SHADER_ERROR_TPF_TOO_MANY_REGISTERS = 1004, + VKD3D_SHADER_WARNING_TPF_MASK_NOT_CONTIGUOUS = 1300, + VKD3D_SHADER_ERROR_SPV_DESCRIPTOR_BINDING_NOT_FOUND = 2000, VKD3D_SHADER_ERROR_SPV_INVALID_REGISTER_TYPE = 2001, VKD3D_SHADER_ERROR_SPV_INVALID_DESCRIPTOR_BINDING = 2002,

1 0

Conor McCarthy : vkd3d-shader/tpf: Validate input/output register index counts.
by Alexandre Julliard May 9, 2023

May 9, 2023

Module: vkd3d Branch: master Commit: adf7db021c5c00b6e405123ecfc56db6e7f44583 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/adf7db021c5c00b6e405123ecfc56… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Wed May 3 17:10:37 2023 +1000 vkd3d-shader/tpf: Validate input/output register index counts. --- libs/vkd3d-shader/d3dbc.c | 3 ++ libs/vkd3d-shader/ir.c | 41 +++++++++--------------- libs/vkd3d-shader/tpf.c | 55 ++++++++++++++++++++++++++++++++ libs/vkd3d-shader/vkd3d_shader_private.h | 2 ++ 4 files changed, 75 insertions(+), 26 deletions(-)

1 0

Zebediah Figura : vkd3d-shader/hlsl: Lex invalid characters in #line directives.
by Alexandre Julliard May 9, 2023

May 9, 2023

Module: vkd3d Branch: master Commit: 600fdcd112d9f74ca79ebd9f74174d49bda0f1f7 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/600fdcd112d9f74ca79ebd9f74174… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon May 8 12:56:36 2023 -0500 vkd3d-shader/hlsl: Lex invalid characters in #line directives. Avoid letting them fall through to the default rule. --- libs/vkd3d-shader/hlsl.l | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/libs/vkd3d-shader/hlsl.l b/libs/vkd3d-shader/hlsl.l index 10751bbe..8a7cd234 100644 --- a/libs/vkd3d-shader/hlsl.l +++ b/libs/vkd3d-shader/hlsl.l @@ -266,6 +266,10 @@ row_major {return KW_ROW_MAJOR; } return STRING; } <pp_line>{WS}+ {} +<pp_line>{ANY} { + FIXME("Malformed preprocessor line directive?\n"); + BEGIN(INITIAL); + } <pp_line>{NEWLINE} { FIXME("Malformed preprocessor line directive?\n"); BEGIN(INITIAL);

1 0

Zebediah Figura : vkd3d-shader/preproc: Use %option nodefault in the lexer.
by Alexandre Julliard May 9, 2023

May 9, 2023

Module: vkd3d Branch: master Commit: 7b8845474d82424c348344c06fd8e57187d5269c URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/7b8845474d82424c348344c06fd8e… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon May 8 12:57:22 2023 -0500 vkd3d-shader/preproc: Use %option nodefault in the lexer. --- libs/vkd3d-shader/preproc.l | 1 + 1 file changed, 1 insertion(+) diff --git a/libs/vkd3d-shader/preproc.l b/libs/vkd3d-shader/preproc.l index a54e47bc..8e35e355 100644 --- a/libs/vkd3d-shader/preproc.l +++ b/libs/vkd3d-shader/preproc.l @@ -40,6 +40,7 @@ static void update_location(struct preproc_ctx *ctx); %option bison-locations %option extra-type="struct preproc_ctx *" %option never-interactive +%option nodefault %option noinput %option nounput %option noyy_top_state

1 0

Zebediah Figura : vkd3d-shader/hlsl: Use %option nodefault in the lexer.
by Alexandre Julliard May 9, 2023

May 9, 2023

Module: vkd3d Branch: master Commit: b1bc4044aed793ff8a5b955faf456673f5faf1a1 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/b1bc4044aed793ff8a5b955faf456… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon May 8 12:57:14 2023 -0500 vkd3d-shader/hlsl: Use %option nodefault in the lexer. --- libs/vkd3d-shader/hlsl.l | 1 + 1 file changed, 1 insertion(+) diff --git a/libs/vkd3d-shader/hlsl.l b/libs/vkd3d-shader/hlsl.l index 8a7cd234..6c2324c7 100644 --- a/libs/vkd3d-shader/hlsl.l +++ b/libs/vkd3d-shader/hlsl.l @@ -37,6 +37,7 @@ static void update_location(struct hlsl_ctx *ctx, YYLTYPE *loc); %option bison-locations %option extra-type="struct hlsl_ctx *" %option never-interactive +%option nodefault %option noinput %option nounput %option noyywrap

1 0

Zebediah Figura : vkd3d-shader/preproc: Ignore newlines in C comments.
by Alexandre Julliard May 9, 2023

May 9, 2023

Module: vkd3d Branch: master Commit: 871cf0b4b503b0e85263a86b7b1c2dd3c8fad711 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/871cf0b4b503b0e85263a86b7b1c2… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon May 8 13:06:31 2023 -0500 vkd3d-shader/preproc: Ignore newlines in C comments. Avoid letting them fall through to the default rule. --- libs/vkd3d-shader/preproc.l | 1 + 1 file changed, 1 insertion(+) diff --git a/libs/vkd3d-shader/preproc.l b/libs/vkd3d-shader/preproc.l index be4a0598..a54e47bc 100644 --- a/libs/vkd3d-shader/preproc.l +++ b/libs/vkd3d-shader/preproc.l @@ -74,6 +74,7 @@ INT_SUFFIX [uUlL]{0,2} <C_COMMENT>"*/" {yy_pop_state(yyscanner);} <C_COMMENT,CXX_COMMENT><<EOF>> {yy_pop_state(yyscanner);} <C_COMMENT,CXX_COMMENT>. {} +<C_COMMENT>\n {} <ERROR>(\\{NEWLINE}|[^\n])* {return T_STRING;}

1 0

Zebediah Figura : vkd3d-shader/preproc: Lex whitespace and invalid characters in #include and #line directives.
by Alexandre Julliard May 9, 2023

May 9, 2023

Module: vkd3d Branch: master Commit: ddbfd88e74e1e80a3bf56c2e5b55a2bd7c53d92c URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/ddbfd88e74e1e80a3bf56c2e5b55a… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon May 8 12:52:10 2023 -0500 vkd3d-shader/preproc: Lex whitespace and invalid characters in #include and #line directives. Avoid letting them fall through to the default rule. A syntax error will be emitted by the parser. --- libs/vkd3d-shader/preproc.l | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libs/vkd3d-shader/preproc.l b/libs/vkd3d-shader/preproc.l index 7686e018..be4a0598 100644 --- a/libs/vkd3d-shader/preproc.l +++ b/libs/vkd3d-shader/preproc.l @@ -175,9 +175,9 @@ INT_SUFFIX [uUlL]{0,2} return T_NEWLINE; } -<INITIAL>{WS}+ {} +<INITIAL,INCLUDE,LINE>{WS}+ {} <INITIAL>[-()\[\]{},+!*/<>&|^?:] {return yytext[0];} -<INITIAL>. {return T_TEXT;} +<INITIAL,INCLUDE,LINE>. {return T_TEXT;} %%

1 0