wine-commits January 2024

wine-commits@winehq.org

1 participants
711 discussions

Nikolay Sivov : vkd3d-shader/hlsl: Add variables for techniques.
by Alexandre Julliard 11 Jan '24

11 Jan '24

Module: vkd3d Branch: master Commit: f7a02a5da255b410aa75000022f3af2792682a1b URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/f7a02a5da255b410aa75000022f3a… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Nov 5 17:28:40 2023 +0100 vkd3d-shader/hlsl: Add variables for techniques. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- libs/vkd3d-shader/hlsl.c | 54 ++++++++++++++++++++++++++++------- libs/vkd3d-shader/hlsl.h | 9 ++++-- libs/vkd3d-shader/hlsl.y | 33 +++++++++++++++++++-- tests/hlsl/technique-fx_2.shader_test | 6 ++-- tests/hlsl/technique-fx_4.shader_test | 4 +-- tests/hlsl/technique-fx_5.shader_test | 4 +-- 6 files changed, 88 insertions(+), 22 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.c b/libs/vkd3d-shader/hlsl.c index a4196787..6a2c9b4c 100644 --- a/libs/vkd3d-shader/hlsl.c +++ b/libs/vkd3d-shader/hlsl.c @@ -98,19 +98,22 @@ bool hlsl_add_var(struct hlsl_ctx *ctx, struct hlsl_ir_var *decl, bool local_var struct hlsl_scope *scope = ctx->cur_scope; struct hlsl_ir_var *var; - LIST_FOR_EACH_ENTRY(var, &scope->vars, struct hlsl_ir_var, scope_entry) - { - if (!strcmp(decl->name, var->name)) - return false; - } - if (local_var && scope->upper->upper == ctx->globals) + if (decl->name) { - /* Check whether the variable redefines a function parameter. */ - LIST_FOR_EACH_ENTRY(var, &scope->upper->vars, struct hlsl_ir_var, scope_entry) + LIST_FOR_EACH_ENTRY(var, &scope->vars, struct hlsl_ir_var, scope_entry) { - if (!strcmp(decl->name, var->name)) + if (var->name && !strcmp(decl->name, var->name)) return false; } + if (local_var && scope->upper->upper == ctx->globals) + { + /* Check whether the variable redefines a function parameter. */ + LIST_FOR_EACH_ENTRY(var, &scope->upper->vars, struct hlsl_ir_var, scope_entry) + { + if (var->name && !strcmp(decl->name, var->name)) + return false; + } + } } list_add_tail(&scope->vars, &decl->scope_entry); @@ -123,7 +126,7 @@ struct hlsl_ir_var *hlsl_get_var(struct hlsl_scope *scope, const char *name) LIST_FOR_EACH_ENTRY(var, &scope->vars, struct hlsl_ir_var, scope_entry) { - if (!strcmp(name, var->name)) + if (var->name && !strcmp(name, var->name)) return var; } if (!scope->upper) @@ -915,6 +918,11 @@ bool hlsl_types_are_equal(const struct hlsl_type *t1, const struct hlsl_type *t2 if (t1->class == HLSL_CLASS_ARRAY) return t1->e.array.elements_count == t2->e.array.elements_count && hlsl_types_are_equal(t1->e.array.type, t2->e.array.type); + if (t1->class == HLSL_CLASS_OBJECT) + { + if (t1->base_type == HLSL_TYPE_TECHNIQUE && t1->e.version != t2->e.version) + return false; + } return true; } @@ -993,6 +1001,13 @@ struct hlsl_type *hlsl_type_clone(struct hlsl_ctx *ctx, struct hlsl_type *old, break; } + case HLSL_CLASS_OBJECT: + { + if (type->base_type == HLSL_TYPE_TECHNIQUE) + type->e.version = old->e.version; + break; + } + default: break; } @@ -3357,6 +3372,18 @@ static void declare_predefined_types(struct hlsl_ctx *ctx) {"VERTEXSHADER", HLSL_CLASS_OBJECT, HLSL_TYPE_VERTEXSHADER, 1, 1}, }; + static const struct + { + char *name; + unsigned int version; + } + technique_types[] = + { + {"technique", 9}, + {"technique10", 10}, + {"technique11", 11}, + }; + for (bt = 0; bt <= HLSL_TYPE_LAST_SCALAR; ++bt) { for (y = 1; y <= 4; ++y) @@ -3461,6 +3488,13 @@ static void declare_predefined_types(struct hlsl_ctx *ctx) effect_types[i].base_type, effect_types[i].dimx, effect_types[i].dimy); hlsl_scope_add_type(ctx->globals, type); } + + for (i = 0; i < ARRAY_SIZE(technique_types); ++i) + { + type = hlsl_new_type(ctx, technique_types[i].name, HLSL_CLASS_OBJECT, HLSL_TYPE_TECHNIQUE, 1, 1); + type->e.version = technique_types[i].version; + hlsl_scope_add_type(ctx->globals, type); + } } static bool hlsl_ctx_init(struct hlsl_ctx *ctx, const struct vkd3d_shader_compile_info *compile_info, diff --git a/libs/vkd3d-shader/hlsl.h b/libs/vkd3d-shader/hlsl.h index 1bc5a5f8..1f5c0ad7 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_TECHNIQUE, HLSL_TYPE_STRING, HLSL_TYPE_VOID, }; @@ -138,8 +139,10 @@ struct hlsl_type struct rb_entry scope_entry; enum hlsl_type_class class; - /* If type is <= HLSL_CLASS_LAST_NUMERIC, then base_type is <= HLSL_TYPE_LAST_SCALAR. - * If type is HLSL_CLASS_OBJECT, then base_type is > HLSL_TYPE_LAST_SCALAR. + /* If class is <= HLSL_CLASS_LAST_NUMERIC, then base_type is <= HLSL_TYPE_LAST_SCALAR. + * If class is HLSL_CLASS_OBJECT, then base_type is > HLSL_TYPE_LAST_SCALAR. + * If class is HLSL_CLASS_OBJECT and base_type is HLSL_TYPE_TECHNIQUE, additional version + * field is used to distinguish between technique types. * Otherwise, base_type is not used. */ enum hlsl_base_type base_type; @@ -191,6 +194,8 @@ struct hlsl_type /* Format of the data contained within the type if the base_type is HLSL_TYPE_TEXTURE or * HLSL_TYPE_UAV. */ struct hlsl_type *resource_format; + /* Additional field to distinguish object types. Currently used only for technique types. */ + unsigned int version; } e; /* Number of numeric register components used by one value of this type, for each regset. diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index d1dd846c..9c2a7150 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -1096,6 +1096,30 @@ 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) +{ + struct hlsl_ir_var *var; + struct hlsl_type *type; + + type = hlsl_get_type(ctx->globals, typename, 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 struct hlsl_reg_reservation parse_reg_reservation(const char *reg_string) { struct hlsl_reg_reservation reservation = {0}; @@ -5111,7 +5135,8 @@ pass_list: technique9: KW_TECHNIQUE technique_name '{' pass_list '}' { - hlsl_fixme(ctx, &@$, "Unsupported \'technique\' declaration."); + if (!add_technique(ctx, $2, "technique", &@1)) + YYABORT; } technique10: @@ -5121,7 +5146,8 @@ technique10: hlsl_error(ctx, &@1, VKD3D_SHADER_ERROR_HLSL_INVALID_SYNTAX, "The 'technique10' keyword is invalid for this profile."); - hlsl_fixme(ctx, &@$, "Unsupported \'technique10\' declaration."); + if (!add_technique(ctx, $2, "technique10", &@1)) + YYABORT; } technique11: @@ -5131,7 +5157,8 @@ technique11: hlsl_error(ctx, &@1, VKD3D_SHADER_ERROR_HLSL_INVALID_SYNTAX, "The 'technique11' keyword is invalid for this profile."); - hlsl_fixme(ctx, &@$, "Unsupported \'technique11\' declaration."); + if (!add_technique(ctx, $2, "technique11", &@1)) + YYABORT; } global_technique: diff --git a/tests/hlsl/technique-fx_2.shader_test b/tests/hlsl/technique-fx_2.shader_test index b13344e8..23a457a1 100644 --- a/tests/hlsl/technique-fx_2.shader_test +++ b/tests/hlsl/technique-fx_2.shader_test @@ -90,7 +90,7 @@ technique10 float4 f; % fx_5_0 keyword fails with fx_2_0 profile -[effect fail todo] +[effect fail] technique { } @@ -99,7 +99,7 @@ technique11 { } -[effect fail todo] +[effect fail] technique { } @@ -108,7 +108,7 @@ tEchnique10 { } -[effect fail todo] +[effect fail] technique { } diff --git a/tests/hlsl/technique-fx_4.shader_test b/tests/hlsl/technique-fx_4.shader_test index 7968cb9d..02317483 100644 --- a/tests/hlsl/technique-fx_4.shader_test +++ b/tests/hlsl/technique-fx_4.shader_test @@ -60,7 +60,7 @@ technique11 { } -[effect fail todo] +[effect fail] technique { } @@ -69,7 +69,7 @@ tEchnique10 { } -[effect fail todo] +[effect fail] technique { } diff --git a/tests/hlsl/technique-fx_5.shader_test b/tests/hlsl/technique-fx_5.shader_test index 29aa616f..fd1cf4cf 100644 --- a/tests/hlsl/technique-fx_5.shader_test +++ b/tests/hlsl/technique-fx_5.shader_test @@ -60,7 +60,7 @@ technique11 { } -[effect fail todo] +[effect fail] technique { } @@ -69,7 +69,7 @@ tEchnique10 { } -[effect fail todo] +[effect fail] technique { }

1 0

Nikolay Sivov : vkd3d-shader/hlsl: Rename rule for top-level techniques.
by Alexandre Julliard 11 Jan '24

11 Jan '24

Module: vkd3d Branch: master Commit: 8494342fa0a755d0b95873aedd0532d67ff2cdd6 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/8494342fa0a755d0b95873aedd053… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Nov 5 14:29:53 2023 +0100 vkd3d-shader/hlsl: Rename rule for top-level techniques. Only technique10 and technique11 types could be nested in groups. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- libs/vkd3d-shader/hlsl.y | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index 9049d23e..d1dd846c 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -5095,7 +5095,7 @@ hlsl_prog: destroy_block($2); } | hlsl_prog preproc_directive - | hlsl_prog technique + | hlsl_prog global_technique | hlsl_prog ';' technique_name: @@ -5134,7 +5134,7 @@ technique11: hlsl_fixme(ctx, &@$, "Unsupported \'technique11\' declaration."); } -technique: +global_technique: technique9 | technique10 | technique11

1 0

Nikolay Sivov : vkd3d-shader/hlsl: Add 'fxgroup' token.
by Alexandre Julliard 11 Jan '24

11 Jan '24

Module: vkd3d Branch: master Commit: c3af1f998981f7371bef6f16e126115ca74db574 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/c3af1f998981f7371bef6f16e1261… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Nov 2 15:37:01 2023 +0100 vkd3d-shader/hlsl: Add 'fxgroup' token. 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 +- tests/hlsl/technique-fx_4.shader_test | 2 +- tests/hlsl/technique-fx_5.shader_test | 2 +- 5 files changed, 5 insertions(+), 3 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.l b/libs/vkd3d-shader/hlsl.l index fe838750..6cef0e02 100644 --- a/libs/vkd3d-shader/hlsl.l +++ b/libs/vkd3d-shader/hlsl.l @@ -89,6 +89,7 @@ else {return KW_ELSE; } extern {return KW_EXTERN; } false {return KW_FALSE; } for {return KW_FOR; } +fxgroup {return KW_FXGROUP; } GeometryShader {return KW_GEOMETRYSHADER; } groupshared {return KW_GROUPSHARED; } if {return KW_IF; } diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index 26f93574..9049d23e 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -4888,6 +4888,7 @@ static void check_duplicated_switch_cases(struct hlsl_ctx *ctx, const struct hls %token KW_EXTERN %token KW_FALSE %token KW_FOR +%token KW_FXGROUP %token KW_GEOMETRYSHADER %token KW_GROUPSHARED %token KW_IF diff --git a/tests/hlsl/technique-fx_2.shader_test b/tests/hlsl/technique-fx_2.shader_test index 2aac14ca..b13344e8 100644 --- a/tests/hlsl/technique-fx_2.shader_test +++ b/tests/hlsl/technique-fx_2.shader_test @@ -38,7 +38,7 @@ float4 main() : sv_target return float4(0, 0, 0, 0); } -[pixel shader fail todo] +[pixel shader fail] float4 main() : sv_target { float4 fxgroup = {0, 0, 0, 0}; diff --git a/tests/hlsl/technique-fx_4.shader_test b/tests/hlsl/technique-fx_4.shader_test index 2fc481de..7968cb9d 100644 --- a/tests/hlsl/technique-fx_4.shader_test +++ b/tests/hlsl/technique-fx_4.shader_test @@ -9,7 +9,7 @@ float4 main() : sv_target return teChnique; } -[pixel shader fail todo] +[pixel shader fail] float4 main() : sv_target { float4 fxgroup = {0, 0, 0, 0}; diff --git a/tests/hlsl/technique-fx_5.shader_test b/tests/hlsl/technique-fx_5.shader_test index 152227c6..29aa616f 100644 --- a/tests/hlsl/technique-fx_5.shader_test +++ b/tests/hlsl/technique-fx_5.shader_test @@ -9,7 +9,7 @@ float4 main() : sv_target return teChnique; } -[pixel shader fail todo] +[pixel shader fail] float4 main() : sv_target { float4 fxgroup = {0, 0, 0, 0};

1 0

Nikolay Sivov : tests: Add some tests for effects groups syntax.
by Alexandre Julliard 11 Jan '24

11 Jan '24

Module: vkd3d Branch: master Commit: ffae36974892485342dc6f1eed994b7af364cbf4 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/ffae36974892485342dc6f1eed994… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Nov 2 15:26:38 2023 +0100 tests: Add some tests for effects groups syntax. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- tests/hlsl/technique-fx_2.shader_test | 30 ++++++++++++++++ tests/hlsl/technique-fx_4.shader_test | 24 +++++++++++++ tests/hlsl/technique-fx_5.shader_test | 66 +++++++++++++++++++++++++++++++++++ 3 files changed, 120 insertions(+) diff --git a/tests/hlsl/technique-fx_2.shader_test b/tests/hlsl/technique-fx_2.shader_test index 90c734d5..2aac14ca 100644 --- a/tests/hlsl/technique-fx_2.shader_test +++ b/tests/hlsl/technique-fx_2.shader_test @@ -38,6 +38,13 @@ float4 main() : sv_target return float4(0, 0, 0, 0); } +[pixel shader fail todo] +float4 main() : sv_target +{ + float4 fxgroup = {0, 0, 0, 0}; + return fxgroup; +} + [pixel shader] typedef float4 Technique10; typedef float4 Technique11; @@ -62,6 +69,13 @@ float4 main() : sv_target return teChnique11; } +[pixel shader] +float4 main() : sv_target +{ + float4 fxGroup = {0, 0, 0, 0}; + return fxGroup; +} + [effect todo] technique { @@ -103,6 +117,12 @@ tEchnique11 { } +[effect fail] +// Empty groups are not allowed +fxgroup group +{ +} + % Regular shaders with technique blocks [vertex shader todo] float4 main() : sv_position @@ -122,6 +142,11 @@ technique11 { } +fxgroup group +{ + technique10 {} +} + [pixel shader todo] float4 main() : sv_target { @@ -139,3 +164,8 @@ technique10 technique11 { } + +fxgroup group +{ + technique10 {} +} diff --git a/tests/hlsl/technique-fx_4.shader_test b/tests/hlsl/technique-fx_4.shader_test index fb8a3e67..2fc481de 100644 --- a/tests/hlsl/technique-fx_4.shader_test +++ b/tests/hlsl/technique-fx_4.shader_test @@ -9,6 +9,13 @@ float4 main() : sv_target return teChnique; } +[pixel shader fail todo] +float4 main() : sv_target +{ + float4 fxgroup = {0, 0, 0, 0}; + return fxgroup; +} + [pixel shader] float4 main() : sv_target { @@ -23,6 +30,13 @@ float4 main() : sv_target return teChnique11; } +[pixel shader] +float4 main() : sv_target +{ + float4 fxGroup = {0, 0, 0, 0}; + return fxGroup; +} + [effect todo] technique { @@ -101,6 +115,11 @@ technique11 { } +fxgroup group +{ + technique10 {} +} + [pixel shader todo] float4 main() : sv_target { @@ -118,3 +137,8 @@ technique10 technique11 { } + +fxgroup group +{ + technique10 {} +} diff --git a/tests/hlsl/technique-fx_5.shader_test b/tests/hlsl/technique-fx_5.shader_test index aeea1a84..152227c6 100644 --- a/tests/hlsl/technique-fx_5.shader_test +++ b/tests/hlsl/technique-fx_5.shader_test @@ -9,6 +9,13 @@ float4 main() : sv_target return teChnique; } +[pixel shader fail todo] +float4 main() : sv_target +{ + float4 fxgroup = {0, 0, 0, 0}; + return fxgroup; +} + [pixel shader] float4 main() : sv_target { @@ -23,6 +30,13 @@ float4 main() : sv_target return teChnique11; } +[pixel shader] +float4 main() : sv_target +{ + float4 fxGroup = {0, 0, 0, 0}; + return fxGroup; +} + [effect todo] technique { @@ -101,6 +115,11 @@ technique11 { } +fxgroup group +{ + technique10 {} +} + [pixel shader todo] float4 main() : sv_target { @@ -118,3 +137,50 @@ technique10 technique11 { } + +fxgroup group +{ + technique10 {} +} + +% Groups syntax + +% Name has to be specified, it belongs to global scope +[effect fail] +fxgroup +{ +} + +% Group can't be empty +[effect fail] +fxgroup group +{ +} + +[effect fail] +float4 group; + +fxgroup group +{ +} + +% Groups can only contain a list of techniques +[effect fail] +fxgroup group +{ + float4 v; + + technique11 {} +} + +% Group provides scope for techniques +[effect todo] +fxgroup group1 +{ + technique11 tech0 {} +} + +fxgroup group2 +{ + technique11 tech0 {} +}

1 0

Giovanni Mascellani : vkd3d-shader/d3d-asm: Guess a sensible data type for literals.
by Alexandre Julliard 11 Jan '24

11 Jan '24

Module: vkd3d Branch: master Commit: 017f86aaaf562c07eeb3ff45f9e469492daac701 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/017f86aaaf562c07eeb3ff45f9e46… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Thu Nov 9 23:31:27 2023 +0100 vkd3d-shader/d3d-asm: Guess a sensible data type for literals. When the typing information is not reliable. --- libs/vkd3d-shader/d3d_asm.c | 60 +++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 55 insertions(+), 5 deletions(-) diff --git a/libs/vkd3d-shader/d3d_asm.c b/libs/vkd3d-shader/d3d_asm.c index 0589bc42..4829956c 100644 --- a/libs/vkd3d-shader/d3d_asm.c +++ b/libs/vkd3d-shader/d3d_asm.c @@ -365,6 +365,7 @@ struct vkd3d_d3d_asm_compiler struct vkd3d_shader_version shader_version; struct vkd3d_d3d_asm_colours colours; enum vsir_asm_dialect dialect; + const struct vkd3d_shader_instruction *current; }; static int VKD3D_PRINTF_FUNC(2, 3) shader_addline(struct vkd3d_string_buffer *buffer, const char *format, ...) @@ -841,6 +842,27 @@ static void shader_print_bool_literal(struct vkd3d_d3d_asm_compiler *compiler, compiler->colours.literal, b ? "true" : "false", compiler->colours.reset, suffix); } +static void shader_print_untyped_literal(struct vkd3d_d3d_asm_compiler *compiler, + const char *prefix, uint32_t u, const char *suffix) +{ + union + { + uint32_t u; + float f; + } value; + unsigned int exponent = (u >> 23) & 0xff; + + value.u = u; + + if (exponent != 0 && exponent != 0xff) + return shader_print_float_literal(compiler, prefix, value.f, suffix); + + if (u <= 10000) + return shader_print_uint_literal(compiler, prefix, value.u, suffix); + + return shader_print_hex_literal(compiler, prefix, value.u, suffix); +} + static void shader_print_subscript(struct vkd3d_d3d_asm_compiler *compiler, unsigned int offset, const struct vkd3d_shader_src_param *rel_addr) { @@ -1102,6 +1124,19 @@ static void shader_dump_register(struct vkd3d_d3d_asm_compiler *compiler, const if (reg->type == VKD3DSPR_IMMCONST) { + bool untyped = false; + + switch (compiler->current->handler_idx) + { + case VKD3DSIH_MOV: + case VKD3DSIH_MOVC: + untyped = true; + break; + + default: + break; + } + shader_addline(buffer, "%s(", compiler->colours.reset); switch (reg->dimension) { @@ -1109,7 +1144,10 @@ static void shader_dump_register(struct vkd3d_d3d_asm_compiler *compiler, const switch (reg->data_type) { case VKD3D_DATA_FLOAT: - shader_print_float_literal(compiler, "", reg->u.immconst_f32[0], ""); + if (untyped) + shader_print_untyped_literal(compiler, "", reg->u.immconst_u32[0], ""); + else + shader_print_float_literal(compiler, "", reg->u.immconst_f32[0], ""); break; case VKD3D_DATA_INT: shader_print_int_literal(compiler, "", reg->u.immconst_u32[0], ""); @@ -1129,10 +1167,20 @@ static void shader_dump_register(struct vkd3d_d3d_asm_compiler *compiler, const switch (reg->data_type) { case VKD3D_DATA_FLOAT: - shader_print_float_literal(compiler, "", reg->u.immconst_f32[0], ""); - shader_print_float_literal(compiler, ", ", reg->u.immconst_f32[1], ""); - shader_print_float_literal(compiler, ", ", reg->u.immconst_f32[2], ""); - shader_print_float_literal(compiler, ", ", reg->u.immconst_f32[3], ""); + if (untyped) + { + shader_print_untyped_literal(compiler, "", reg->u.immconst_u32[0], ""); + shader_print_untyped_literal(compiler, ", ", reg->u.immconst_u32[1], ""); + shader_print_untyped_literal(compiler, ", ", reg->u.immconst_u32[2], ""); + shader_print_untyped_literal(compiler, ", ", reg->u.immconst_u32[3], ""); + } + else + { + shader_print_float_literal(compiler, "", reg->u.immconst_f32[0], ""); + shader_print_float_literal(compiler, ", ", reg->u.immconst_f32[1], ""); + shader_print_float_literal(compiler, ", ", reg->u.immconst_f32[2], ""); + shader_print_float_literal(compiler, ", ", reg->u.immconst_f32[3], ""); + } break; case VKD3D_DATA_INT: shader_print_int_literal(compiler, "", reg->u.immconst_u32[0], ""); @@ -1678,6 +1726,8 @@ static void shader_dump_instruction(struct vkd3d_d3d_asm_compiler *compiler, struct vkd3d_string_buffer *buffer = &compiler->buffer; unsigned int i; + compiler->current = ins; + if (ins->predicate) { vkd3d_string_buffer_printf(buffer, "(");

1 0

Rémi Bernon : ntoskrnl.exe/tests: Use SUOI_FORCEDELETE when uninstalling the driver.
by Alexandre Julliard 10 Jan '24

10 Jan '24

Module: wine Branch: master Commit: 866f17c147e4d76b6dd14ad98030918c341cde38 URL: https://gitlab.winehq.org/wine/wine/-/commit/866f17c147e4d76b6dd14ad9803091… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Jan 10 11:23:30 2024 +0100 ntoskrnl.exe/tests: Use SUOI_FORCEDELETE when uninstalling the driver. Avoids conflicts with the dinput tests somehow. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52962 --- dlls/ntoskrnl.exe/tests/ntoskrnl.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntoskrnl.exe/tests/ntoskrnl.c b/dlls/ntoskrnl.exe/tests/ntoskrnl.c index 5a47523cf71..36983e2c8b8 100644 --- a/dlls/ntoskrnl.exe/tests/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/tests/ntoskrnl.c @@ -1874,7 +1874,7 @@ static void test_pnp_driver(struct testsign_context *ctx) GetFullPathNameA("winetest.inf", sizeof(path), path, NULL); ret = SetupCopyOEMInfA(path, NULL, 0, 0, dest, sizeof(dest), NULL, &filepart); ok(ret, "Failed to copy INF, error %#lx\n", GetLastError()); - ret = SetupUninstallOEMInfA(filepart, 0, NULL); + ret = SetupUninstallOEMInfA(filepart, SUOI_FORCEDELETE, NULL); ok(ret, "Failed to uninstall INF, error %lu\n", GetLastError()); ret = DeleteFileA("winetest.cat");

1 0

Hans Leidekker : wldap32/tests: Skip tests when the server can't be reached.
by Alexandre Julliard 10 Jan '24

10 Jan '24

Module: wine Branch: master Commit: 928d73d4ef94555cd977e420b5e9fea611e3b1c0 URL: https://gitlab.winehq.org/wine/wine/-/commit/928d73d4ef94555cd977e420b5e9fe… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Jan 10 11:28:29 2024 +0100 wldap32/tests: Skip tests when the server can't be reached. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=55784 --- dlls/wldap32/tests/parse.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/dlls/wldap32/tests/parse.c b/dlls/wldap32/tests/parse.c index 726b814081b..faf49622586 100644 --- a/dlls/wldap32/tests/parse.c +++ b/dlls/wldap32/tests/parse.c @@ -169,6 +169,12 @@ static void test_ldap_bind_sA( void ) } ret = ldap_connect( ld, NULL ); + if (ret == LDAP_SERVER_DOWN) + { + skip( "test server can't be reached\n" ); + ldap_unbind( ld ); + return; + } ok( !ret, "ldap_connect failed %#lx\n", ret ); ret = ldap_bind_sA( ld, (char *)"uid=winetest,ou=users,dc=debian,dc=org", (char *)"winetest", @@ -511,6 +517,12 @@ static void test_opt_ssl(void) ret = ldap_set_optionA( ld, LDAP_OPT_SSL, LDAP_OPT_ON ); ok( !ret, "ldap_set_optionA should succeed, got %#lx\n", ret ); ret = ldap_simple_bind_sA( ld, NULL, NULL ); + if (ret == LDAP_SERVER_DOWN) + { + skip( "test server can't be reached\n" ); + ldap_unbind( ld ); + return; + } todo_wine ok( ret == LDAP_PROTOCOL_ERROR, "ldap_simple_bind_sA should fail, got %#lx\n", ret ); ldap_unbind( ld );

1 0

Akihiro Sagawa : d3d9: Update presentation parameters when creating a swap chain.
by Alexandre Julliard 10 Jan '24

10 Jan '24

Module: wine Branch: master Commit: 98b053a5b8dcdfe2e3481a36cc156e71e2d5145e URL: https://gitlab.winehq.org/wine/wine/-/commit/98b053a5b8dcdfe2e3481a36cc156e… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Mon Jan 8 18:02:55 2024 +0900 d3d9: Update presentation parameters when creating a swap chain. Fixes regression introduced by 215a32d643af4a8e25d4f28c5bec76f6e69dca22. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=56070 --- dlls/d3d9/swapchain.c | 6 ++++++ dlls/d3d9/tests/d3d9ex.c | 6 +++--- dlls/d3d9/tests/device.c | 10 +++++----- 3 files changed, 14 insertions(+), 8 deletions(-) diff --git a/dlls/d3d9/swapchain.c b/dlls/d3d9/swapchain.c index 26c47f2c6ec..e87b8627ba3 100644 --- a/dlls/d3d9/swapchain.c +++ b/dlls/d3d9/swapchain.c @@ -370,6 +370,7 @@ static const struct wined3d_swapchain_state_parent_ops d3d9_swapchain_state_pare static HRESULT swapchain_init(struct d3d9_swapchain *swapchain, struct d3d9_device *device, struct wined3d_swapchain_desc *desc, unsigned int swap_interval) { + struct wined3d_swapchain_desc swapchain_desc; HRESULT hr; swapchain->refcount = 1; @@ -384,6 +385,11 @@ static HRESULT swapchain_init(struct d3d9_swapchain *swapchain, struct d3d9_devi return hr; } + wined3d_swapchain_get_desc(swapchain->wined3d_swapchain, &swapchain_desc); + desc->backbuffer_width = swapchain_desc.backbuffer_width; + desc->backbuffer_height = swapchain_desc.backbuffer_height; + desc->backbuffer_format = swapchain_desc.backbuffer_format; + swapchain->parent_device = &device->IDirect3DDevice9Ex_iface; IDirect3DDevice9Ex_AddRef(swapchain->parent_device); diff --git a/dlls/d3d9/tests/d3d9ex.c b/dlls/d3d9/tests/d3d9ex.c index 44d5edba63c..8e7eec13566 100644 --- a/dlls/d3d9/tests/d3d9ex.c +++ b/dlls/d3d9/tests/d3d9ex.c @@ -3851,11 +3851,11 @@ static void test_swapchain_parameters(void) window, D3DCREATE_SOFTWARE_VERTEXPROCESSING, &present_parameters, NULL, &device); - todo_wine ok(present_parameters.BackBufferWidth == client_rect.right, "Got unexpected BackBufferWidth %u, expected %ld.\n", + ok(present_parameters.BackBufferWidth == client_rect.right, "Got unexpected BackBufferWidth %u, expected %ld.\n", present_parameters.BackBufferWidth, client_rect.right); - todo_wine ok(present_parameters.BackBufferHeight == client_rect.bottom, "Got unexpected BackBufferHeight %u, expected %ld.\n", + ok(present_parameters.BackBufferHeight == client_rect.bottom, "Got unexpected BackBufferHeight %u, expected %ld.\n", present_parameters.BackBufferHeight, client_rect.bottom); - todo_wine ok(present_parameters.BackBufferFormat != D3DFMT_UNKNOWN, "Got unexpected BackBufferFormat %#x.\n", + ok(present_parameters.BackBufferFormat != D3DFMT_UNKNOWN, "Got unexpected BackBufferFormat %#x.\n", present_parameters.BackBufferFormat); ok(present_parameters.BackBufferCount == 1, "Got unexpected BackBufferCount %u.\n", present_parameters.BackBufferCount); ok(!present_parameters.MultiSampleType, "Got unexpected MultiSampleType %u.\n", present_parameters.MultiSampleType); diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index 5c08d35c93f..9d92b248dd9 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -1352,9 +1352,9 @@ static void test_swapchain(void) d3dpp.BackBufferCount = 0; hr = IDirect3DDevice9_CreateAdditionalSwapChain(device, &d3dpp, &swapchain1); ok(SUCCEEDED(hr), "Got hr %#lx.\n", hr); - todo_wine ok(d3dpp.BackBufferWidth == client_rect.right, "Got unexpected BackBufferWidth %u, expected %ld.\n", + ok(d3dpp.BackBufferWidth == client_rect.right, "Got unexpected BackBufferWidth %u, expected %ld.\n", d3dpp.BackBufferWidth, client_rect.right); - todo_wine ok(d3dpp.BackBufferHeight == client_rect.bottom, "Got unexpected BackBufferHeight %u, expected %ld.\n", + ok(d3dpp.BackBufferHeight == client_rect.bottom, "Got unexpected BackBufferHeight %u, expected %ld.\n", d3dpp.BackBufferHeight, client_rect.bottom); ok(d3dpp.BackBufferFormat == D3DFMT_A8R8G8B8, "Got unexpected BackBufferFormat %#x.\n", d3dpp.BackBufferFormat); ok(d3dpp.BackBufferCount == 1, "Got unexpected BackBufferCount %u.\n", d3dpp.BackBufferCount); @@ -12521,11 +12521,11 @@ static void test_swapchain_parameters(void) &present_parameters, &device); ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); - todo_wine ok(present_parameters.BackBufferWidth == client_rect.right, "Got unexpected BackBufferWidth %u, expected %ld.\n", + ok(present_parameters.BackBufferWidth == client_rect.right, "Got unexpected BackBufferWidth %u, expected %ld.\n", present_parameters.BackBufferWidth, client_rect.right); - todo_wine ok(present_parameters.BackBufferHeight == client_rect.bottom, "Got unexpected BackBufferHeight %u, expected %ld.\n", + ok(present_parameters.BackBufferHeight == client_rect.bottom, "Got unexpected BackBufferHeight %u, expected %ld.\n", present_parameters.BackBufferHeight, client_rect.bottom); - todo_wine ok(present_parameters.BackBufferFormat != D3DFMT_UNKNOWN, "Got unexpected BackBufferFormat %#x.\n", + ok(present_parameters.BackBufferFormat != D3DFMT_UNKNOWN, "Got unexpected BackBufferFormat %#x.\n", present_parameters.BackBufferFormat); ok(present_parameters.BackBufferCount == 1, "Got unexpected BackBufferCount %u.\n", present_parameters.BackBufferCount); ok(!present_parameters.MultiSampleType, "Got unexpected MultiSampleType %u.\n", present_parameters.MultiSampleType);

1 0

Akihiro Sagawa : d3d9/tests: Test the presentation parameters after creating an additional swap chain.
by Alexandre Julliard 10 Jan '24

10 Jan '24

Module: wine Branch: master Commit: 059b3ac77f404c9fd3d7225b03d91d1b2e10e427 URL: https://gitlab.winehq.org/wine/wine/-/commit/059b3ac77f404c9fd3d7225b03d91d… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Sun Dec 24 22:14:34 2023 +0900 d3d9/tests: Test the presentation parameters after creating an additional swap chain. --- dlls/d3d9/tests/device.c | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index 0af7f179df6..5c08d35c93f 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -1263,6 +1263,7 @@ static void test_swapchain(void) IDirect3DSurface9 *backbuffer, *stereo_buffer; D3DPRESENT_PARAMETERS d3dpp; IDirect3DDevice9 *device; + RECT client_rect; IDirect3D9 *d3d; ULONG refcount; HWND window, window2; @@ -1341,11 +1342,23 @@ static void test_swapchain(void) ok(swapchainX == NULL, "Swapchain 1 is %p\n", swapchainX); if(swapchainX) IDirect3DSwapChain9_Release(swapchainX); + memset(&d3dpp, 0, sizeof(d3dpp)); + d3dpp.Windowed = TRUE; + d3dpp.SwapEffect = D3DSWAPEFFECT_DISCARD; + d3dpp.BackBufferFormat = D3DFMT_A8R8G8B8; + GetClientRect(window, &client_rect); + /* Create a bunch of swapchains */ d3dpp.BackBufferCount = 0; hr = IDirect3DDevice9_CreateAdditionalSwapChain(device, &d3dpp, &swapchain1); ok(SUCCEEDED(hr), "Got hr %#lx.\n", hr); - ok(d3dpp.BackBufferCount == 1, "The back buffer count in the presentparams struct is %d\n", d3dpp.BackBufferCount); + todo_wine ok(d3dpp.BackBufferWidth == client_rect.right, "Got unexpected BackBufferWidth %u, expected %ld.\n", + d3dpp.BackBufferWidth, client_rect.right); + todo_wine ok(d3dpp.BackBufferHeight == client_rect.bottom, "Got unexpected BackBufferHeight %u, expected %ld.\n", + d3dpp.BackBufferHeight, client_rect.bottom); + ok(d3dpp.BackBufferFormat == D3DFMT_A8R8G8B8, "Got unexpected BackBufferFormat %#x.\n", d3dpp.BackBufferFormat); + ok(d3dpp.BackBufferCount == 1, "Got unexpected BackBufferCount %u.\n", d3dpp.BackBufferCount); + ok(!d3dpp.hDeviceWindow, "Got unexpected hDeviceWindow %p.\n", d3dpp.hDeviceWindow); d3dpp.hDeviceWindow = NULL; d3dpp.BackBufferCount = 1;

1 0

Akihiro Sagawa : d3d8/tests: Test the presentation parameters after creating an additional swap chain.
by Alexandre Julliard 10 Jan '24

10 Jan '24

Module: wine Branch: master Commit: 8eefd729ecb41b75eebf500cbfe85862172a6ddd URL: https://gitlab.winehq.org/wine/wine/-/commit/8eefd729ecb41b75eebf500cbfe858… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Sun Dec 24 22:14:34 2023 +0900 d3d8/tests: Test the presentation parameters after creating an additional swap chain. --- dlls/d3d8/tests/device.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/dlls/d3d8/tests/device.c b/dlls/d3d8/tests/device.c index ef3a429afe0..108895e4d02 100644 --- a/dlls/d3d8/tests/device.c +++ b/dlls/d3d8/tests/device.c @@ -410,7 +410,11 @@ static void test_swapchain(void) d3dpp.BackBufferCount = 0; hr = IDirect3DDevice8_CreateAdditionalSwapChain(device, &d3dpp, &swapchain1); ok(SUCCEEDED(hr), "Got hr %#lx.\n", hr); - ok(d3dpp.BackBufferCount == 1, "The back buffer count in the presentparams struct is %d\n", d3dpp.BackBufferCount); + ok(!d3dpp.BackBufferWidth, "Got unexpected BackBufferWidth %u.\n", d3dpp.BackBufferWidth); + ok(!d3dpp.BackBufferHeight, "Got unexpected BackBufferHeight %u.\n", d3dpp.BackBufferHeight); + ok(d3dpp.BackBufferFormat == D3DFMT_A8R8G8B8, "Got unexpected BackBufferFormat %#x.\n", d3dpp.BackBufferFormat); + ok(d3dpp.BackBufferCount == 1, "Got unexpected BackBufferCount %u.\n", d3dpp.BackBufferCount); + ok(!d3dpp.hDeviceWindow, "Got unexpected hDeviceWindow %p.\n", d3dpp.hDeviceWindow); d3dpp.hDeviceWindow = NULL; d3dpp.BackBufferCount = 1;

1 0

← Newer
1
...
59
60
61
62
63
64
65
...
72
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits January 2024