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

Nikolay Sivov : vkd3d-shader/fx: Fail effect writing on unsupported annotations.
by Alexandre Julliard 18 Mar '24

18 Mar '24

Module: vkd3d Branch: master Commit: f55b152811a73cc66143cc291b3fb10d6fda1d4a URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/f55b152811a73cc66143cc291b3fb… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Mar 14 13:49:14 2024 +0100 vkd3d-shader/fx: Fail effect writing on unsupported annotations. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- libs/vkd3d-shader/fx.c | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/libs/vkd3d-shader/fx.c b/libs/vkd3d-shader/fx.c index fe1a350a..f2be00da 100644 --- a/libs/vkd3d-shader/fx.c +++ b/libs/vkd3d-shader/fx.c @@ -102,6 +102,11 @@ static void set_status(struct fx_write_context *fx, int status) fx->status = status; } +static bool has_annotations(const struct hlsl_ir_var *var) +{ + return var->annotations && !list_empty(&var->annotations->vars); +} + static uint32_t write_string(const char *string, struct fx_write_context *fx) { return fx->ops->write_string(string, fx); @@ -765,9 +770,10 @@ static void write_fx_2_parameters(struct fx_write_context *fx) { struct vkd3d_bytecode_buffer *buffer = &fx->structured; uint32_t desc_offset, value_offset; + struct hlsl_ctx *ctx = fx->ctx; struct hlsl_ir_var *var; - LIST_FOR_EACH_ENTRY(var, &fx->ctx->extern_vars, struct hlsl_ir_var, extern_entry) + LIST_FOR_EACH_ENTRY(var, &ctx->extern_vars, struct hlsl_ir_var, extern_entry) { desc_offset = write_fx_2_parameter(var->data_type, var->name, &var->semantic, fx); value_offset = write_fx_2_initial_value(var, fx); @@ -777,7 +783,8 @@ static void write_fx_2_parameters(struct fx_write_context *fx) put_u32(buffer, 0); /* Flags */ put_u32(buffer, 0); /* Annotations count */ - /* FIXME: write annotations */ + if (has_annotations(var)) + hlsl_fixme(ctx, &ctx->location, "Writing annotations for parameters is not implemented."); ++fx->parameter_count; } @@ -864,6 +871,7 @@ static void write_fx_4_numeric_variable(struct hlsl_ir_var *var, struct fx_write { HAS_EXPLICIT_BIND_POINT = 0x4, }; + struct hlsl_ctx *ctx = fx->ctx; /* Explicit bind point. */ if (var->reg_reservation.reg_type) @@ -882,7 +890,8 @@ static void write_fx_4_numeric_variable(struct hlsl_ir_var *var, struct fx_write put_u32(buffer, flags); /* Flags */ put_u32(buffer, 0); /* Annotations count */ - /* FIXME: write annotations */ + if (has_annotations(var)) + hlsl_fixme(ctx, &ctx->location, "Writing annotations for numeric variables is not implemented."); } static void write_fx_4_object_variable(struct hlsl_ir_var *var, struct fx_write_context *fx) @@ -933,7 +942,8 @@ static void write_fx_4_object_variable(struct hlsl_ir_var *var, struct fx_write_ } put_u32(buffer, 0); /* Annotations count */ - /* FIXME: write annotations */ + if (has_annotations(var)) + hlsl_fixme(ctx, &ctx->location, "Writing annotations for object variables is not implemented."); ++fx->object_variable_count; }

1 0

Conor McCarthy : tests/hlsl: Add tests for mad() and fma().
by Alexandre Julliard 18 Mar '24

18 Mar '24

Module: vkd3d Branch: master Commit: 08cc5027cf4723139206ff25473b20589f962be3 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/08cc5027cf4723139206ff25473b2… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Fri Mar 15 12:40:26 2024 +1000 tests/hlsl: Add tests for mad() and fma(). --- tests/hlsl/arithmetic-float-uniform.shader_test | 47 +++++++++++++++++++++++++ 1 file changed, 47 insertions(+) diff --git a/tests/hlsl/arithmetic-float-uniform.shader_test b/tests/hlsl/arithmetic-float-uniform.shader_test index 38e37b3f..506375eb 100644 --- a/tests/hlsl/arithmetic-float-uniform.shader_test +++ b/tests/hlsl/arithmetic-float-uniform.shader_test @@ -91,6 +91,38 @@ uniform 0 float4 1.0 0.0 0.0 0.0 draw quad probe all rgba (1e99, 1e99, 1e99, 1e99) +[pixel shader todo] +uniform float4 a, b, c; + +float4 main() : sv_target +{ + return mad(a, b, c); +} + +[test] +uniform 0 float4 1.00000007 -42.1 4.0 45.0 +uniform 4 float4 1.625 -5.0 4.125 5.0 +uniform 8 float4 1.00000007 -1.0 0.5 -0.5 +todo draw quad +probe all rgba (2.62500024, 209.5, 17.0, 224.5) 1 + +% precise mad() is not allowed to fuse, even though unfused is less precise. +[pixel shader todo] +uniform float4 a, b, c; + +float4 main() : sv_target +{ + precise float4 ret = mad(a, b, c); + return ret; +} + +[test] +uniform 0 float4 1.00000007 -42.1 4.0 45.0 +uniform 4 float4 1.625 -5.0 4.125 5.0 +uniform 8 float4 1.00000007 -1.0 0.5 -0.5 +todo draw quad +todo probe all rgba (2.62500048, 209.5, 17.0, 224.5) + [require] shader model >= 5.0 float64 @@ -140,3 +172,18 @@ float4 main() : SV_TARGET uniform 0 double2 1.5e300 2.0e299 todo(sm<6) draw quad probe all rgba (7.5, 7.5, 7.5, 7.5) + +[pixel shader todo] +uniform double2 a, b, c; + +float4 main() : sv_target +{ + return float4(fma(a, b, c), 0, 0); +} + +[test] +uniform 0 double2 1.00000007 -42.1 +uniform 4 double2 1.625 -5.0 +uniform 8 double2 1.00000007 -1.0 +todo draw quad +probe all rgba (2.62500024, 209.5, 0.0, 0.0)

1 0

Conor McCarthy : vkd3d-shader/spirv: Use dst register data type in spirv_compiler_emit_imad().
by Alexandre Julliard 18 Mar '24

18 Mar '24

Module: vkd3d Branch: master Commit: 421d311a491b1121e6d1be6b8c936188872b4640 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/421d311a491b1121e6d1be6b8c936… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Mon Dec 11 16:17:44 2023 +1000 vkd3d-shader/spirv: Use dst register data type in spirv_compiler_emit_imad(). --- libs/vkd3d-shader/spirv.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index 5403e544..d1073884 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -7480,7 +7480,7 @@ static void spirv_compiler_emit_imad(struct spirv_compiler *compiler, unsigned int i, component_count; component_count = vsir_write_mask_component_count(dst->write_mask); - type_id = vkd3d_spirv_get_type_id(builder, VKD3D_SHADER_COMPONENT_INT, component_count); + type_id = vkd3d_spirv_get_type_id_for_data_type(builder, dst->reg.data_type, component_count); for (i = 0; i < ARRAY_SIZE(src_ids); ++i) src_ids[i] = spirv_compiler_emit_load_src(compiler, &src[i], dst->write_mask);

1 0

Conor McCarthy : vkd3d-shader/dxil: Implement DX intrinsics FMa, FMad, IMad and UMad.
by Alexandre Julliard 18 Mar '24

18 Mar '24

Module: vkd3d Branch: master Commit: 33694f08fc8a8587180233cbaa64c667dcee640e URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/33694f08fc8a8587180233cbaa64c… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Mon Dec 11 16:18:41 2023 +1000 vkd3d-shader/dxil: Implement DX intrinsics FMa, FMad, IMad and UMad. --- libs/vkd3d-shader/dxil.c | 40 +++++++++++++++++++++++++ tests/hlsl/arithmetic-float-uniform.shader_test | 6 ++-- tests/hlsl/majority-pragma.shader_test | 9 +++--- tests/hlsl/majority-typedef.shader_test | 2 +- 4 files changed, 49 insertions(+), 8 deletions(-) diff --git a/libs/vkd3d-shader/dxil.c b/libs/vkd3d-shader/dxil.c index 34615acb..b6fa895d 100644 --- a/libs/vkd3d-shader/dxil.c +++ b/libs/vkd3d-shader/dxil.c @@ -374,6 +374,10 @@ enum dx_intrinsic_opcode DX_IMIN = 38, DX_UMAX = 39, DX_UMIN = 40, + DX_FMAD = 46, + DX_FMA = 47, + DX_IMAD = 48, + DX_UMAD = 49, DX_IBFE = 51, DX_UBFE = 52, DX_CREATE_HANDLE = 57, @@ -4263,6 +4267,38 @@ static void sm6_parser_emit_dx_create_handle(struct sm6_parser *sm6, enum dx_int ins->handler_idx = VKD3DSIH_NOP; } +static enum vkd3d_shader_opcode sm6_dx_map_ma_op(enum dx_intrinsic_opcode op, const struct sm6_type *type) +{ + switch (op) + { + case DX_FMA: + return VKD3DSIH_DFMA; + case DX_FMAD: + return VKD3DSIH_MAD; + case DX_IMAD: + case DX_UMAD: + return VKD3DSIH_IMAD; + default: + vkd3d_unreachable(); + } +} + +static void sm6_parser_emit_dx_ma(struct sm6_parser *sm6, enum dx_intrinsic_opcode op, + const struct sm6_value **operands, struct function_emission_state *state) +{ + struct vkd3d_shader_instruction *ins = state->ins; + struct vkd3d_shader_src_param *src_params; + unsigned int i; + + vsir_instruction_init(ins, &sm6->p.location, sm6_dx_map_ma_op(op, operands[0]->type)); + if (!(src_params = instruction_src_params_alloc(ins, 3, sm6))) + return; + for (i = 0; i < 3; ++i) + src_param_init_from_value(&src_params[i], operands[i]); + + instruction_dst_param_init_ssa_scalar(ins, sm6); +} + static void sm6_parser_emit_dx_get_dimensions(struct sm6_parser *sm6, enum dx_intrinsic_opcode op, const struct sm6_value **operands, struct function_emission_state *state) { @@ -5018,6 +5054,8 @@ static const struct sm6_dx_opcode_info sm6_dx_op_table[] = [DX_FIRST_BIT_HI ] = {"i", "m", sm6_parser_emit_dx_unary}, [DX_FIRST_BIT_LO ] = {"i", "m", sm6_parser_emit_dx_unary}, [DX_FIRST_BIT_SHI ] = {"i", "m", sm6_parser_emit_dx_unary}, + [DX_FMA ] = {"g", "RRR", sm6_parser_emit_dx_ma}, + [DX_FMAD ] = {"g", "RRR", sm6_parser_emit_dx_ma}, [DX_FMAX ] = {"g", "RR", sm6_parser_emit_dx_binary}, [DX_FMIN ] = {"g", "RR", sm6_parser_emit_dx_binary}, [DX_FRC ] = {"g", "R", sm6_parser_emit_dx_unary}, @@ -5026,6 +5064,7 @@ static const struct sm6_dx_opcode_info sm6_dx_op_table[] = [DX_HCOS ] = {"g", "R", sm6_parser_emit_dx_unary}, [DX_HSIN ] = {"g", "R", sm6_parser_emit_dx_unary}, [DX_HTAN ] = {"g", "R", sm6_parser_emit_dx_unary}, + [DX_IMAD ] = {"m", "RRR", sm6_parser_emit_dx_ma}, [DX_IMAX ] = {"m", "RR", sm6_parser_emit_dx_binary}, [DX_IMIN ] = {"m", "RR", sm6_parser_emit_dx_binary}, [DX_ISFINITE ] = {"1", "g", sm6_parser_emit_dx_unary}, @@ -5058,6 +5097,7 @@ static const struct sm6_dx_opcode_info sm6_dx_op_table[] = [DX_TEXTURE_LOAD ] = {"o", "HiiiiCCC", sm6_parser_emit_dx_texture_load}, [DX_TEXTURE_STORE ] = {"v", "Hiiiooooc", sm6_parser_emit_dx_texture_store}, [DX_UBFE ] = {"m", "iiR", sm6_parser_emit_dx_tertiary}, + [DX_UMAD ] = {"m", "RRR", sm6_parser_emit_dx_ma}, [DX_UMAX ] = {"m", "RR", sm6_parser_emit_dx_binary}, [DX_UMIN ] = {"m", "RR", sm6_parser_emit_dx_binary}, }; diff --git a/tests/hlsl/arithmetic-float-uniform.shader_test b/tests/hlsl/arithmetic-float-uniform.shader_test index 506375eb..7fcf8493 100644 --- a/tests/hlsl/arithmetic-float-uniform.shader_test +++ b/tests/hlsl/arithmetic-float-uniform.shader_test @@ -103,7 +103,7 @@ float4 main() : sv_target uniform 0 float4 1.00000007 -42.1 4.0 45.0 uniform 4 float4 1.625 -5.0 4.125 5.0 uniform 8 float4 1.00000007 -1.0 0.5 -0.5 -todo draw quad +todo(sm<6) draw quad probe all rgba (2.62500024, 209.5, 17.0, 224.5) 1 % precise mad() is not allowed to fuse, even though unfused is less precise. @@ -120,7 +120,7 @@ float4 main() : sv_target uniform 0 float4 1.00000007 -42.1 4.0 45.0 uniform 4 float4 1.625 -5.0 4.125 5.0 uniform 8 float4 1.00000007 -1.0 0.5 -0.5 -todo draw quad +todo(sm<6) draw quad todo probe all rgba (2.62500048, 209.5, 17.0, 224.5) [require] @@ -185,5 +185,5 @@ float4 main() : sv_target uniform 0 double2 1.00000007 -42.1 uniform 4 double2 1.625 -5.0 uniform 8 double2 1.00000007 -1.0 -todo draw quad +todo(sm<6) draw quad probe all rgba (2.62500024, 209.5, 0.0, 0.0) diff --git a/tests/hlsl/majority-pragma.shader_test b/tests/hlsl/majority-pragma.shader_test index 84dff63e..4d40d8f6 100644 --- a/tests/hlsl/majority-pragma.shader_test +++ b/tests/hlsl/majority-pragma.shader_test @@ -17,7 +17,7 @@ uniform 0 float4 0.1 0.2 0.0 0.0 uniform 4 float4 0.3 0.4 0.0 0.0 uniform 8 float4 0.1 0.3 0.0 0.0 uniform 12 float4 0.2 0.4 0.0 0.0 -todo(sm>=6) draw quad +draw quad probe all rgba (0.17, 0.39, 0.17, 0.39) 1 @@ -66,7 +66,7 @@ probe all rgba (0.5, 0.6, 0.7, 0.8) % The documentation claims these strings are subject to macro expansion. -% They are not. +% In SM < 6.0 they are not. [pixel shader] @@ -90,8 +90,9 @@ float4 main() : sv_target [test] uniform 0 float4 0.1 0.2 0.0 0.0 uniform 4 float4 0.3 0.4 0.0 0.0 -todo(sm>=6) draw quad -probe all rgba (0.23, 0.34, 0.5, 0.5) 1 +draw quad +if(sm<6) probe all rgba (0.23, 0.34, 0.5, 0.5) 1 +if(sm>=6) probe all rgba (0.17, 0.39, 0.5, 0.5) 1 % The majority that applies to a typedef is the latent majority at the time diff --git a/tests/hlsl/majority-typedef.shader_test b/tests/hlsl/majority-typedef.shader_test index fa62dd5f..1460e9a0 100644 --- a/tests/hlsl/majority-typedef.shader_test +++ b/tests/hlsl/majority-typedef.shader_test @@ -18,5 +18,5 @@ uniform 0 float4 0.1 0.2 0.0 0.0 uniform 4 float4 0.3 0.4 0.0 0.0 uniform 8 float4 0.1 0.3 0.0 0.0 uniform 12 float4 0.2 0.4 0.0 0.0 -todo(sm>=6) draw quad +draw quad probe all rgba (0.17, 0.39, 0.17, 0.39) 1

1 0

Conor McCarthy : vkd3d-shader/dxil: Implement DX intrinsic FAbs.
by Alexandre Julliard 18 Mar '24

18 Mar '24

Module: vkd3d Branch: master Commit: 4599d3c1cfe81891934d443d9e6b5d21ff289853 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/4599d3c1cfe81891934d443d9e6b5… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Wed Jun 14 23:32:00 2023 +1000 vkd3d-shader/dxil: Implement DX intrinsic FAbs. --- libs/vkd3d-shader/dxil.c | 17 +++++++++++++++++ tests/hlsl/abs.shader_test | 4 ++-- tests/hlsl/fmod.shader_test | 8 ++++---- tests/hlsl/fwidth.shader_test | 2 +- tests/hlsl/length.shader_test | 4 ++-- 5 files changed, 26 insertions(+), 9 deletions(-) diff --git a/libs/vkd3d-shader/dxil.c b/libs/vkd3d-shader/dxil.c index b6fa895d..65893737 100644 --- a/libs/vkd3d-shader/dxil.c +++ b/libs/vkd3d-shader/dxil.c @@ -342,6 +342,7 @@ enum dx_intrinsic_opcode { DX_LOAD_INPUT = 4, DX_STORE_OUTPUT = 5, + DX_FABS = 6, DX_ISNAN = 8, DX_ISINF = 9, DX_ISFINITE = 10, @@ -4267,6 +4268,21 @@ static void sm6_parser_emit_dx_create_handle(struct sm6_parser *sm6, enum dx_int ins->handler_idx = VKD3DSIH_NOP; } +static void sm6_parser_emit_dx_fabs(struct sm6_parser *sm6, enum dx_intrinsic_opcode op, + const struct sm6_value **operands, struct function_emission_state *state) +{ + struct vkd3d_shader_instruction *ins = state->ins; + struct vkd3d_shader_src_param *src_param; + + vsir_instruction_init(ins, &sm6->p.location, VKD3DSIH_MOV); + if (!(src_param = instruction_src_params_alloc(ins, 1, sm6))) + return; + src_param_init_from_value(src_param, operands[0]); + src_param->modifiers = VKD3DSPSM_ABS; + + instruction_dst_param_init_ssa_scalar(ins, sm6); +} + static enum vkd3d_shader_opcode sm6_dx_map_ma_op(enum dx_intrinsic_opcode op, const struct sm6_type *type) { switch (op) @@ -5051,6 +5067,7 @@ static const struct sm6_dx_opcode_info sm6_dx_op_table[] = [DX_DERIV_FINEX ] = {"e", "R", sm6_parser_emit_dx_unary}, [DX_DERIV_FINEY ] = {"e", "R", sm6_parser_emit_dx_unary}, [DX_EXP ] = {"g", "R", sm6_parser_emit_dx_unary}, + [DX_FABS ] = {"g", "R", sm6_parser_emit_dx_fabs}, [DX_FIRST_BIT_HI ] = {"i", "m", sm6_parser_emit_dx_unary}, [DX_FIRST_BIT_LO ] = {"i", "m", sm6_parser_emit_dx_unary}, [DX_FIRST_BIT_SHI ] = {"i", "m", sm6_parser_emit_dx_unary}, diff --git a/tests/hlsl/abs.shader_test b/tests/hlsl/abs.shader_test index 4d1d1e33..46acdea8 100644 --- a/tests/hlsl/abs.shader_test +++ b/tests/hlsl/abs.shader_test @@ -8,8 +8,8 @@ float4 main() : sv_target [test] uniform 0 float4 0.1 0.7 0.0 0.0 -todo(sm<4 | sm>=6) draw quad +todo(sm<4) draw quad probe all rgba (0.1, 0.7, 0.4, 0.4) uniform 0 float4 -0.7 0.1 0.0 0.0 -todo(sm<4 | sm>=6) draw quad +todo(sm<4) draw quad probe all rgba (0.7, 0.1, 1.2, 0.4) diff --git a/tests/hlsl/fmod.shader_test b/tests/hlsl/fmod.shader_test index d21301fe..62f7573d 100644 --- a/tests/hlsl/fmod.shader_test +++ b/tests/hlsl/fmod.shader_test @@ -8,10 +8,10 @@ float4 main() : sv_target [test] uniform 0 float4 -0.5 6.5 0.0 0.0 -todo(sm<4 | sm>=6) draw quad +todo(sm<4) draw quad probe all rgba (-0.5, 0.0, 0.0, 0.0) 4 uniform 0 float4 1.1 0.3 0.0 0.0 -todo(sm<4 | sm>=6) draw quad +todo(sm<4) draw quad probe all rgba (0.2, 0.0, 0.0, 0.0) 4 [pixel shader todo(sm<4)] @@ -24,8 +24,8 @@ float4 main() : sv_target [test] uniform 0 float4 -0.5 6.5 2.0 0.0 -todo(sm<4 | sm>=6) draw quad +todo(sm<4) draw quad probe all rgba (-0.5, 0.5, 0.0, 0.0) 4 uniform 0 float4 1.1 0.3 3.0 0.0 -todo(sm<4 | sm>=6) draw quad +todo(sm<4) draw quad probe all rgba (1.1, 0.3, 0.0, 0.0) 4 diff --git a/tests/hlsl/fwidth.shader_test b/tests/hlsl/fwidth.shader_test index 10ed712d..99fb1421 100644 --- a/tests/hlsl/fwidth.shader_test +++ b/tests/hlsl/fwidth.shader_test @@ -18,7 +18,7 @@ float4 main(float4 pos : sv_position) : sv_target } [test] -todo(sm<4 | sm>=6) draw quad +todo(sm<4) draw quad probe (10, 10) rgba (8.0, 8.0, 8.0, 8.0) probe (11, 10) rgba (8.0, 8.0, 8.0, 8.0) probe (12, 10) rgba (10.0, 10.0, 10.0, 10.0) diff --git a/tests/hlsl/length.shader_test b/tests/hlsl/length.shader_test index ec48300f..4080ff40 100644 --- a/tests/hlsl/length.shader_test +++ b/tests/hlsl/length.shader_test @@ -47,7 +47,7 @@ float4 main() : SV_TARGET [test] uniform 0 float4 2.0 0.0 0.0 0.0 -todo(sm>=6) draw quad +draw quad probe all rgba (2.0, 2.0, 2.0, 2.0) [pixel shader] @@ -60,7 +60,7 @@ float4 main() : SV_TARGET [test] uniform 0 float4 2.0 0.0 0.0 0.0 -todo(sm>=6) draw quad +draw quad probe all rgba (2.0, 2.0, 2.0, 2.0) [pixel shader fail]

1 0

Conor McCarthy : vkd3d-shader/dxil: Implement DX intrinsic Saturate.
by Alexandre Julliard 18 Mar '24

18 Mar '24

Module: vkd3d Branch: master Commit: 0c01a55c7de832bb614086ca6a42e94e72ab92d3 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/0c01a55c7de832bb614086ca6a42e… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Wed Jun 14 23:37:42 2023 +1000 vkd3d-shader/dxil: Implement DX intrinsic Saturate. --- libs/vkd3d-shader/dxil.c | 25 +++++++++++++++++++++++-- tests/hlsl/saturate.shader_test | 4 ++-- 2 files changed, 25 insertions(+), 4 deletions(-) diff --git a/libs/vkd3d-shader/dxil.c b/libs/vkd3d-shader/dxil.c index 65893737..7f9a74fa 100644 --- a/libs/vkd3d-shader/dxil.c +++ b/libs/vkd3d-shader/dxil.c @@ -343,6 +343,7 @@ enum dx_intrinsic_opcode DX_LOAD_INPUT = 4, DX_STORE_OUTPUT = 5, DX_FABS = 6, + DX_SATURATE = 7, DX_ISNAN = 8, DX_ISINF = 9, DX_ISFINITE = 10, @@ -2380,14 +2381,18 @@ static void register_index_address_init(struct vkd3d_shader_register_index *idx, } } -static void instruction_dst_param_init_ssa_scalar(struct vkd3d_shader_instruction *ins, struct sm6_parser *sm6) +static bool instruction_dst_param_init_ssa_scalar(struct vkd3d_shader_instruction *ins, struct sm6_parser *sm6) { - struct vkd3d_shader_dst_param *param = instruction_dst_params_alloc(ins, 1, sm6); struct sm6_value *dst = sm6_parser_get_current_value(sm6); + struct vkd3d_shader_dst_param *param; + + if (!(param = instruction_dst_params_alloc(ins, 1, sm6))) + return false; dst_param_init_ssa_scalar(param, dst->type, dst, sm6); param->write_mask = VKD3DSP_WRITEMASK_0; dst->u.reg = param->reg; + return true; } static void instruction_dst_param_init_ssa_vector(struct vkd3d_shader_instruction *ins, @@ -4771,6 +4776,21 @@ static void sm6_parser_emit_dx_sample(struct sm6_parser *sm6, enum dx_intrinsic_ instruction_dst_param_init_ssa_vector(ins, component_count, sm6); } +static void sm6_parser_emit_dx_saturate(struct sm6_parser *sm6, enum dx_intrinsic_opcode op, + const struct sm6_value **operands, struct function_emission_state *state) +{ + struct vkd3d_shader_instruction *ins = state->ins; + struct vkd3d_shader_src_param *src_param; + + vsir_instruction_init(ins, &sm6->p.location, VKD3DSIH_MOV); + if (!(src_param = instruction_src_params_alloc(ins, 1, sm6))) + return; + src_param_init_from_value(src_param, operands[0]); + + if (instruction_dst_param_init_ssa_scalar(ins, sm6)) + ins->dst->modifiers = VKD3DSPDM_SATURATE; +} + static void sm6_parser_emit_dx_sincos(struct sm6_parser *sm6, enum dx_intrinsic_opcode op, const struct sm6_value **operands, struct function_emission_state *state) { @@ -5104,6 +5124,7 @@ static const struct sm6_dx_opcode_info sm6_dx_op_table[] = [DX_SAMPLE_C_LZ ] = {"o", "HHffffiiif", sm6_parser_emit_dx_sample}, [DX_SAMPLE_GRAD ] = {"o", "HHffffiiifffffff", sm6_parser_emit_dx_sample}, [DX_SAMPLE_LOD ] = {"o", "HHffffiiif", sm6_parser_emit_dx_sample}, + [DX_SATURATE ] = {"g", "R", sm6_parser_emit_dx_saturate}, [DX_SIN ] = {"g", "R", sm6_parser_emit_dx_sincos}, [DX_SPLIT_DOUBLE ] = {"S", "d", sm6_parser_emit_dx_split_double}, [DX_SQRT ] = {"g", "R", sm6_parser_emit_dx_unary}, diff --git a/tests/hlsl/saturate.shader_test b/tests/hlsl/saturate.shader_test index 2ed83cf6..e3ccce76 100644 --- a/tests/hlsl/saturate.shader_test +++ b/tests/hlsl/saturate.shader_test @@ -8,7 +8,7 @@ float4 main() : sv_target [test] uniform 0 float4 0.7 -0.1 0.0 0.0 -todo(sm>=6) draw quad +draw quad probe all rgba (0.7, 0.0, 1.0, 0.0) [pixel shader] @@ -22,5 +22,5 @@ float4 main() : sv_target [test] uniform 0 float4 -2 0 2 -1 -todo(sm>=6) draw quad +draw quad probe all rgba (0.0, 0.0, 1.0, 0.0)

1 0

Giovanni Mascellani : vkd3d-shader/d3d-asm: Indent instructions inside a block.
by Alexandre Julliard 18 Mar '24

18 Mar '24

Module: vkd3d Branch: master Commit: 22d19aed5828cae0b1623538a68b4717b9f4835a URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/22d19aed5828cae0b1623538a68b4… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Fri Mar 1 00:01:55 2024 +0100 vkd3d-shader/d3d-asm: Indent instructions inside a block. --- libs/vkd3d-shader/d3d_asm.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/libs/vkd3d-shader/d3d_asm.c b/libs/vkd3d-shader/d3d_asm.c index fcbb321e..cfdb7e8c 100644 --- a/libs/vkd3d-shader/d3d_asm.c +++ b/libs/vkd3d-shader/d3d_asm.c @@ -2321,6 +2321,10 @@ enum vkd3d_result d3d_asm_compile(const struct vsir_program *program, --indent; break; + case VKD3DSIH_LABEL: + indent = 0; + break; + default: break; } @@ -2339,6 +2343,7 @@ enum vkd3d_result d3d_asm_compile(const struct vsir_program *program, case VKD3DSIH_IFC: case VKD3DSIH_LOOP: case VKD3DSIH_SWITCH: + case VKD3DSIH_LABEL: ++indent; break;

1 0

Giovanni Mascellani : vkd3d-shader/d3d-asm: Do not dump a register's type if it's unused.
by Alexandre Julliard 18 Mar '24

18 Mar '24

Module: vkd3d Branch: master Commit: d418f49888831fe1fadb133023cef4d25594f440 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/d418f49888831fe1fadb133023cef… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Thu Mar 14 22:39:46 2024 +0100 vkd3d-shader/d3d-asm: Do not dump a register's type if it's unused. --- libs/vkd3d-shader/d3d_asm.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/libs/vkd3d-shader/d3d_asm.c b/libs/vkd3d-shader/d3d_asm.c index cfdb7e8c..579ad8c5 100644 --- a/libs/vkd3d-shader/d3d_asm.c +++ b/libs/vkd3d-shader/d3d_asm.c @@ -1378,6 +1378,9 @@ static void shader_dump_reg_type(struct vkd3d_d3d_asm_compiler *compiler, if (!(compiler->flags & VSIR_ASM_FLAG_DUMP_TYPES)) return; + if (reg->data_type == VKD3D_DATA_UNUSED) + return; + if (reg->dimension < ARRAY_SIZE(dimensions)) dimension = dimensions[reg->dimension]; else

1 0

Giovanni Mascellani : vkd3d-shader/ir: Use type "unused" for labels.
by Alexandre Julliard 18 Mar '24

18 Mar '24

Module: vkd3d Branch: master Commit: e5f486edd372fde57cf8086387dc74e087129878 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/e5f486edd372fde57cf8086387dc7… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Thu Mar 14 22:40:12 2024 +0100 vkd3d-shader/ir: Use type "unused" for labels. The label itself is certainly an unsigned integer, but the register has no meaningful data type. It cannot be evaluated to anything. The goal of this is to reduce cluttering in the internal ASM dumps. --- libs/vkd3d-shader/ir.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libs/vkd3d-shader/ir.c b/libs/vkd3d-shader/ir.c index 0e6eec57..ec32faae 100644 --- a/libs/vkd3d-shader/ir.c +++ b/libs/vkd3d-shader/ir.c @@ -456,7 +456,7 @@ void vsir_dst_param_init(struct vkd3d_shader_dst_param *param, enum vkd3d_shader void vsir_src_param_init_label(struct vkd3d_shader_src_param *param, unsigned int label_id) { - vsir_src_param_init(param, VKD3DSPR_LABEL, VKD3D_DATA_UINT, 1); + vsir_src_param_init(param, VKD3DSPR_LABEL, VKD3D_DATA_UNUSED, 1); param->reg.dimension = VSIR_DIMENSION_NONE; param->reg.idx[0].offset = label_id; } @@ -4707,7 +4707,7 @@ static void vsir_validate_register(struct validation_context *ctx, validator_error(ctx, VKD3D_SHADER_ERROR_VSIR_INVALID_PRECISION, "Invalid precision %#x for a LABEL register.", reg->precision); - if (reg->data_type != VKD3D_DATA_UINT) + if (reg->data_type != VKD3D_DATA_UNUSED) validator_error(ctx, VKD3D_SHADER_ERROR_VSIR_INVALID_DATA_TYPE, "Invalid data type %#x for a LABEL register.", reg->data_type);

1 0

Henri Verbeet : vkd3d-shader/glsl: Keep track of the current indentation level.
by Alexandre Julliard 18 Mar '24

18 Mar '24

Module: vkd3d Branch: master Commit: b98171878f0157044d7733e5658a885ce8db77a1 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/b98171878f0157044d7733e5658a8… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Nov 17 07:18:47 2023 +0100 vkd3d-shader/glsl: Keep track of the current indentation level. --- libs/vkd3d-shader/glsl.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/libs/vkd3d-shader/glsl.c b/libs/vkd3d-shader/glsl.c index 23ea89c4..3977852a 100644 --- a/libs/vkd3d-shader/glsl.c +++ b/libs/vkd3d-shader/glsl.c @@ -24,6 +24,7 @@ struct vkd3d_glsl_generator struct vkd3d_string_buffer buffer; struct vkd3d_shader_location location; struct vkd3d_shader_message_context *message_context; + unsigned int indent; bool failed; }; @@ -39,8 +40,14 @@ static void VKD3D_PRINTF_FUNC(3, 4) vkd3d_glsl_compiler_error( generator->failed = true; } +static void shader_glsl_print_indent(struct vkd3d_string_buffer *buffer, unsigned int indent) +{ + vkd3d_string_buffer_printf(buffer, "%*s", 4 * indent, ""); +} + static void shader_glsl_unhandled(struct vkd3d_glsl_generator *gen, const struct vkd3d_shader_instruction *ins) { + shader_glsl_print_indent(&gen->buffer, gen->indent); vkd3d_string_buffer_printf(&gen->buffer, "/* <unhandled instruction %#x> */\n", ins->handler_idx); vkd3d_glsl_compiler_error(gen, VKD3D_SHADER_ERROR_GLSL_INTERNAL, "Internal compiler error: Unhandled instruction %#x.", ins->handler_idx); @@ -57,6 +64,7 @@ static void shader_glsl_ret(struct vkd3d_glsl_generator *generator, */ if (version->major >= 4) { + shader_glsl_print_indent(&generator->buffer, generator->indent); vkd3d_string_buffer_printf(&generator->buffer, "return;\n"); } } @@ -92,6 +100,7 @@ static int vkd3d_glsl_generator_generate(struct vkd3d_glsl_generator *generator, vkd3d_string_buffer_printf(&generator->buffer, "#version 440\n\n"); vkd3d_string_buffer_printf(&generator->buffer, "void main()\n{\n"); + ++generator->indent; for (i = 0; i < instructions->count; ++i) { vkd3d_glsl_handle_instruction(generator, &instructions->elements[i]);

1 0