January 2024 - Wine-commits

Henri Verbeet : vkd3d: Use debugstr_hresult() in vkd3d_join_thread().
by Alexandre Julliard 23 Jan '24

23 Jan '24

Module: vkd3d Branch: master Commit: d4b329e628ddeed5501fb2a96d8ec773abb680c0 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/d4b329e628ddeed5501fb2a96d8ec… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jan 17 18:06:18 2024 +0100 vkd3d: Use debugstr_hresult() in vkd3d_join_thread(). --- libs/vkd3d/device.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/vkd3d/device.c b/libs/vkd3d/device.c index 88cf9aa1..2b855817 100644 --- a/libs/vkd3d/device.c +++ b/libs/vkd3d/device.c @@ -4582,7 +4582,7 @@ HRESULT vkd3d_join_thread(struct vkd3d_instance *instance, union vkd3d_thread_ha if (instance->join_thread) { if (FAILED(hr = instance->join_thread(thread->handle))) - ERR("Failed to join thread, hr %#x.\n", hr); + ERR("Failed to join thread, hr %s.\n", debugstr_hresult(hr)); } else {

1 0

Henri Verbeet : vkd3d: Use debugstr_hresult() in vkd3d_init_null_resources().
by Alexandre Julliard 23 Jan '24

23 Jan '24

Module: vkd3d Branch: master Commit: e4cc4a336ebe0c84cf411a3e50104dcae6d130df URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/e4cc4a336ebe0c84cf411a3e50104… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jan 17 17:56:58 2024 +0100 vkd3d: Use debugstr_hresult() in vkd3d_init_null_resources(). --- libs/vkd3d/resource.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/vkd3d/resource.c b/libs/vkd3d/resource.c index f9e50335..a360b0ef 100644 --- a/libs/vkd3d/resource.c +++ b/libs/vkd3d/resource.c @@ -4923,7 +4923,7 @@ HRESULT vkd3d_init_null_resources(struct vkd3d_null_resources *null_resources, return vkd3d_init_null_resources_data(null_resources, device); fail: - ERR("Failed to initialize NULL resources, hr %#x.\n", hr); + ERR("Failed to initialise NULL resources, hr %s.\n", debugstr_hresult(hr)); vkd3d_destroy_null_resources(null_resources, device); return hr; }

1 0

Henri Verbeet : vkd3d-shader/ir: Store control point counts in struct vsir_program.
by Alexandre Julliard 23 Jan '24

23 Jan '24

Module: vkd3d Branch: master Commit: 98c6e85b339196d6fb4f14319b7fd84a7f771079 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/98c6e85b339196d6fb4f14319b7fd… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jan 17 21:35:22 2024 +0100 vkd3d-shader/ir: Store control point counts in struct vsir_program. --- libs/vkd3d-shader/spirv.c | 4 ++-- libs/vkd3d-shader/tpf.c | 8 ++++---- libs/vkd3d-shader/vkd3d_shader_private.h | 3 +-- 3 files changed, 7 insertions(+), 8 deletions(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index 9286e87d..4441db16 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -9806,8 +9806,8 @@ static int spirv_compiler_generate_spirv(struct spirv_compiler *compiler, compiler->block_names = parser->shader_desc.block_names; compiler->block_name_count = parser->shader_desc.block_name_count; - compiler->input_control_point_count = shader_desc->input_control_point_count; - compiler->output_control_point_count = shader_desc->output_control_point_count; + compiler->input_control_point_count = program->input_control_point_count; + compiler->output_control_point_count = program->output_control_point_count; if (compiler->shader_type != VKD3D_SHADER_TYPE_HULL) spirv_compiler_emit_shader_signature_outputs(compiler); diff --git a/libs/vkd3d-shader/tpf.c b/libs/vkd3d-shader/tpf.c index df10cd25..50146c2c 100644 --- a/libs/vkd3d-shader/tpf.c +++ b/libs/vkd3d-shader/tpf.c @@ -1051,7 +1051,7 @@ static void shader_sm4_read_dcl_input_primitive(struct vkd3d_shader_instruction { ins->declaration.primitive_type.type = VKD3D_PT_PATCH; ins->declaration.primitive_type.patch_vertex_count = primitive_type - VKD3D_SM5_INPUT_PT_PATCH1 + 1; - priv->p.shader_desc.input_control_point_count = ins->declaration.primitive_type.patch_vertex_count; + priv->p.program.input_control_point_count = ins->declaration.primitive_type.patch_vertex_count; } else if (primitive_type >= ARRAY_SIZE(input_primitive_type_table)) { @@ -1060,7 +1060,7 @@ static void shader_sm4_read_dcl_input_primitive(struct vkd3d_shader_instruction else { ins->declaration.primitive_type.type = input_primitive_type_table[primitive_type].vkd3d_type; - priv->p.shader_desc.input_control_point_count = input_primitive_type_table[primitive_type].control_point_count; + priv->p.program.input_control_point_count = input_primitive_type_table[primitive_type].control_point_count; } if (ins->declaration.primitive_type.type == VKD3D_PT_UNDEFINED) @@ -1174,9 +1174,9 @@ static void shader_sm5_read_control_point_count(struct vkd3d_shader_instruction >> VKD3D_SM5_CONTROL_POINT_COUNT_SHIFT; if (opcode == VKD3D_SM5_OP_DCL_INPUT_CONTROL_POINT_COUNT) - priv->p.shader_desc.input_control_point_count = ins->declaration.count; + priv->p.program.input_control_point_count = ins->declaration.count; else - priv->p.shader_desc.output_control_point_count = ins->declaration.count; + priv->p.program.output_control_point_count = ins->declaration.count; } static void shader_sm5_read_dcl_tessellator_domain(struct vkd3d_shader_instruction *ins, uint32_t opcode, diff --git a/libs/vkd3d-shader/vkd3d_shader_private.h b/libs/vkd3d-shader/vkd3d_shader_private.h index 887c47fc..332b39af 100644 --- a/libs/vkd3d-shader/vkd3d_shader_private.h +++ b/libs/vkd3d-shader/vkd3d_shader_private.h @@ -1020,8 +1020,6 @@ struct vkd3d_shader_desc struct shader_signature output_signature; struct shader_signature patch_constant_signature; - unsigned int input_control_point_count, output_control_point_count; - unsigned int block_count; struct @@ -1271,6 +1269,7 @@ struct vsir_program struct vkd3d_shader_version shader_version; struct vkd3d_shader_instruction_array instructions; + unsigned int input_control_point_count, output_control_point_count; unsigned int temp_count; unsigned int ssa_count; bool use_vocp;

1 0

Henri Verbeet : vkd3d-shader/ir: Store the block count in struct vsir_program.
by Alexandre Julliard 23 Jan '24

23 Jan '24

Module: vkd3d Branch: master Commit: f3c7d2d05c963b6a4103f0c4ea085aaad182ea89 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/f3c7d2d05c963b6a4103f0c4ea085… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jan 18 20:34:52 2024 +0100 vkd3d-shader/ir: Store the block count in struct vsir_program. --- libs/vkd3d-shader/dxil.c | 2 +- libs/vkd3d-shader/ir.c | 16 +++++++++------- libs/vkd3d-shader/spirv.c | 2 +- libs/vkd3d-shader/vkd3d_shader_private.h | 3 +-- 4 files changed, 12 insertions(+), 11 deletions(-) diff --git a/libs/vkd3d-shader/dxil.c b/libs/vkd3d-shader/dxil.c index 6b38f028..2a0ff61c 100644 --- a/libs/vkd3d-shader/dxil.c +++ b/libs/vkd3d-shader/dxil.c @@ -5527,7 +5527,7 @@ static enum vkd3d_result sm6_function_emit_blocks(const struct sm6_function *fun { unsigned int i; - sm6->p.shader_desc.block_count = function->block_count; + sm6->p.program.block_count = function->block_count; for (i = 0; i < function->block_count; ++i) { diff --git a/libs/vkd3d-shader/ir.c b/libs/vkd3d-shader/ir.c index 719a153f..537cbe6f 100644 --- a/libs/vkd3d-shader/ir.c +++ b/libs/vkd3d-shader/ir.c @@ -2213,6 +2213,7 @@ static enum vkd3d_result cf_flattener_iterate_instruction_array(struct cf_flatte static enum vkd3d_result flatten_control_flow_constructs(struct vkd3d_shader_parser *parser) { + struct vsir_program *program = &parser->program; struct cf_flattener flattener = {0}; enum vkd3d_result result; @@ -2222,10 +2223,10 @@ static enum vkd3d_result flatten_control_flow_constructs(struct vkd3d_shader_par if (result >= 0) { vkd3d_free(parser->program.instructions.elements); - parser->program.instructions.elements = flattener.instructions; - parser->program.instructions.capacity = flattener.instruction_capacity; - parser->program.instructions.count = flattener.instruction_count; - parser->shader_desc.block_count = flattener.block_id; + program->instructions.elements = flattener.instructions; + program->instructions.capacity = flattener.instruction_capacity; + program->instructions.count = flattener.instruction_count; + program->block_count = flattener.block_id; } else { @@ -2511,9 +2512,10 @@ static void vsir_validate_register(struct validation_context *ctx, /* Index == 0 is invalid, but it is temporarily allowed * for intermediate stages. Once we support validation * dialects we can selectively check for that. */ - if (reg->idx[0].offset > ctx->parser->shader_desc.block_count) - validator_error(ctx, VKD3D_SHADER_ERROR_VSIR_INVALID_INDEX, "LABEL register index %u exceeds the maximum count %u.", - reg->idx[0].offset, ctx->parser->shader_desc.block_count); + if (reg->idx[0].offset > ctx->program->block_count) + validator_error(ctx, VKD3D_SHADER_ERROR_VSIR_INVALID_INDEX, + "LABEL register index %u exceeds the maximum count %u.", + reg->idx[0].offset, ctx->program->block_count); break; case VKD3DSPR_NULL: diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index 4441db16..668f0c4e 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -9790,7 +9790,7 @@ static int spirv_compiler_generate_spirv(struct spirv_compiler *compiler, compiler->location.column = 0; compiler->location.line = 1; - if (parser->shader_desc.block_count && !spirv_compiler_init_blocks(compiler, parser->shader_desc.block_count)) + if (program->block_count && !spirv_compiler_init_blocks(compiler, program->block_count)) return VKD3D_ERROR_OUT_OF_MEMORY; instructions = program->instructions; diff --git a/libs/vkd3d-shader/vkd3d_shader_private.h b/libs/vkd3d-shader/vkd3d_shader_private.h index 332b39af..5bf40359 100644 --- a/libs/vkd3d-shader/vkd3d_shader_private.h +++ b/libs/vkd3d-shader/vkd3d_shader_private.h @@ -1020,8 +1020,6 @@ struct vkd3d_shader_desc struct shader_signature output_signature; struct shader_signature patch_constant_signature; - unsigned int block_count; - struct { uint32_t used, external; @@ -1270,6 +1268,7 @@ struct vsir_program struct vkd3d_shader_instruction_array instructions; unsigned int input_control_point_count, output_control_point_count; + unsigned int block_count; unsigned int temp_count; unsigned int ssa_count; bool use_vocp;

1 0

Henri Verbeet : vkd3d-shader/ir: Store block names in struct vsir_program.
by Alexandre Julliard 23 Jan '24

23 Jan '24

Module: vkd3d Branch: master Commit: bf628f0c74ae839bb20266cd10e07d1504ebc1bf URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/bf628f0c74ae839bb20266cd10e07… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jan 18 20:41:27 2024 +0100 vkd3d-shader/ir: Store block names in struct vsir_program. --- libs/vkd3d-shader/dxbc.c | 5 ----- libs/vkd3d-shader/ir.c | 9 +++++++-- libs/vkd3d-shader/spirv.c | 4 ++-- libs/vkd3d-shader/vkd3d_shader_private.h | 6 +++--- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/libs/vkd3d-shader/dxbc.c b/libs/vkd3d-shader/dxbc.c index edb65d2e..37ebc73c 100644 --- a/libs/vkd3d-shader/dxbc.c +++ b/libs/vkd3d-shader/dxbc.c @@ -552,14 +552,9 @@ static int shdr_handler(const struct vkd3d_shader_dxbc_section_desc *section, void free_shader_desc(struct vkd3d_shader_desc *desc) { - size_t i; - shader_signature_cleanup(&desc->input_signature); shader_signature_cleanup(&desc->output_signature); shader_signature_cleanup(&desc->patch_constant_signature); - for (i = 0; i < desc->block_name_count; ++i) - vkd3d_free((void *)desc->block_names[i]); - vkd3d_free(desc->block_names); } int shader_extract_from_dxbc(const struct vkd3d_shader_code *dxbc, diff --git a/libs/vkd3d-shader/ir.c b/libs/vkd3d-shader/ir.c index 537cbe6f..865a292c 100644 --- a/libs/vkd3d-shader/ir.c +++ b/libs/vkd3d-shader/ir.c @@ -26,6 +26,11 @@ bool vsir_program_init(struct vsir_program *program, const struct vkd3d_shader_v void vsir_program_cleanup(struct vsir_program *program) { + size_t i; + + for (i = 0; i < program->block_name_count; ++i) + vkd3d_free((void *)program->block_names[i]); + vkd3d_free(program->block_names); shader_instruction_array_destroy(&program->instructions); } @@ -2235,8 +2240,8 @@ static enum vkd3d_result flatten_control_flow_constructs(struct vkd3d_shader_par vkd3d_free(flattener.control_flow_info); /* Simpler to always free these in free_shader_desc(). */ - parser->shader_desc.block_names = flattener.block_names; - parser->shader_desc.block_name_count = flattener.block_name_count; + program->block_names = flattener.block_names; + program->block_name_count = flattener.block_name_count; return result; } diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index 668f0c4e..2acf3b27 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -9803,8 +9803,8 @@ static int spirv_compiler_generate_spirv(struct spirv_compiler *compiler, memset(&shader_desc->output_signature, 0, sizeof(shader_desc->output_signature)); memset(&shader_desc->patch_constant_signature, 0, sizeof(shader_desc->patch_constant_signature)); compiler->use_vocp = program->use_vocp; - compiler->block_names = parser->shader_desc.block_names; - compiler->block_name_count = parser->shader_desc.block_name_count; + compiler->block_names = program->block_names; + compiler->block_name_count = program->block_name_count; compiler->input_control_point_count = program->input_control_point_count; compiler->output_control_point_count = program->output_control_point_count; diff --git a/libs/vkd3d-shader/vkd3d_shader_private.h b/libs/vkd3d-shader/vkd3d_shader_private.h index 5bf40359..9a00b7bc 100644 --- a/libs/vkd3d-shader/vkd3d_shader_private.h +++ b/libs/vkd3d-shader/vkd3d_shader_private.h @@ -1024,9 +1024,6 @@ struct vkd3d_shader_desc { uint32_t used, external; } flat_constant_count[3]; - - const char **block_names; - size_t block_name_count; }; struct vkd3d_shader_register_semantic @@ -1272,6 +1269,9 @@ struct vsir_program unsigned int temp_count; unsigned int ssa_count; bool use_vocp; + + const char **block_names; + size_t block_name_count; }; bool vsir_program_init(struct vsir_program *program, const struct vkd3d_shader_version *version, unsigned int reserve);

1 0

Nikolay Sivov : tests/hlsl: Add some tests for annotations.
by Alexandre Julliard 23 Jan '24

23 Jan '24

Module: vkd3d Branch: master Commit: 341963bbecf441e882ab6ae0e9cebc8fea22ada4 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/341963bbecf441e882ab6ae0e9ceb… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Jan 17 18:45:31 2024 +0100 tests/hlsl: Add some tests for annotations. --- Makefile.am | 1 + tests/hlsl/annotations.shader_test | 90 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 91 insertions(+) diff --git a/Makefile.am b/Makefile.am index 648dfb25..1b9abc35 100644 --- a/Makefile.am +++ b/Makefile.am @@ -47,6 +47,7 @@ vkd3d_shader_tests = \ tests/hlsl/abs.shader_test \ tests/hlsl/all.shader_test \ tests/hlsl/angle-unit.shader_test \ + tests/hlsl/annotations.shader_test \ tests/hlsl/any.shader_test \ tests/hlsl/arithmetic-float-uniform.shader_test \ tests/hlsl/arithmetic-float.shader_test \ diff --git a/tests/hlsl/annotations.shader_test b/tests/hlsl/annotations.shader_test new file mode 100644 index 00000000..8592d274 --- /dev/null +++ b/tests/hlsl/annotations.shader_test @@ -0,0 +1,90 @@ +[require] +shader model >= 4.0 +shader model < 6.0 + +[effect todo] +// Annotations on techniques +technique10 t1 < int a = 1; > {} +technique10 t2 < int a = 2; int t1 = 3; int t2 = 4; > {} + +[effect todo] +// Annotations on passes +technique10 t1 < int a = 1; > +{ + pass < int t1 = 2; > {} +} + +[effect todo] +// Using names from the global scope +float a; + +technique10 t1 < int a = 1; > +{ + pass < int a = 2; > {} +} + +[effect todo] +// Evaluated literal constant expression for initial values +technique10 < int a = 1+2; > {} + +[effect todo] +// Using constant variables in the initializer +static const int b = 123; +technique10 < int a = b; > {} + +[effect todo] +// Implicitly sized array +technique10 < float a[] = {1, 2}; > {} + +[effect todo] +// Nested braces +technique10 < float4 a = {1, {{{2, {3}}, 4}}}; > {} + +[effect todo] +// Flattening +technique10 < float4 a = {1, float2(2, 3), 4}; > {} + +[effect todo] +// Comma separated initializers +technique10 < int a = 1, b = 2; > {} + +[effect todo] +// Majority modifier +technique10 < row_major float3x2 m = {1, 2, 3, 4, 5, 6}; > {} + +[effect fail] +// Without closing semicolon +technique10 t1 < int a = 1 > {} + +[effect fail] +// Redefinition +technique10 < int a = 0; float a = 1.0; > {} + +[effect fail] +technique10 +{ + pass < int a = 0; float a = 1.0; > {} +} + +[effect fail] +// Without initializer +technique10 < int a; > {} + +[effect fail] +// Only numeric types and strings are allowed +technique10 < DepthStencilState ds = { 0 }; > {} + +[effect fail] +// Type declarations are not allowed +technique10 < struct s { int a; } var = { 2 }; > {} + +[effect fail] +// Static modifier is not allowed +technique10 < static int a = 5; > {} + +[effect fail] +// Initializer should not depend on other annotations +technique10 < int a = 1, b = a; > {} + +[effect fail] +technique10 < int a = 1; int b = a; > {}

1 0

Nikolay Sivov : vkd3d-shader/hlsl: Add initial support for parsing annotations.
by Alexandre Julliard 23 Jan '24

23 Jan '24

Module: vkd3d Branch: master Commit: fe8881747beef8e8bc7535e2d582a4a428821a42 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/fe8881747beef8e8bc7535e2d582a… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Nov 14 01:28:28 2023 +0100 vkd3d-shader/hlsl: Add initial support for parsing annotations. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- libs/vkd3d-shader/hlsl.h | 2 ++ libs/vkd3d-shader/hlsl.y | 32 +++++++++++++++++++++++++++++--- 2 files changed, 31 insertions(+), 3 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.h b/libs/vkd3d-shader/hlsl.h index 536b4687..bf2f757f 100644 --- a/libs/vkd3d-shader/hlsl.h +++ b/libs/vkd3d-shader/hlsl.h @@ -408,6 +408,8 @@ struct hlsl_ir_var struct list extern_entry; /* Scope that variable itself defines, used to provide a container for techniques and passes. */ struct hlsl_scope *scope; + /* Scope that contains annotations for this variable. */ + struct hlsl_scope *annotations; /* Indexes of the IR instructions where the variable is first written and last read (liveness * range). The IR instructions are numerated starting from 2, because 0 means unused, and 1 diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index c308916e..f33032f5 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -1122,7 +1122,7 @@ static bool add_technique(struct hlsl_ctx *ctx, const char *name, struct hlsl_sc } static bool add_effect_group(struct hlsl_ctx *ctx, const char *name, struct hlsl_scope *scope, - const struct vkd3d_shader_location *loc) + struct hlsl_scope *annotations, const struct vkd3d_shader_location *loc) { struct hlsl_ir_var *var; struct hlsl_type *type; @@ -1131,6 +1131,7 @@ static bool add_effect_group(struct hlsl_ctx *ctx, const char *name, struct hlsl if (!(var = hlsl_new_var(ctx, name, type, loc, NULL, 0, NULL))) return false; var->scope = scope; + var->annotations = annotations; if (!hlsl_add_var(ctx, var, false)) { @@ -4999,6 +5000,7 @@ static void check_duplicated_switch_cases(struct hlsl_ctx *ctx, const struct hls struct hlsl_attribute *attr; struct parse_attribute_list attr_list; struct hlsl_ir_switch_case *switch_case; + struct hlsl_scope *scope; } %token KW_BLENDSTATE @@ -5124,6 +5126,8 @@ static void check_duplicated_switch_cases(struct hlsl_ctx *ctx, const struct hls %token <name> STRING %token <name> TYPE_IDENTIFIER +%type <scope> annotations_opt + %type <arrays> arrays %type <assign_op> assign_op @@ -5242,6 +5246,28 @@ name_opt: pass: KW_PASS name_opt '{' '}' +annotations_list: + variables_def_typed ';' + | annotations_list variables_def_typed ';' + +annotations_opt: + %empty + { + $$ = NULL; + } + | '<' scope_start '>' + { + hlsl_pop_scope(ctx); + $$ = NULL; + } + | '<' scope_start annotations_list '>' + { + struct hlsl_scope *scope = ctx->cur_scope; + + hlsl_pop_scope(ctx); + $$ = scope; + } + pass_list: pass | pass_list pass @@ -5302,11 +5328,11 @@ group_techniques: | group_techniques group_technique effect_group: - KW_FXGROUP any_identifier '{' scope_start group_techniques '}' + KW_FXGROUP any_identifier annotations_opt '{' scope_start group_techniques '}' { struct hlsl_scope *scope = ctx->cur_scope; hlsl_pop_scope(ctx); - if (!(add_effect_group(ctx, $2, scope, &@2))) + if (!(add_effect_group(ctx, $2, scope, $3, &@2))) YYABORT; }

1 0

Nikolay Sivov : vkd3d-shader/hlsl: Add passes variables to the techniques.
by Alexandre Julliard 23 Jan '24

23 Jan '24

Module: vkd3d Branch: master Commit: e72f8f9a30036d7c1cfc4b81b42765ea3ed328df URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/e72f8f9a30036d7c1cfc4b81b4276… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Nov 11 01:06:45 2023 +0100 vkd3d-shader/hlsl: Add passes variables to the techniques. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- libs/vkd3d-shader/hlsl.c | 1 + libs/vkd3d-shader/hlsl.h | 1 + libs/vkd3d-shader/hlsl.y | 27 +++++++++++++++++++++++++++ 3 files changed, 29 insertions(+) diff --git a/libs/vkd3d-shader/hlsl.c b/libs/vkd3d-shader/hlsl.c index 6a5a6d0e..a990e021 100644 --- a/libs/vkd3d-shader/hlsl.c +++ b/libs/vkd3d-shader/hlsl.c @@ -3366,6 +3366,7 @@ static void declare_predefined_types(struct hlsl_ctx *ctx) {"vector", HLSL_CLASS_VECTOR, HLSL_TYPE_FLOAT, 4, 1}, {"matrix", HLSL_CLASS_MATRIX, HLSL_TYPE_FLOAT, 4, 4}, {"fxgroup", HLSL_CLASS_OBJECT, HLSL_TYPE_EFFECT_GROUP, 1, 1}, + {"pass", HLSL_CLASS_OBJECT, HLSL_TYPE_PASS, 1, 1}, {"STRING", HLSL_CLASS_OBJECT, HLSL_TYPE_STRING, 1, 1}, {"TEXTURE", HLSL_CLASS_OBJECT, HLSL_TYPE_TEXTURE, 1, 1}, {"PIXELSHADER", HLSL_CLASS_OBJECT, HLSL_TYPE_PIXELSHADER, 1, 1}, diff --git a/libs/vkd3d-shader/hlsl.h b/libs/vkd3d-shader/hlsl.h index bf2f757f..58188ce6 100644 --- a/libs/vkd3d-shader/hlsl.h +++ b/libs/vkd3d-shader/hlsl.h @@ -95,6 +95,7 @@ enum hlsl_base_type HLSL_TYPE_UAV, HLSL_TYPE_PIXELSHADER, HLSL_TYPE_VERTEXSHADER, + HLSL_TYPE_PASS, HLSL_TYPE_TECHNIQUE, HLSL_TYPE_EFFECT_GROUP, HLSL_TYPE_STRING, diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index f33032f5..a132b154 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -1096,6 +1096,29 @@ static bool add_func_parameter(struct hlsl_ctx *ctx, struct hlsl_func_parameters return true; } +static bool add_pass(struct hlsl_ctx *ctx, const char *name, const struct vkd3d_shader_location *loc) +{ + struct hlsl_ir_var *var; + struct hlsl_type *type; + + type = hlsl_get_type(ctx->globals, "pass", false, false); + if (!(var = hlsl_new_var(ctx, name, type, loc, NULL, 0, NULL))) + return false; + + if (!hlsl_add_var(ctx, var, false)) + { + struct hlsl_ir_var *old = hlsl_get_var(ctx->cur_scope, var->name); + + hlsl_error(ctx, &var->loc, VKD3D_SHADER_ERROR_HLSL_REDEFINED, + "Identifier \"%s\" was already declared in this scope.", var->name); + hlsl_note(ctx, &old->loc, VKD3D_SHADER_LOG_ERROR, "\"%s\" was previously declared here.", old->name); + hlsl_free_var(var); + return false; + } + + return true; +} + static bool add_technique(struct hlsl_ctx *ctx, const char *name, struct hlsl_scope *scope, const char *typename, const struct vkd3d_shader_location *loc) { @@ -5245,6 +5268,10 @@ name_opt: pass: KW_PASS name_opt '{' '}' + { + if (!add_pass(ctx, $2, &@1)) + YYABORT; + } annotations_list: variables_def_typed ';'

1 0

Nikolay Sivov : vkd3d-shader/hlsl: Allow annotations on passes.
by Alexandre Julliard 23 Jan '24

23 Jan '24

Module: vkd3d Branch: master Commit: 76a689d43f8ea94d6aa79ccb0970e96389f38a92 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/76a689d43f8ea94d6aa79ccb0970e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Nov 14 01:56:23 2023 +0100 vkd3d-shader/hlsl: Allow annotations on passes. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- libs/vkd3d-shader/hlsl.y | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index a132b154..12c81d2d 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -1096,7 +1096,8 @@ static bool add_func_parameter(struct hlsl_ctx *ctx, struct hlsl_func_parameters return true; } -static bool add_pass(struct hlsl_ctx *ctx, const char *name, const struct vkd3d_shader_location *loc) +static bool add_pass(struct hlsl_ctx *ctx, const char *name, struct hlsl_scope *annotations, + const struct vkd3d_shader_location *loc) { struct hlsl_ir_var *var; struct hlsl_type *type; @@ -1104,6 +1105,7 @@ static bool add_pass(struct hlsl_ctx *ctx, const char *name, const struct vkd3d_ type = hlsl_get_type(ctx->globals, "pass", false, false); if (!(var = hlsl_new_var(ctx, name, type, loc, NULL, 0, NULL))) return false; + var->annotations = annotations; if (!hlsl_add_var(ctx, var, false)) { @@ -5267,9 +5269,9 @@ name_opt: | any_identifier pass: - KW_PASS name_opt '{' '}' + KW_PASS name_opt annotations_opt '{' '}' { - if (!add_pass(ctx, $2, &@1)) + if (!add_pass(ctx, $2, $3, &@1)) YYABORT; }

1 0

Nikolay Sivov : vkd3d-shader/hlsl: Allow annotations on techniques.
by Alexandre Julliard 23 Jan '24

23 Jan '24

Module: vkd3d Branch: master Commit: 2c1905b78093aca1bb1e61e2d0af06bf923e21ba URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/2c1905b78093aca1bb1e61e2d0af0… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Nov 14 02:27:15 2023 +0100 vkd3d-shader/hlsl: Allow annotations on techniques. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- libs/vkd3d-shader/hlsl.y | 15 ++++++++------- tests/hlsl/annotations.shader_test | 30 +++++++++++++++--------------- 2 files changed, 23 insertions(+), 22 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index 12c81d2d..69b20973 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -1122,7 +1122,7 @@ static bool add_pass(struct hlsl_ctx *ctx, const char *name, struct hlsl_scope * } 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_scope *annotations, const char *typename, const struct vkd3d_shader_location *loc) { struct hlsl_ir_var *var; struct hlsl_type *type; @@ -1131,6 +1131,7 @@ static bool add_technique(struct hlsl_ctx *ctx, const char *name, struct hlsl_sc if (!(var = hlsl_new_var(ctx, name, type, loc, NULL, 0, NULL))) return false; var->scope = scope; + var->annotations = annotations; if (!hlsl_add_var(ctx, var, false)) { @@ -5306,17 +5307,17 @@ passes: | scope_start pass_list technique9: - KW_TECHNIQUE name_opt '{' passes '}' + KW_TECHNIQUE name_opt annotations_opt '{' passes '}' { struct hlsl_scope *scope = ctx->cur_scope; hlsl_pop_scope(ctx); - if (!add_technique(ctx, $2, scope, "technique", &@1)) + if (!add_technique(ctx, $2, scope, $3, "technique", &@1)) YYABORT; } technique10: - KW_TECHNIQUE10 name_opt '{' passes '}' + KW_TECHNIQUE10 name_opt annotations_opt '{' passes '}' { struct hlsl_scope *scope = ctx->cur_scope; hlsl_pop_scope(ctx); @@ -5325,12 +5326,12 @@ technique10: hlsl_error(ctx, &@1, VKD3D_SHADER_ERROR_HLSL_INVALID_SYNTAX, "The 'technique10' keyword is invalid for this profile."); - if (!add_technique(ctx, $2, scope, "technique10", &@1)) + if (!add_technique(ctx, $2, scope, $3, "technique10", &@1)) YYABORT; } technique11: - KW_TECHNIQUE11 name_opt '{' passes '}' + KW_TECHNIQUE11 name_opt annotations_opt '{' passes '}' { struct hlsl_scope *scope = ctx->cur_scope; hlsl_pop_scope(ctx); @@ -5339,7 +5340,7 @@ technique11: hlsl_error(ctx, &@1, VKD3D_SHADER_ERROR_HLSL_INVALID_SYNTAX, "The 'technique11' keyword is invalid for this profile."); - if (!add_technique(ctx, $2, scope, "technique11", &@1)) + if (!add_technique(ctx, $2, scope, $3, "technique11", &@1)) YYABORT; } diff --git a/tests/hlsl/annotations.shader_test b/tests/hlsl/annotations.shader_test index 8592d274..40e383aa 100644 --- a/tests/hlsl/annotations.shader_test +++ b/tests/hlsl/annotations.shader_test @@ -2,19 +2,19 @@ shader model >= 4.0 shader model < 6.0 -[effect todo] +[effect] // Annotations on techniques technique10 t1 < int a = 1; > {} technique10 t2 < int a = 2; int t1 = 3; int t2 = 4; > {} -[effect todo] +[effect] // Annotations on passes technique10 t1 < int a = 1; > { pass < int t1 = 2; > {} } -[effect todo] +[effect] // Using names from the global scope float a; @@ -23,32 +23,32 @@ technique10 t1 < int a = 1; > pass < int a = 2; > {} } -[effect todo] +[effect] // Evaluated literal constant expression for initial values technique10 < int a = 1+2; > {} -[effect todo] +[effect] // Using constant variables in the initializer static const int b = 123; technique10 < int a = b; > {} -[effect todo] +[effect] // Implicitly sized array technique10 < float a[] = {1, 2}; > {} -[effect todo] +[effect] // Nested braces technique10 < float4 a = {1, {{{2, {3}}, 4}}}; > {} -[effect todo] +[effect] // Flattening technique10 < float4 a = {1, float2(2, 3), 4}; > {} -[effect todo] +[effect] // Comma separated initializers technique10 < int a = 1, b = 2; > {} -[effect todo] +[effect] // Majority modifier technique10 < row_major float3x2 m = {1, 2, 3, 4, 5, 6}; > {} @@ -66,7 +66,7 @@ technique10 pass < int a = 0; float a = 1.0; > {} } -[effect fail] +[effect fail todo] // Without initializer technique10 < int a; > {} @@ -74,17 +74,17 @@ technique10 < int a; > {} // Only numeric types and strings are allowed technique10 < DepthStencilState ds = { 0 }; > {} -[effect fail] +[effect fail todo] // Type declarations are not allowed technique10 < struct s { int a; } var = { 2 }; > {} -[effect fail] +[effect fail todo] // Static modifier is not allowed technique10 < static int a = 5; > {} -[effect fail] +[effect fail todo] // Initializer should not depend on other annotations technique10 < int a = 1, b = a; > {} -[effect fail] +[effect fail todo] technique10 < int a = 1; int b = a; > {}

1 0