March 2024 - Wine-commits - list.winehq.org

Alexandre Julliard : widl: Fix method number for call_as functions.
by Alexandre Julliard 28 Mar '24

28 Mar '24

Module: wine Branch: master Commit: dd68561c4a7ddef876f051b4af146c6c66568d93 URL: https://gitlab.winehq.org/wine/wine/-/commit/dd68561c4a7ddef876f051b4af146c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Mar 28 15:44:25 2024 +0100 widl: Fix method number for call_as functions. --- tools/widl/header.h | 1 + tools/widl/proxy.c | 2 +- tools/widl/typegen.c | 6 +++++- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/tools/widl/header.h b/tools/widl/header.h index 045eb59b000..ae06d92bfa8 100644 --- a/tools/widl/header.h +++ b/tools/widl/header.h @@ -34,6 +34,7 @@ extern int needs_space_after(type_t *t); extern int is_object(const type_t *iface); extern int is_local(const attr_list_t *list); extern int count_methods(const type_t *iface); +extern const statement_t * get_callas_source(const type_t *iface, const var_t *def); extern int need_stub(const type_t *iface); extern int need_proxy(const type_t *iface); extern int need_inline_stubs(const type_t *iface); diff --git a/tools/widl/proxy.c b/tools/widl/proxy.c index 8fed948d8de..30a4939ef5d 100644 --- a/tools/widl/proxy.c +++ b/tools/widl/proxy.c @@ -464,7 +464,7 @@ int count_methods(const type_t *iface) return count; } -static const statement_t * get_callas_source(const type_t * iface, const var_t * def) +const statement_t *get_callas_source(const type_t *iface, const var_t *def) { const statement_t * source; STATEMENTS_FOR_EACH_FUNC( source, type_iface_get_stmts(iface)) { diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c index 2af08d87081..3658f779857 100644 --- a/tools/widl/typegen.c +++ b/tools/widl/typegen.c @@ -1598,7 +1598,11 @@ static void write_iface_procformatstring(type_t *iface, FILE *file, int indent, STATEMENTS_FOR_EACH_FUNC(stmt, type_iface_get_stmts(iface)) { var_t *func = stmt->u.var; - if (is_local(func->attrs)) continue; + if (is_local(func->attrs)) + { + if (!get_callas_source(iface, func)) count++; + continue; + } write_procformatstring_func( file, indent, iface, func, offset, count++ ); } }

1 0

Alexandre Julliard : widl: Don't output the explicit handle argument.
by Alexandre Julliard 28 Mar '24

28 Mar '24

Module: wine Branch: master Commit: 53bb4117acfec085c59ede50728fd8225987a06d URL: https://gitlab.winehq.org/wine/wine/-/commit/53bb4117acfec085c59ede50728fd8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Mar 28 09:55:33 2024 +0100 widl: Don't output the explicit handle argument. --- tools/widl/typegen.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c index 824ba5d4a89..2af08d87081 100644 --- a/tools/widl/typegen.c +++ b/tools/widl/typegen.c @@ -1044,11 +1044,7 @@ static unsigned char get_parameter_fc( const var_t *var, int is_return, unsigned case TGT_BASIC: *flags |= IsBasetype; fc = get_basic_fc_signed( var->declspec.type ); - if (fc == FC_BIND_PRIMITIVE) - { - buffer_size = 4; /* actually 0 but avoids setting MustSize */ - fc = FC_LONG; - } + if (fc == FC_BIND_PRIMITIVE) buffer_size = 4; /* actually 0 but avoids setting MustSize */ break; case TGT_ENUM: *flags |= IsBasetype; @@ -1420,6 +1416,7 @@ static void write_proc_func_interp( FILE *file, int indent, const type_t *iface, print_file( file, indent, "NdrFcShort(0x%hx),\t/* stack offset = %hu */\n", handle_stack_offset, handle_stack_offset ); *offset += 4; + nb_args--; break; case FC_BIND_GENERIC: handle_flags = type_memsize( handle_var->declspec.type ); @@ -1493,6 +1490,11 @@ static void write_proc_func_interp( FILE *file, int indent, const type_t *iface, /* emit argument data */ if (args) LIST_FOR_EACH_ENTRY( var, args, var_t, entry ) { + if (explicit_fc == FC_BIND_PRIMITIVE && var == handle_var) + { + stack_offset += pointer_size; + continue; + } print_file( file, 0, "/* %u (parameter %s) */\n", *offset, var->name ); *offset += write_new_procformatstring_type(file, indent, var, FALSE, &stack_offset); }

1 0

Nikolay Sivov : vkd3d-shader/fx: Zero-pad strings when aligning them for fx_2_0.
by Alexandre Julliard 27 Mar '24

27 Mar '24

Module: vkd3d Branch: master Commit: 501aed43f3233eece618f5dce725a2dc631f1d88 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/501aed43f3233eece618f5dce725a… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Mar 11 18:56:50 2024 +0100 vkd3d-shader/fx: Zero-pad strings when aligning them for fx_2_0. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- libs/vkd3d-shader/fx.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/libs/vkd3d-shader/fx.c b/libs/vkd3d-shader/fx.c index 1a083ab7..49eea92d 100644 --- a/libs/vkd3d-shader/fx.c +++ b/libs/vkd3d-shader/fx.c @@ -611,11 +611,15 @@ static uint32_t write_fx_2_string(const char *string, struct fx_write_context *f { struct vkd3d_bytecode_buffer *buffer = &fx->unstructured; const char *s = string ? string : ""; + static const char tail[3]; uint32_t size, offset; size = strlen(s) + 1; offset = put_u32(buffer, size); bytecode_put_bytes(buffer, s, size); + size %= 4; + if (size) + bytecode_put_bytes_unaligned(buffer, tail, 4 - size); return offset; }

1 0

Nikolay Sivov : vkd3d-shader/fx: Set initial object count to 1 for fx_2_0.
by Alexandre Julliard 27 Mar '24

27 Mar '24

Module: vkd3d Branch: master Commit: 88d9cff4072d48b18a378c22ecdff904a7a134a5 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/88d9cff4072d48b18a378c22ecdff… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Mar 13 11:37:17 2024 +0100 vkd3d-shader/fx: Set initial object count to 1 for fx_2_0. This is used for the object table at runtime. Object variable index is 1-based. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- libs/vkd3d-shader/fx.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/libs/vkd3d-shader/fx.c b/libs/vkd3d-shader/fx.c index 49eea92d..ce47867b 100644 --- a/libs/vkd3d-shader/fx.c +++ b/libs/vkd3d-shader/fx.c @@ -811,12 +811,13 @@ static const struct fx_write_context_ops fx_2_ops = static int hlsl_fx_2_write(struct hlsl_ctx *ctx, struct vkd3d_shader_code *out) { - uint32_t offset, size, technique_count, parameter_count; + uint32_t offset, size, technique_count, parameter_count, object_count; struct vkd3d_bytecode_buffer buffer = { 0 }; struct vkd3d_bytecode_buffer *structured; struct fx_write_context fx; fx_write_context_init(ctx, &fx_2_ops, &fx); + fx.object_variable_count = 1; structured = &fx.structured; /* First entry is always zeroed and skipped. */ @@ -828,10 +829,11 @@ static int hlsl_fx_2_write(struct hlsl_ctx *ctx, struct vkd3d_shader_code *out) parameter_count = put_u32(structured, 0); /* Parameter count */ technique_count = put_u32(structured, 0); put_u32(structured, 0); /* Unknown */ - put_u32(structured, 0); /* Object count */ + object_count = put_u32(structured, 0); write_fx_2_parameters(&fx); set_u32(structured, parameter_count, fx.parameter_count); + set_u32(structured, object_count, fx.object_variable_count); write_techniques(ctx->globals, &fx); set_u32(structured, technique_count, fx.technique_count);

1 0

Nikolay Sivov : tests: Rename effect test files to make them easier to find.
by Alexandre Julliard 27 Mar '24

27 Mar '24

Module: vkd3d Branch: master Commit: 3fdf674a4dd82fba81f02a2942bbaa78d071b2ec URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/3fdf674a4dd82fba81f02a2942bba… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Mar 19 09:21:41 2024 +0100 tests: Rename effect test files to make them easier to find. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- Makefile.am | 6 +++--- ...technique-fx_2.shader_test => effect-technique-fx_2.shader_test} | 0 ...technique-fx_4.shader_test => effect-technique-fx_4.shader_test} | 0 ...technique-fx_5.shader_test => effect-technique-fx_5.shader_test} | 0 4 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Makefile.am b/Makefile.am index 3b3ddbea..01e94fa8 100644 --- a/Makefile.am +++ b/Makefile.am @@ -93,6 +93,9 @@ vkd3d_shader_tests = \ tests/hlsl/duplicate-modifiers.shader_test \ tests/hlsl/effect-shader-objects-fx_2.shader_test \ tests/hlsl/effect-shader-objects-fx_5.shader_test \ + tests/hlsl/effect-technique-fx_2.shader_test \ + tests/hlsl/effect-technique-fx_4.shader_test \ + tests/hlsl/effect-technique-fx_5.shader_test \ tests/hlsl/entry-point-semantics.shader_test \ tests/hlsl/exp.shader_test \ tests/hlsl/expr-indexing.shader_test \ @@ -192,9 +195,6 @@ vkd3d_shader_tests = \ tests/hlsl/swizzle-constant-prop.shader_test \ tests/hlsl/swizzle-matrix.shader_test \ tests/hlsl/swizzles.shader_test \ - tests/hlsl/technique-fx_2.shader_test \ - tests/hlsl/technique-fx_4.shader_test \ - tests/hlsl/technique-fx_5.shader_test \ tests/hlsl/ternary.shader_test \ tests/hlsl/texture-load-offset.shader_test \ tests/hlsl/texture-load-typed.shader_test \ diff --git a/tests/hlsl/technique-fx_2.shader_test b/tests/hlsl/effect-technique-fx_2.shader_test similarity index 100% rename from tests/hlsl/technique-fx_2.shader_test rename to tests/hlsl/effect-technique-fx_2.shader_test diff --git a/tests/hlsl/technique-fx_4.shader_test b/tests/hlsl/effect-technique-fx_4.shader_test similarity index 100% rename from tests/hlsl/technique-fx_4.shader_test rename to tests/hlsl/effect-technique-fx_4.shader_test diff --git a/tests/hlsl/technique-fx_5.shader_test b/tests/hlsl/effect-technique-fx_5.shader_test similarity index 100% rename from tests/hlsl/technique-fx_5.shader_test rename to tests/hlsl/effect-technique-fx_5.shader_test

1 0

Nikolay Sivov : vkd3d-shader/fx: Handle "half" type for fx_2_0 parameters.
by Alexandre Julliard 27 Mar '24

27 Mar '24

Module: vkd3d Branch: master Commit: 9117629e353f02bec1273ea4844c9356d35fde83 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/9117629e353f02bec1273ea4844c9… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Mar 19 09:28:45 2024 +0100 vkd3d-shader/fx: Handle "half" type for fx_2_0 parameters. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- Makefile.am | 1 + libs/vkd3d-shader/fx.c | 1 + tests/hlsl/effect-variables-fx_2.shader_test | 11 +++++++++++ 3 files changed, 13 insertions(+) diff --git a/Makefile.am b/Makefile.am index 01e94fa8..68e8642e 100644 --- a/Makefile.am +++ b/Makefile.am @@ -96,6 +96,7 @@ vkd3d_shader_tests = \ tests/hlsl/effect-technique-fx_2.shader_test \ tests/hlsl/effect-technique-fx_4.shader_test \ tests/hlsl/effect-technique-fx_5.shader_test \ + tests/hlsl/effect-variables-fx_2.shader_test \ tests/hlsl/entry-point-semantics.shader_test \ tests/hlsl/exp.shader_test \ tests/hlsl/expr-indexing.shader_test \ diff --git a/libs/vkd3d-shader/fx.c b/libs/vkd3d-shader/fx.c index ce47867b..0bc5a8c3 100644 --- a/libs/vkd3d-shader/fx.c +++ b/libs/vkd3d-shader/fx.c @@ -643,6 +643,7 @@ static uint32_t write_fx_2_parameter(const struct hlsl_type *type, const char *n switch (type->base_type) { + case HLSL_TYPE_HALF: case HLSL_TYPE_FLOAT: case HLSL_TYPE_BOOL: case HLSL_TYPE_INT: diff --git a/tests/hlsl/effect-variables-fx_2.shader_test b/tests/hlsl/effect-variables-fx_2.shader_test new file mode 100644 index 00000000..ab992253 --- /dev/null +++ b/tests/hlsl/effect-variables-fx_2.shader_test @@ -0,0 +1,11 @@ +[require] +shader model < 3.0 + +[effect] +bool _bool; +float _float; +half _half; + +technique +{ +}

1 0

Nikolay Sivov : vkd3d-shader/fx: Handle "uint" type for fx_2_0 parameters.
by Alexandre Julliard 27 Mar '24

27 Mar '24

Module: vkd3d Branch: master Commit: 17dc23269e7932f21a68751ea1b3c4141a199802 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/17dc23269e7932f21a68751ea1b3c… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Mar 19 09:31:01 2024 +0100 vkd3d-shader/fx: Handle "uint" type for fx_2_0 parameters. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- libs/vkd3d-shader/fx.c | 1 + tests/hlsl/effect-variables-fx_2.shader_test | 2 ++ 2 files changed, 3 insertions(+) diff --git a/libs/vkd3d-shader/fx.c b/libs/vkd3d-shader/fx.c index 0bc5a8c3..75fa3a3f 100644 --- a/libs/vkd3d-shader/fx.c +++ b/libs/vkd3d-shader/fx.c @@ -647,6 +647,7 @@ static uint32_t write_fx_2_parameter(const struct hlsl_type *type, const char *n case HLSL_TYPE_FLOAT: case HLSL_TYPE_BOOL: case HLSL_TYPE_INT: + case HLSL_TYPE_UINT: case HLSL_TYPE_VOID: break; default: diff --git a/tests/hlsl/effect-variables-fx_2.shader_test b/tests/hlsl/effect-variables-fx_2.shader_test index ab992253..570d855a 100644 --- a/tests/hlsl/effect-variables-fx_2.shader_test +++ b/tests/hlsl/effect-variables-fx_2.shader_test @@ -5,6 +5,8 @@ shader model < 3.0 bool _bool; float _float; half _half; +int _int; +uint _uint; technique {

1 0

Nikolay Sivov : vkd3d-shader/hlsl: Treat "texture" type name as case-insensitive.
by Alexandre Julliard 27 Mar '24

27 Mar '24

Module: vkd3d Branch: master Commit: b09f91967300acaa834aa29ac4f66c116cadd1ee URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/b09f91967300acaa834aa29ac4f66… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Mar 19 10:16:35 2024 +0100 vkd3d-shader/hlsl: Treat "texture" type name as case-insensitive. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- libs/vkd3d-shader/hlsl.c | 3 ++- tests/hlsl/type-names.shader_test | 12 ++++++++++++ 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/libs/vkd3d-shader/hlsl.c b/libs/vkd3d-shader/hlsl.c index a82334e5..147b86f5 100644 --- a/libs/vkd3d-shader/hlsl.c +++ b/libs/vkd3d-shader/hlsl.c @@ -785,6 +785,7 @@ static const char * get_case_insensitive_typename(const char *name) "float", "matrix", "pixelshader", + "texture", "vector", "vertexshader", }; @@ -3408,7 +3409,7 @@ static void declare_predefined_types(struct hlsl_ctx *ctx) {"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}, + {"texture", HLSL_CLASS_OBJECT, HLSL_TYPE_TEXTURE, 1, 1}, {"pixelshader", HLSL_CLASS_OBJECT, HLSL_TYPE_PIXELSHADER, 1, 1}, {"vertexshader", HLSL_CLASS_OBJECT, HLSL_TYPE_VERTEXSHADER, 1, 1}, {"RenderTargetView",HLSL_CLASS_OBJECT, HLSL_TYPE_RENDERTARGETVIEW, 1, 1}, diff --git a/tests/hlsl/type-names.shader_test b/tests/hlsl/type-names.shader_test index 2f9d7fef..2cf82dbb 100644 --- a/tests/hlsl/type-names.shader_test +++ b/tests/hlsl/type-names.shader_test @@ -112,3 +112,15 @@ float4 main() : sv_target { return float4(0, 0, 0, 0); } + +[pixel shader fail(sm>=6)] +typedef float4 texturE; +Texture tex1; +texture tex2; +teXture tex3; +texturE var; + +float4 main() : sv_target +{ + return var; +}

1 0

Nikolay Sivov : vkd3d-shader/fx: Accept texture types when writing fx_2_0 effects.
by Alexandre Julliard 27 Mar '24

27 Mar '24

Module: vkd3d Branch: master Commit: b382d1843dd5bfb29f7c91adb65a48cd5dbd3858 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/b382d1843dd5bfb29f7c91adb65a4… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Mar 19 10:46:31 2024 +0100 vkd3d-shader/fx: Accept texture types when writing fx_2_0 effects. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- libs/vkd3d-shader/fx.c | 44 ++++++++++++++++++++++++++++ tests/hlsl/effect-variables-fx_2.shader_test | 13 ++++++++ 2 files changed, 57 insertions(+) diff --git a/libs/vkd3d-shader/fx.c b/libs/vkd3d-shader/fx.c index 75fa3a3f..9424a568 100644 --- a/libs/vkd3d-shader/fx.c +++ b/libs/vkd3d-shader/fx.c @@ -649,6 +649,7 @@ static uint32_t write_fx_2_parameter(const struct hlsl_type *type, const char *n case HLSL_TYPE_INT: case HLSL_TYPE_UINT: case HLSL_TYPE_VOID: + case HLSL_TYPE_TEXTURE: break; default: hlsl_fixme(ctx, &ctx->location, "Writing parameter type %u is not implemented.", @@ -772,6 +773,46 @@ static uint32_t write_fx_2_initial_value(const struct hlsl_ir_var *var, struct f return offset; } +static bool is_type_supported_fx_2(const struct hlsl_type *type) +{ + type = hlsl_get_multiarray_element_type(type); + + if (type->class == HLSL_CLASS_STRUCT) + return true; + + switch (type->base_type) + { + case HLSL_TYPE_FLOAT: + case HLSL_TYPE_HALF: + case HLSL_TYPE_DOUBLE: + case HLSL_TYPE_INT: + case HLSL_TYPE_UINT: + case HLSL_TYPE_BOOL: + case HLSL_TYPE_PIXELSHADER: + case HLSL_TYPE_VERTEXSHADER: + case HLSL_TYPE_STRING: + return true; + case HLSL_TYPE_TEXTURE: + case HLSL_TYPE_SAMPLER: + switch (type->sampler_dim) + { + case HLSL_SAMPLER_DIM_1D: + case HLSL_SAMPLER_DIM_2D: + case HLSL_SAMPLER_DIM_3D: + case HLSL_SAMPLER_DIM_CUBE: + case HLSL_SAMPLER_DIM_GENERIC: + return true; + default: + ; + } + break; + default: + return false; + } + + return false; +} + static void write_fx_2_parameters(struct fx_write_context *fx) { struct vkd3d_bytecode_buffer *buffer = &fx->structured; @@ -785,6 +826,9 @@ static void write_fx_2_parameters(struct fx_write_context *fx) LIST_FOR_EACH_ENTRY(var, &ctx->extern_vars, struct hlsl_ir_var, extern_entry) { + if (!is_type_supported_fx_2(var->data_type)) + continue; + desc_offset = write_fx_2_parameter(var->data_type, var->name, &var->semantic, fx); value_offset = write_fx_2_initial_value(var, fx); diff --git a/tests/hlsl/effect-variables-fx_2.shader_test b/tests/hlsl/effect-variables-fx_2.shader_test index 570d855a..8e9fd4d5 100644 --- a/tests/hlsl/effect-variables-fx_2.shader_test +++ b/tests/hlsl/effect-variables-fx_2.shader_test @@ -11,3 +11,16 @@ uint _uint; technique { } + +[effect] +Texture tex1; +texture tex2; +teXture tex3; +Texture2DMS<float4, 4> tex4; +Texture1D tex5; +Texture2D tex6; +Texture3D tex7; + +technique +{ +}

1 0

Zebediah Figura : vkd3d-shader: Add a compile option to control whether implicit truncation warnings are printed.
by Alexandre Julliard 27 Mar '24

27 Mar '24

Module: vkd3d Branch: master Commit: 6b6e4bc212326986801a45c5fd6cb41bf0f1bb82 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/6b6e4bc212326986801a45c5fd6cb… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Mar 19 23:06:07 2024 -0500 vkd3d-shader: Add a compile option to control whether implicit truncation warnings are printed. d3dcompiler and d3dx9 versions before 42 don't emit this error; this will be necessary to emulate that behaviour. Other warnings exist that are introduced in different d3dcompiler versions, although there are not very many distinct HLSL warnings to begin with. We could of course group all these together under a single compiler option, but I find that using separate top-level options is unilaterally friendlier to an API consumer, and simpler to implement as well. It also in some sense maps conceptually to e.g. "-Wno-implicit-conversion". --- include/vkd3d_shader.h | 11 ++++++++++ libs/vkd3d-shader/hlsl.c | 37 ++++++++++++++++++++++------------ libs/vkd3d-shader/hlsl.h | 1 + libs/vkd3d-shader/hlsl.y | 2 +- tests/vkd3d_shader_api.c | 52 ++++++++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 89 insertions(+), 14 deletions(-) diff --git a/include/vkd3d_shader.h b/include/vkd3d_shader.h index 0cd2a861..0ce2ef67 100644 --- a/include/vkd3d_shader.h +++ b/include/vkd3d_shader.h @@ -310,6 +310,17 @@ enum vkd3d_shader_compile_option_name * \since 1.12 */ VKD3D_SHADER_COMPILE_OPTION_CHILD_EFFECT = 0x0000000b, + /** + * If \a value is nonzero, emit a compile warning warn when vectors or + * matrices are truncated in an implicit conversion. + * If warnings are disabled, this option has no effect. + * This option has no effects for targets other than HLSL. + * + * The default value is nonzero, i.e. enable implicit truncation warnings. + * + * \since 1.12 + */ + VKD3D_SHADER_COMPILE_OPTION_WARN_IMPLICIT_TRUNCATION = 0x0000000c, VKD3D_FORCE_32_BIT_ENUM(VKD3D_SHADER_COMPILE_OPTION_NAME), }; diff --git a/libs/vkd3d-shader/hlsl.c b/libs/vkd3d-shader/hlsl.c index 147b86f5..cba954c9 100644 --- a/libs/vkd3d-shader/hlsl.c +++ b/libs/vkd3d-shader/hlsl.c @@ -3593,24 +3593,35 @@ static bool hlsl_ctx_init(struct hlsl_ctx *ctx, const struct vkd3d_shader_compil return false; ctx->cur_buffer = ctx->globals_buffer; + ctx->warn_implicit_truncation = true; + for (i = 0; i < compile_info->option_count; ++i) { const struct vkd3d_shader_compile_option *option = &compile_info->options[i]; - if (option->name == VKD3D_SHADER_COMPILE_OPTION_PACK_MATRIX_ORDER) - { - if (option->value == VKD3D_SHADER_COMPILE_OPTION_PACK_MATRIX_ROW_MAJOR) - ctx->matrix_majority = HLSL_MODIFIER_ROW_MAJOR; - else if (option->value == VKD3D_SHADER_COMPILE_OPTION_PACK_MATRIX_COLUMN_MAJOR) - ctx->matrix_majority = HLSL_MODIFIER_COLUMN_MAJOR; - } - else if (option->name == VKD3D_SHADER_COMPILE_OPTION_BACKWARD_COMPATIBILITY) - { - ctx->semantic_compat_mapping = option->value & VKD3D_SHADER_COMPILE_OPTION_BACKCOMPAT_MAP_SEMANTIC_NAMES; - } - else if (option->name == VKD3D_SHADER_COMPILE_OPTION_CHILD_EFFECT) + switch (option->name) { - ctx->child_effect = !!option->value; + case VKD3D_SHADER_COMPILE_OPTION_PACK_MATRIX_ORDER: + if (option->value == VKD3D_SHADER_COMPILE_OPTION_PACK_MATRIX_ROW_MAJOR) + ctx->matrix_majority = HLSL_MODIFIER_ROW_MAJOR; + else if (option->value == VKD3D_SHADER_COMPILE_OPTION_PACK_MATRIX_COLUMN_MAJOR) + ctx->matrix_majority = HLSL_MODIFIER_COLUMN_MAJOR; + break; + + case VKD3D_SHADER_COMPILE_OPTION_BACKWARD_COMPATIBILITY: + ctx->semantic_compat_mapping = option->value & VKD3D_SHADER_COMPILE_OPTION_BACKCOMPAT_MAP_SEMANTIC_NAMES; + break; + + case VKD3D_SHADER_COMPILE_OPTION_CHILD_EFFECT: + ctx->child_effect = option->value; + break; + + case VKD3D_SHADER_COMPILE_OPTION_WARN_IMPLICIT_TRUNCATION: + ctx->warn_implicit_truncation = option->value; + break; + + default: + break; } } diff --git a/libs/vkd3d-shader/hlsl.h b/libs/vkd3d-shader/hlsl.h index 93ec67d0..64111f3f 100644 --- a/libs/vkd3d-shader/hlsl.h +++ b/libs/vkd3d-shader/hlsl.h @@ -925,6 +925,7 @@ struct hlsl_ctx bool semantic_compat_mapping; bool child_effect; + bool warn_implicit_truncation; }; struct hlsl_resource_load_params diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index 2824e26d..52c21765 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -413,7 +413,7 @@ static struct hlsl_ir_node *add_implicit_conversion(struct hlsl_ctx *ctx, struct return NULL; } - if (dst_type->dimx * dst_type->dimy < src_type->dimx * src_type->dimy) + if (dst_type->dimx * dst_type->dimy < src_type->dimx * src_type->dimy && ctx->warn_implicit_truncation) hlsl_warning(ctx, loc, VKD3D_SHADER_WARNING_HLSL_IMPLICIT_TRUNCATION, "Implicit truncation of %s type.", src_type->class == HLSL_CLASS_VECTOR ? "vector" : "matrix"); diff --git a/tests/vkd3d_shader_api.c b/tests/vkd3d_shader_api.c index 1dc1a313..d3aa2e52 100644 --- a/tests/vkd3d_shader_api.c +++ b/tests/vkd3d_shader_api.c @@ -1642,6 +1642,57 @@ static void test_emit_signature(void) } } +static void test_warning_options(void) +{ + struct vkd3d_shader_hlsl_source_info hlsl_info = {.type = VKD3D_SHADER_STRUCTURE_TYPE_HLSL_SOURCE_INFO}; + struct vkd3d_shader_compile_info info = {.type = VKD3D_SHADER_STRUCTURE_TYPE_COMPILE_INFO}; + struct vkd3d_shader_compile_option options[1]; + struct vkd3d_shader_code d3dbc; + char *messages; + int rc; + + static const char ps_source[] = + "float4 main(uniform float4 u) : color\n" + "{\n" + " float3 x = u;\n" + " return 0;\n" + "}\n"; + + hlsl_info.profile = "ps_2_0"; + + info.next = &hlsl_info; + info.source.code = ps_source; + info.source.size = ARRAY_SIZE(ps_source); + info.source_type = VKD3D_SHADER_SOURCE_HLSL; + info.target_type = VKD3D_SHADER_TARGET_D3D_BYTECODE; + info.log_level = VKD3D_SHADER_LOG_INFO; + + rc = vkd3d_shader_compile(&info, &d3dbc, &messages); + ok(rc == VKD3D_OK, "Got rc %d.\n", rc); + ok(messages, "Expected messages.\n"); + vkd3d_shader_free_shader_code(&d3dbc); + vkd3d_shader_free_messages(messages); + + info.options = options; + info.option_count = ARRAY_SIZE(options); + options[0].name = VKD3D_SHADER_COMPILE_OPTION_WARN_IMPLICIT_TRUNCATION; + options[0].value = 0; + + rc = vkd3d_shader_compile(&info, &d3dbc, &messages); + ok(rc == VKD3D_OK, "Got rc %d.\n", rc); + ok(!messages, "Expected no messages.\n"); + vkd3d_shader_free_shader_code(&d3dbc); + vkd3d_shader_free_messages(messages); + + options[0].value = 1; + + rc = vkd3d_shader_compile(&info, &d3dbc, &messages); + ok(rc == VKD3D_OK, "Got rc %d.\n", rc); + ok(messages, "Expected messages.\n"); + vkd3d_shader_free_shader_code(&d3dbc); + vkd3d_shader_free_messages(messages); +} + START_TEST(vkd3d_shader_api) { setlocale(LC_ALL, ""); @@ -1656,4 +1707,5 @@ START_TEST(vkd3d_shader_api) run_test(test_build_varying_map); run_test(test_scan_combined_resource_samplers); run_test(test_emit_signature); + run_test(test_warning_options); }

1 0