January 2024 - Wine-commits

Giovanni Mascellani : vkd3d-shader/ir: Check that SSA registers are used validly.
by Alexandre Julliard 15 Jan '24

15 Jan '24

Module: vkd3d Branch: master Commit: b0c8a47f9d915c9fc0a7b821a9061d250dc092e2 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/b0c8a47f9d915c9fc0a7b821a9061… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Wed Jan 10 11:58:44 2024 +0100 vkd3d-shader/ir: Check that SSA registers are used validly. Specifically, they are assigned only once and only assigned components are used. Right now we don't check that the assignment dominates all usages. --- libs/vkd3d-shader/ir.c | 55 ++++++++++++++++++++++++++++++-- libs/vkd3d-shader/vkd3d_shader_private.h | 1 + 2 files changed, 54 insertions(+), 2 deletions(-) diff --git a/libs/vkd3d-shader/ir.c b/libs/vkd3d-shader/ir.c index af86c0b9..28c7d158 100644 --- a/libs/vkd3d-shader/ir.c +++ b/libs/vkd3d-shader/ir.c @@ -1523,6 +1523,7 @@ struct validation_context { struct vkd3d_shader_parser *parser; size_t instruction_idx; + bool invalid_instruction_idx; bool dcl_temps_found; unsigned int temp_count; enum vkd3d_shader_opcode phase; @@ -1537,6 +1538,9 @@ struct validation_context { enum vsir_dimension dimension; size_t first_seen; + uint32_t write_mask; + uint32_t read_mask; + size_t first_assigned; } *ssas; enum vkd3d_shader_opcode *blocks; @@ -1556,8 +1560,16 @@ static void VKD3D_PRINTF_FUNC(3, 4) validator_error(struct validation_context *c vkd3d_string_buffer_vprintf(&buf, format, args); 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); + if (ctx->invalid_instruction_idx) + { + vkd3d_shader_parser_error(ctx->parser, error, "%s", buf.buffer); + ERR("VSIR validation error: %s\n", buf.buffer); + } + else + { + 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); } @@ -1771,6 +1783,23 @@ static void vsir_validate_dst_param(struct validation_context *ctx, validator_error(ctx, VKD3D_SHADER_ERROR_VSIR_INVALID_SHIFT, "Destination has invalid shift %#x.", dst->shift); } + + if (dst->reg.type == VKD3DSPR_SSA && dst->reg.idx[0].offset < ctx->parser->shader_desc.ssa_count) + { + struct validation_context_ssa_data *data = &ctx->ssas[dst->reg.idx[0].offset]; + + if (data->write_mask == 0) + { + data->write_mask = dst->write_mask; + data->first_assigned = ctx->instruction_idx; + } + else + { + validator_error(ctx, VKD3D_SHADER_ERROR_VSIR_INVALID_SSA_USAGE, + "SSA register is already assigned at instruction %zu.", + data->first_assigned); + } + } } static void vsir_validate_src_param(struct validation_context *ctx, @@ -1789,6 +1818,15 @@ static void vsir_validate_src_param(struct validation_context *ctx, if (src->modifiers >= VKD3DSPSM_COUNT) validator_error(ctx, VKD3D_SHADER_ERROR_VSIR_INVALID_MODIFIERS, "Source has invalid modifiers %#x.", src->modifiers); + + if (src->reg.type == VKD3DSPR_SSA && src->reg.idx[0].offset < ctx->parser->shader_desc.ssa_count) + { + struct validation_context_ssa_data *data = &ctx->ssas[src->reg.idx[0].offset]; + unsigned int i; + + for (i = 0; i < VKD3D_VEC4_SIZE; ++i) + data->read_mask |= (1u << vsir_swizzle_get_component(src->swizzle, i)); + } } static void vsir_validate_dst_count(struct validation_context *ctx, @@ -1967,6 +2005,7 @@ enum vkd3d_result vsir_validate(struct vkd3d_shader_parser *parser) .parser = parser, .phase = VKD3DSIH_INVALID, }; + unsigned int i; if (!(parser->config_flags & VKD3D_SHADER_CONFIG_FLAG_FORCE_VALIDATION)) return VKD3D_OK; @@ -1980,9 +2019,21 @@ enum vkd3d_result 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); + ctx.invalid_instruction_idx = true; + if (ctx.depth != 0) validator_error(&ctx, VKD3D_SHADER_ERROR_VSIR_INVALID_INSTRUCTION_NESTING, "%zu nested blocks were not closed.", ctx.depth); + for (i = 0; i < parser->shader_desc.ssa_count; ++i) + { + struct validation_context_ssa_data *data = &ctx.ssas[i]; + + if ((data->write_mask | data->read_mask) != data->write_mask) + validator_error(&ctx, VKD3D_SHADER_ERROR_VSIR_INVALID_SSA_USAGE, + "SSA register %u has invalid read mask %#x, which is not a subset of the write mask %#x " + "at the point of definition.", i, data->read_mask, data->write_mask); + } + vkd3d_free(ctx.blocks); vkd3d_free(ctx.temps); vkd3d_free(ctx.ssas); diff --git a/libs/vkd3d-shader/vkd3d_shader_private.h b/libs/vkd3d-shader/vkd3d_shader_private.h index a1d9a786..b85441ae 100644 --- a/libs/vkd3d-shader/vkd3d_shader_private.h +++ b/libs/vkd3d-shader/vkd3d_shader_private.h @@ -216,6 +216,7 @@ enum vkd3d_shader_error VKD3D_SHADER_ERROR_VSIR_INVALID_DCL_TEMPS = 9014, VKD3D_SHADER_ERROR_VSIR_INVALID_INDEX = 9015, VKD3D_SHADER_ERROR_VSIR_INVALID_INSTRUCTION_NESTING = 9016, + VKD3D_SHADER_ERROR_VSIR_INVALID_SSA_USAGE = 9017, VKD3D_SHADER_WARNING_VSIR_DYNAMIC_DESCRIPTOR_ARRAY = 9300, };

1 0

Francisco Casas : vkd3d-shader/hlsl: Emit fixmes on non-constant vector addressing.
by Alexandre Julliard 15 Jan '24

15 Jan '24

Module: vkd3d Branch: master Commit: 43ff28b00b2be949cb9f5cb31d28a73a4648dde2 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/43ff28b00b2be949cb9f5cb31d28a… Author: Francisco Casas <fcasas(a)codeweavers.com> Date: Thu Jan 11 16:54:20 2024 -0300 vkd3d-shader/hlsl: Emit fixmes on non-constant vector addressing. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=56162 Storing to a vector component using a non-constant index is not allowed on profiles lower than 6.0. Unless this happens inside a loop that can be unrolled, which we are not doing yet. For this reason, a validate_nonconstant_vector_store_derefs pass is added to detect these cases. Ideally we would want to emit an hlsl_error on this pass, but before implementing loop unrolling, we could reach this point on valid HLSL. Also, as pointed out by Nikolay in the mentioned bug, currently new_offset_from_path_index() fails an assertion when this happens, because it expects an hlsl_ir_constant, so a check is added. It also felt correct to emit an hlsl_fixme there, despite the redundancy. --- libs/vkd3d-shader/hlsl_codegen.c | 39 ++++++++++++++++++++++++++++++++++ tests/hlsl/vector-indexing.shader_test | 13 ++++++++++++ 2 files changed, 52 insertions(+) diff --git a/libs/vkd3d-shader/hlsl_codegen.c b/libs/vkd3d-shader/hlsl_codegen.c index acc19dd8..d37bef15 100644 --- a/libs/vkd3d-shader/hlsl_codegen.c +++ b/libs/vkd3d-shader/hlsl_codegen.c @@ -32,6 +32,11 @@ static struct hlsl_ir_node *new_offset_from_path_index(struct hlsl_ctx *ctx, str switch (type->class) { case HLSL_CLASS_VECTOR: + if (idx->type != HLSL_IR_CONSTANT) + { + hlsl_fixme(ctx, &idx->loc, "Non-constant vector addressing."); + break; + } *offset_component += hlsl_ir_constant(idx)->value.u[0].u; break; @@ -2478,6 +2483,38 @@ static bool lower_nonconstant_vector_derefs(struct hlsl_ctx *ctx, struct hlsl_ir return false; } +static bool validate_nonconstant_vector_store_derefs(struct hlsl_ctx *ctx, struct hlsl_ir_node *instr, struct hlsl_block *block) +{ + struct hlsl_ir_node *idx; + struct hlsl_deref *deref; + struct hlsl_type *type; + unsigned int i; + + if (instr->type != HLSL_IR_STORE) + return false; + + deref = &hlsl_ir_store(instr)->lhs; + assert(deref->var); + + if (deref->path_len == 0) + return false; + + type = deref->var->data_type; + for (i = 0; i < deref->path_len - 1; ++i) + type = hlsl_get_element_type_from_path_index(ctx, type, deref->path[i].node); + + idx = deref->path[deref->path_len - 1].node; + + if (type->class == HLSL_CLASS_VECTOR && idx->type != HLSL_IR_CONSTANT) + { + /* We should turn this into an hlsl_error after we implement unrolling, because if we get + * here after that, it means that the HLSL is invalid. */ + hlsl_fixme(ctx, &instr->loc, "Non-constant vector addressing on store. Unrolling may be missing."); + } + + return false; +} + /* Lower combined samples and sampler variables to synthesized separated textures and samplers. * That is, translate SM1-style samples in the source to SM4-style samples in the bytecode. */ static bool lower_combined_samples(struct hlsl_ctx *ctx, struct hlsl_ir_node *instr, void *context) @@ -4969,6 +5006,8 @@ int hlsl_emit_bytecode(struct hlsl_ctx *ctx, struct hlsl_ir_function_decl *entry lower_ir(ctx, lower_abs, body); } + lower_ir(ctx, validate_nonconstant_vector_store_derefs, body); + /* TODO: move forward, remove when no longer needed */ transform_derefs(ctx, replace_deref_path_with_offset, body); while (hlsl_transform_ir(ctx, hlsl_fold_constant_exprs, body, NULL)); diff --git a/tests/hlsl/vector-indexing.shader_test b/tests/hlsl/vector-indexing.shader_test index 9f6f9a2c..446b2d0e 100644 --- a/tests/hlsl/vector-indexing.shader_test +++ b/tests/hlsl/vector-indexing.shader_test @@ -49,3 +49,16 @@ float4 main() : SV_TARGET [test] draw quad probe all rgba (2.0, 2.0, 2.0, 2.0) + + +[pixel shader fail(sm<6) todo] +float4 v; +float i; + +float4 main() : sv_target +{ + float4 p = v; + p[i] = 2.0; + + return 0; +}

1 0

Nikolay Sivov : vkd3d-shader/hlsl: Rename the rule for an optional name.
by Alexandre Julliard 15 Jan '24

15 Jan '24

Module: vkd3d Branch: master Commit: 0a6d842ed1890a2da75febbb0f1881e0ab44662e URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/0a6d842ed1890a2da75febbb0f188… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Nov 11 00:32:40 2023 +0100 vkd3d-shader/hlsl: Rename the rule for an optional name. Names are optional for both techniques and passes. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- libs/vkd3d-shader/hlsl.y | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index 7424e63a..7c77f0e8 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -5102,7 +5102,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 <name> name_opt %type <parameter> parameter @@ -5148,7 +5148,7 @@ hlsl_prog: | hlsl_prog effect_group | hlsl_prog ';' -technique_name: +name_opt: %empty { $$ = NULL; @@ -5159,14 +5159,14 @@ pass_list: %empty technique9: - KW_TECHNIQUE technique_name '{' pass_list '}' + KW_TECHNIQUE name_opt '{' pass_list '}' { if (!add_technique(ctx, $2, "technique", &@1)) YYABORT; } technique10: - KW_TECHNIQUE10 technique_name '{' pass_list '}' + KW_TECHNIQUE10 name_opt '{' 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, @@ -5177,7 +5177,7 @@ technique10: } technique11: - KW_TECHNIQUE11 technique_name '{' pass_list '}' + KW_TECHNIQUE11 name_opt '{' 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,

1 0

Nikolay Sivov : vkd3d-shader/hlsl: Add a scope for technique variables.
by Alexandre Julliard 15 Jan '24

15 Jan '24

Module: vkd3d Branch: master Commit: e1dca9b27af5cff736f61ae9097fe5b71f875312 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/e1dca9b27af5cff736f61ae9097fe… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Nov 11 01:02:11 2023 +0100 vkd3d-shader/hlsl: Add a scope for technique variables. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- libs/vkd3d-shader/hlsl.y | 36 +++++++++++++++++++++++++++--------- 1 file changed, 27 insertions(+), 9 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index 7c77f0e8..b11cbde2 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -1096,8 +1096,8 @@ static bool add_func_parameter(struct hlsl_ctx *ctx, struct hlsl_func_parameters return true; } -static bool add_technique(struct hlsl_ctx *ctx, const char *name, const char *typename, - const struct vkd3d_shader_location *loc) +static bool add_technique(struct hlsl_ctx *ctx, const char *name, struct hlsl_scope *scope, + const char *typename, const struct vkd3d_shader_location *loc) { struct hlsl_ir_var *var; struct hlsl_type *type; @@ -1105,6 +1105,7 @@ static bool add_technique(struct hlsl_ctx *ctx, const char *name, const char *ty type = hlsl_get_type(ctx->globals, typename, false, false); if (!(var = hlsl_new_var(ctx, name, type, loc, NULL, 0, NULL))) return false; + var->scope = scope; if (!hlsl_add_var(ctx, var, false)) { @@ -5155,35 +5156,52 @@ name_opt: } | any_identifier +pass: + KW_PASS name_opt '{' '}' + pass_list: - %empty + pass + | pass_list pass + +passes: + scope_start + | scope_start pass_list technique9: - KW_TECHNIQUE name_opt '{' pass_list '}' + KW_TECHNIQUE name_opt '{' passes '}' { - if (!add_technique(ctx, $2, "technique", &@1)) + struct hlsl_scope *scope = ctx->cur_scope; + hlsl_pop_scope(ctx); + + if (!add_technique(ctx, $2, scope, "technique", &@1)) YYABORT; } technique10: - KW_TECHNIQUE10 name_opt '{' pass_list '}' + KW_TECHNIQUE10 name_opt '{' passes '}' { + struct hlsl_scope *scope = ctx->cur_scope; + hlsl_pop_scope(ctx); + 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."); - if (!add_technique(ctx, $2, "technique10", &@1)) + if (!add_technique(ctx, $2, scope, "technique10", &@1)) YYABORT; } technique11: - KW_TECHNIQUE11 name_opt '{' pass_list '}' + KW_TECHNIQUE11 name_opt '{' passes '}' { + struct hlsl_scope *scope = ctx->cur_scope; + hlsl_pop_scope(ctx); + 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."); - if (!add_technique(ctx, $2, "technique11", &@1)) + if (!add_technique(ctx, $2, scope, "technique11", &@1)) YYABORT; }

1 0

Nikolay Sivov : vkd3d-shader/fx: Write empty passes blocks.
by Alexandre Julliard 15 Jan '24

15 Jan '24

Module: vkd3d Branch: master Commit: 8014c11e8806710b78e1d5a374a9a40aed4f0f75 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/8014c11e8806710b78e1d5a374a9a… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Nov 11 01:14:03 2023 +0100 vkd3d-shader/fx: Write empty passes blocks. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- libs/vkd3d-shader/fx.c | 25 ++++++++++++++++++++++--- 1 file changed, 22 insertions(+), 3 deletions(-) diff --git a/libs/vkd3d-shader/fx.c b/libs/vkd3d-shader/fx.c index 6c4c1203..ca6bb7a8 100644 --- a/libs/vkd3d-shader/fx.c +++ b/libs/vkd3d-shader/fx.c @@ -35,17 +35,36 @@ static uint32_t fx_put_raw_string(struct fx_write_context *fx, const char *strin return string ? put_string(&fx->unstructured, string) : 0; } -static void write_technique(struct hlsl_ir_var *var, struct fx_write_context *fx) +static void write_pass(struct hlsl_ir_var *var, struct fx_write_context *fx) { struct vkd3d_bytecode_buffer *buffer = &fx->structured; uint32_t name_offset; name_offset = fx_put_raw_string(fx, var->name); put_u32(buffer, name_offset); - put_u32(buffer, 0); /* Pass count. */ put_u32(buffer, 0); /* Annotation count. */ + put_u32(buffer, 0); /* Assignment count. */ +} + +static void write_technique(struct hlsl_ir_var *var, struct fx_write_context *fx) +{ + struct vkd3d_bytecode_buffer *buffer = &fx->structured; + uint32_t name_offset, count = 0; + struct hlsl_ir_var *pass; + uint32_t count_offset; + + name_offset = fx_put_raw_string(fx, var->name); + put_u32(buffer, name_offset); + count_offset = put_u32(buffer, 0); + put_u32(buffer, 0); /* Annotation count. */ + + LIST_FOR_EACH_ENTRY(pass, &var->scope->vars, struct hlsl_ir_var, scope_entry) + { + write_pass(pass, fx); + ++count; + } - /* TODO: passes */ + set_u32(buffer, count_offset, count); } static void set_status(struct fx_write_context *fx, int status)

1 0

Nikolay Sivov : vkd3d-shader/fx: Initial support for fx_5_0 output.
by Alexandre Julliard 15 Jan '24

15 Jan '24

Module: vkd3d Branch: master Commit: e7d65d39bae14a1606bad65c12e846a3a2e4132c URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/e7d65d39bae14a1606bad65c12e84… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Jan 12 14:26:39 2024 +0100 vkd3d-shader/fx: Initial support for fx_5_0 output. --- libs/vkd3d-shader/fx.c | 148 +++++++++++++++++++++++++++++++++- tests/hlsl/technique-fx_5.shader_test | 12 +-- 2 files changed, 151 insertions(+), 9 deletions(-) diff --git a/libs/vkd3d-shader/fx.c b/libs/vkd3d-shader/fx.c index ca6bb7a8..97ea924c 100644 --- a/libs/vkd3d-shader/fx.c +++ b/libs/vkd3d-shader/fx.c @@ -25,10 +25,47 @@ struct fx_write_context struct vkd3d_bytecode_buffer unstructured; struct vkd3d_bytecode_buffer structured; + unsigned int min_technique_version; + unsigned int max_technique_version; + uint32_t technique_count; + uint32_t group_count; int status; }; +static void fx_write_context_init(const struct hlsl_ctx *ctx, struct fx_write_context *fx) +{ + unsigned int version = ctx->profile->major_version; + + memset(fx, 0, sizeof(*fx)); + + if (version == 2) + { + fx->min_technique_version = 9; + fx->max_technique_version = 9; + } + else if (version == 4) + { + fx->min_technique_version = 10; + fx->max_technique_version = 10; + } + else if (version == 5) + { + fx->min_technique_version = 10; + fx->max_technique_version = 11; + } +} + +static bool technique_matches_version(const struct hlsl_ir_var *var, const struct fx_write_context *fx) +{ + const struct hlsl_type *type = var->data_type; + + if (type->base_type != HLSL_TYPE_TECHNIQUE) + return false; + + return type->e.version >= fx->min_technique_version && type->e.version <= fx->max_technique_version; +} + static uint32_t fx_put_raw_string(struct fx_write_context *fx, const char *string) { /* NULLs are emitted as empty strings using the same 4 bytes at the start of the section. */ @@ -94,13 +131,55 @@ static void write_techniques(struct hlsl_scope *scope, struct fx_write_context * set_status(fx, fx->structured.status); } +static void write_group(struct hlsl_scope *scope, const char *name, struct fx_write_context *fx) +{ + struct vkd3d_bytecode_buffer *buffer = &fx->structured; + uint32_t name_offset = fx_put_raw_string(fx, name); + uint32_t count_offset, count; + + put_u32(buffer, name_offset); + count_offset = put_u32(buffer, 0); /* Technique count */ + put_u32(buffer, 0); /* Annotation count */ + + count = fx->technique_count; + write_techniques(scope, fx); + set_u32(buffer, count_offset, fx->technique_count - count); + + ++fx->group_count; +} + +static void write_groups(struct hlsl_scope *scope, struct fx_write_context *fx) +{ + bool needs_default_group = false; + struct hlsl_ir_var *var; + + LIST_FOR_EACH_ENTRY(var, &scope->vars, struct hlsl_ir_var, scope_entry) + { + if (technique_matches_version(var, fx)) + { + needs_default_group = true; + break; + } + } + + if (needs_default_group) + write_group(scope, NULL, fx); + LIST_FOR_EACH_ENTRY(var, &scope->vars, struct hlsl_ir_var, scope_entry) + { + const struct hlsl_type *type = var->data_type; + + if (type->base_type == HLSL_TYPE_EFFECT_GROUP) + write_group(var->scope, var->name, fx); + } +} + static int hlsl_fx_4_write(struct hlsl_ctx *ctx, struct vkd3d_shader_code *out) { struct vkd3d_bytecode_buffer buffer = { 0 }; struct fx_write_context fx; uint32_t size_offset, size; - memset(&fx, 0, sizeof(fx)); + fx_write_context_init(ctx, &fx); put_u32(&fx.unstructured, 0); /* Empty string placeholder. */ @@ -154,6 +233,70 @@ static int hlsl_fx_4_write(struct hlsl_ctx *ctx, struct vkd3d_shader_code *out) return fx.status; } +static int hlsl_fx_5_write(struct hlsl_ctx *ctx, struct vkd3d_shader_code *out) +{ + struct vkd3d_bytecode_buffer buffer = { 0 }; + struct fx_write_context fx; + uint32_t size_offset, size; + + fx_write_context_init(ctx, &fx); + + put_u32(&fx.unstructured, 0); /* Empty string placeholder. */ + + /* TODO: buffers */ + /* TODO: objects */ + /* TODO: interface variables */ + + write_groups(ctx->globals, &fx); + + put_u32(&buffer, 0xfeff2001); /* Version. */ + put_u32(&buffer, 0); /* Buffer count. */ + put_u32(&buffer, 0); /* Variable count. */ + put_u32(&buffer, 0); /* Object count. */ + put_u32(&buffer, 0); /* Pool buffer count. */ + put_u32(&buffer, 0); /* Pool variable count. */ + put_u32(&buffer, 0); /* Pool object count. */ + put_u32(&buffer, fx.technique_count); + size_offset = put_u32(&buffer, 0); /* Unstructured size. */ + put_u32(&buffer, 0); /* String count. */ + put_u32(&buffer, 0); /* Texture object count. */ + put_u32(&buffer, 0); /* Depth stencil state count. */ + put_u32(&buffer, 0); /* Blend state count. */ + put_u32(&buffer, 0); /* Rasterizer state count. */ + put_u32(&buffer, 0); /* Sampler state count. */ + put_u32(&buffer, 0); /* Rendertarget view count. */ + put_u32(&buffer, 0); /* Depth stencil view count. */ + put_u32(&buffer, 0); /* Shader count. */ + put_u32(&buffer, 0); /* Inline shader count. */ + put_u32(&buffer, fx.group_count); /* Group count. */ + put_u32(&buffer, 0); /* UAV count. */ + put_u32(&buffer, 0); /* Interface variables count. */ + put_u32(&buffer, 0); /* Interface variable element count. */ + put_u32(&buffer, 0); /* Class instance elements count. */ + + size = align(fx.unstructured.size, 4); + set_u32(&buffer, size_offset, size); + + bytecode_put_bytes(&buffer, fx.unstructured.data, fx.unstructured.size); + bytecode_put_bytes(&buffer, fx.structured.data, fx.structured.size); + + vkd3d_free(fx.unstructured.data); + vkd3d_free(fx.structured.data); + + set_status(&fx, buffer.status); + + if (!fx.status) + { + out->code = buffer.data; + out->size = buffer.size; + } + + if (fx.status < 0) + ctx->result = fx.status; + + return fx.status; +} + int hlsl_emit_effect_binary(struct hlsl_ctx *ctx, struct vkd3d_shader_code *out) { if (ctx->profile->major_version == 2) @@ -167,8 +310,7 @@ int hlsl_emit_effect_binary(struct hlsl_ctx *ctx, struct vkd3d_shader_code *out) } else if (ctx->profile->major_version == 5) { - hlsl_fixme(ctx, &ctx->location, "Writing fx_5_0 binaries is not implemented."); - return VKD3D_ERROR_NOT_IMPLEMENTED; + return hlsl_fx_5_write(ctx, out); } else { diff --git a/tests/hlsl/technique-fx_5.shader_test b/tests/hlsl/technique-fx_5.shader_test index 0ef88cd0..c1e37ff1 100644 --- a/tests/hlsl/technique-fx_5.shader_test +++ b/tests/hlsl/technique-fx_5.shader_test @@ -37,7 +37,7 @@ float4 main() : sv_target return fxGroup; } -[effect todo] +[effect] technique { } @@ -47,11 +47,11 @@ technique10 } % Effects without techniques are allowed for fx_5_0 -[effect todo] +[effect] float4 f; % fx_2_0 keyword is allowed with fx_5_0 profiles -[effect todo] +[effect] technique { } @@ -90,10 +90,10 @@ float4 technique10; [effect fail] float4 technique11; -[effect todo] +[effect] float4 technIque10; -[effect todo] +[effect] float4 technIque11; % Regular shaders with technique blocks @@ -174,7 +174,7 @@ fxgroup group } % Group provides scope for techniques -[effect todo] +[effect] fxgroup group1 { technique11 tech0 {}

1 0

Nikolay Sivov : vkd3d-shader/fx: Do not write the same string twice.
by Alexandre Julliard 15 Jan '24

15 Jan '24

Module: vkd3d Branch: master Commit: 1a036ddff67b6035737708fe2d929c1a930faea6 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/1a036ddff67b6035737708fe2d929… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Jan 12 14:33:05 2024 +0100 vkd3d-shader/fx: Do not write the same string twice. --- libs/vkd3d-shader/fx.c | 66 +++++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 62 insertions(+), 4 deletions(-) diff --git a/libs/vkd3d-shader/fx.c b/libs/vkd3d-shader/fx.c index 97ea924c..17b9627b 100644 --- a/libs/vkd3d-shader/fx.c +++ b/libs/vkd3d-shader/fx.c @@ -20,11 +20,38 @@ #include "hlsl.h" +struct string_entry +{ + struct rb_entry entry; + /* String points to original data, should not be freed. */ + const char *string; + uint32_t offset; +}; + +static int string_storage_compare(const void *key, const struct rb_entry *entry) +{ + struct string_entry *string_entry = RB_ENTRY_VALUE(entry, struct string_entry, entry); + const char *string = key; + + return strcmp(string, string_entry->string); +} + +static void string_storage_destroy(struct rb_entry *entry, void *context) +{ + struct string_entry *string_entry = RB_ENTRY_VALUE(entry, struct string_entry, entry); + + vkd3d_free(string_entry); +} + struct fx_write_context { + struct hlsl_ctx *ctx; + struct vkd3d_bytecode_buffer unstructured; struct vkd3d_bytecode_buffer structured; + struct rb_tree strings; + unsigned int min_technique_version; unsigned int max_technique_version; @@ -33,12 +60,13 @@ struct fx_write_context int status; }; -static void fx_write_context_init(const struct hlsl_ctx *ctx, struct fx_write_context *fx) +static void fx_write_context_init(struct hlsl_ctx *ctx, struct fx_write_context *fx) { unsigned int version = ctx->profile->major_version; memset(fx, 0, sizeof(*fx)); + fx->ctx = ctx; if (version == 2) { fx->min_technique_version = 9; @@ -54,6 +82,16 @@ static void fx_write_context_init(const struct hlsl_ctx *ctx, struct fx_write_co fx->min_technique_version = 10; fx->max_technique_version = 11; } + + rb_init(&fx->strings, string_storage_compare); +} + +static int fx_write_context_cleanup(struct fx_write_context *fx) +{ + int status = fx->status; + rb_destroy(&fx->strings, string_storage_destroy, NULL); + + return status; } static bool technique_matches_version(const struct hlsl_ir_var *var, const struct fx_write_context *fx) @@ -68,8 +106,28 @@ static bool technique_matches_version(const struct hlsl_ir_var *var, const struc static uint32_t fx_put_raw_string(struct fx_write_context *fx, const char *string) { + struct string_entry *string_entry; + struct rb_entry *entry; + /* NULLs are emitted as empty strings using the same 4 bytes at the start of the section. */ - return string ? put_string(&fx->unstructured, string) : 0; + if (!string) + return 0; + + if ((entry = rb_get(&fx->strings, string))) + { + string_entry = RB_ENTRY_VALUE(entry, struct string_entry, entry); + return string_entry->offset; + } + + if (!(string_entry = hlsl_alloc(fx->ctx, sizeof(*string_entry)))) + return 0; + + string_entry->offset = put_string(&fx->unstructured, string); + string_entry->string = string; + + rb_put(&fx->strings, string, &string_entry->entry); + + return string_entry->offset; } static void write_pass(struct hlsl_ir_var *var, struct fx_write_context *fx) @@ -230,7 +288,7 @@ static int hlsl_fx_4_write(struct hlsl_ctx *ctx, struct vkd3d_shader_code *out) if (fx.status < 0) ctx->result = fx.status; - return fx.status; + return fx_write_context_cleanup(&fx); } static int hlsl_fx_5_write(struct hlsl_ctx *ctx, struct vkd3d_shader_code *out) @@ -294,7 +352,7 @@ static int hlsl_fx_5_write(struct hlsl_ctx *ctx, struct vkd3d_shader_code *out) if (fx.status < 0) ctx->result = fx.status; - return fx.status; + return fx_write_context_cleanup(&fx); } int hlsl_emit_effect_binary(struct hlsl_ctx *ctx, struct vkd3d_shader_code *out)

1 0

Henri Verbeet : vkd3d-common: Get rid of InterlockedAdd().
by Alexandre Julliard 15 Jan '24

15 Jan '24

Module: vkd3d Branch: master Commit: 4db7b40ca8076b861239a1537566b8edce645d74 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/4db7b40ca8076b861239a1537566b… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jan 11 00:11:52 2024 +0100 vkd3d-common: Get rid of InterlockedAdd(). This was once used by libvkd3d's fence worker thread, but currently this is unused. --- include/private/vkd3d_common.h | 4 ---- 1 file changed, 4 deletions(-) diff --git a/include/private/vkd3d_common.h b/include/private/vkd3d_common.h index 4bb94ee5..cc9e4326 100644 --- a/include/private/vkd3d_common.h +++ b/include/private/vkd3d_common.h @@ -277,10 +277,6 @@ static inline LONG64 InterlockedIncrement64(LONG64 volatile *x) { return __sync_add_and_fetch(x, 1); } -static inline LONG InterlockedAdd(LONG volatile *x, LONG val) -{ - return __sync_add_and_fetch(x, val); -} # else # error "InterlockedIncrement() not implemented for this platform" # endif /* HAVE_SYNC_ADD_AND_FETCH */

1 0

Henri Verbeet : vkd3d-shader/tpf: Pass a uint32_t modifier token to shader_sm4_read_instruction_modifier().
by Alexandre Julliard 15 Jan '24

15 Jan '24

Module: vkd3d Branch: master Commit: 98963942209cf949c17592307f13ef6c304991ee URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/98963942209cf949c17592307f13e… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jan 10 16:59:21 2024 +0100 vkd3d-shader/tpf: Pass a uint32_t modifier token to shader_sm4_read_instruction_modifier(). --- libs/vkd3d-shader/tpf.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libs/vkd3d-shader/tpf.c b/libs/vkd3d-shader/tpf.c index 43b3525b..8d4415c9 100644 --- a/libs/vkd3d-shader/tpf.c +++ b/libs/vkd3d-shader/tpf.c @@ -2242,7 +2242,7 @@ static bool shader_sm4_read_dst_param(struct vkd3d_shader_sm4_parser *priv, cons return true; } -static void shader_sm4_read_instruction_modifier(DWORD modifier, struct vkd3d_shader_instruction *ins) +static void shader_sm4_read_instruction_modifier(uint32_t modifier, struct vkd3d_shader_instruction *ins) { enum vkd3d_sm4_instruction_modifier modifier_type = modifier & VKD3D_SM4_MODIFIER_MASK; @@ -2278,7 +2278,7 @@ static void shader_sm4_read_instruction_modifier(DWORD modifier, struct vkd3d_sh case VKD3D_SM5_MODIFIER_DATA_TYPE: { - DWORD components = (modifier & VKD3D_SM5_MODIFIER_DATA_TYPE_MASK) >> VKD3D_SM5_MODIFIER_DATA_TYPE_SHIFT; + uint32_t components = (modifier & VKD3D_SM5_MODIFIER_DATA_TYPE_MASK) >> VKD3D_SM5_MODIFIER_DATA_TYPE_SHIFT; unsigned int i; for (i = 0; i < VKD3D_VEC4_SIZE; i++)

1 0

Henri Verbeet : vkd3d-shader/tpf: Store the "components" token as a uint32_t in shader_sm4_read_dcl_resource().
by Alexandre Julliard 15 Jan '24

15 Jan '24

Module: vkd3d Branch: master Commit: b1c538e0fe87e6e9e640200bc34ab9ac17ea326e URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/b1c538e0fe87e6e9e640200bc34ab… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jan 10 17:01:50 2024 +0100 vkd3d-shader/tpf: Store the "components" token as a uint32_t in shader_sm4_read_dcl_resource(). --- 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 8d4415c9..200fbc62 100644 --- a/libs/vkd3d-shader/tpf.c +++ b/libs/vkd3d-shader/tpf.c @@ -821,7 +821,7 @@ static void shader_sm4_read_dcl_resource(struct vkd3d_shader_instruction *ins, u const uint32_t *end = &tokens[token_count]; enum vkd3d_sm4_data_type data_type; enum vkd3d_data_type reg_data_type; - DWORD components; + uint32_t components; unsigned int i; resource_type = (opcode_token & VKD3D_SM4_RESOURCE_TYPE_MASK) >> VKD3D_SM4_RESOURCE_TYPE_SHIFT;

1 0