- Wine-Devel - list.winehq.org

[PATCH v2] d2d1: Silence SetSegmentFlags FIXME when setting default value
by Stefan Brüns Jan. 11, 2022

Jan. 11, 2022

Some software (Buhl Tax and variants) repeatedly calls SetSegmentFlags with D2D1_PATH_SEGMENT_NONE, which is just the default value and has no effect (unless the flags where already changed, which still reports a FIXME). Signed-off-by: Stefan Brüns <stefan.bruens(a)rwth-aachen.de> --- v2: use TRACE when setting flags to D2D1_PATH_SEGMENT_NONE dlls/d2d1/geometry.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/d2d1/geometry.c b/dlls/d2d1/geometry.c index a7074899fda..a58dadcad85 100644 --- a/dlls/d2d1/geometry.c +++ b/dlls/d2d1/geometry.c @@ -2773,7 +2773,10 @@ static void STDMETHODCALLTYPE d2d_geometry_sink_SetFillMode(ID2D1GeometrySink *i static void STDMETHODCALLTYPE d2d_geometry_sink_SetSegmentFlags(ID2D1GeometrySink *iface, D2D1_PATH_SEGMENT flags) { - FIXME("iface %p, flags %#x stub!\n", iface, flags); + if (flags == D2D1_PATH_SEGMENT_NONE) + TRACE("iface %p, mode %#x.\n", iface, mode); + else + FIXME("iface %p, flags %#x stub!\n", iface, flags); } static void STDMETHODCALLTYPE d2d_geometry_sink_BeginFigure(ID2D1GeometrySink *iface, -- 2.34.1

2 1

[PATCH] d2d1: Silence SetSegmentFlags FIXME when setting default value
by Stefan Brüns Jan. 11, 2022

Jan. 11, 2022

Some software (Buhl Tax and variants) repeatedly calls SetSegmentFlags with D2D1_PATH_SEGMENT_NONE, which is just the default value and has no effect (unless the flags where already changed for the current segment, which still reports a FIXME). Signed-off-by: Stefan Brüns <stefan.bruens(a)rwth-aachen.de> --- dlls/d2d1/geometry.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/d2d1/geometry.c b/dlls/d2d1/geometry.c index a7074899fda..ac5f1019f3f 100644 --- a/dlls/d2d1/geometry.c +++ b/dlls/d2d1/geometry.c @@ -2773,6 +2773,8 @@ static void STDMETHODCALLTYPE d2d_geometry_sink_SetFillMode(ID2D1GeometrySink *i static void STDMETHODCALLTYPE d2d_geometry_sink_SetSegmentFlags(ID2D1GeometrySink *iface, D2D1_PATH_SEGMENT flags) { + if (flags == D2D1_PATH_SEGMENT_NONE) + return; FIXME("iface %p, flags %#x stub!\n", iface, flags); } -- 2.34.1

2 1

[PATCH vkd3d 1/4] vkd3d-shader: Do not validate the target type in vkd3d_shader_scan().
by Zebediah Figura Jan. 11, 2022

Jan. 11, 2022

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- libs/vkd3d-shader/vkd3d_shader_main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/vkd3d-shader/vkd3d_shader_main.c b/libs/vkd3d-shader/vkd3d_shader_main.c index 3982d0730..47fe3d60d 100644 --- a/libs/vkd3d-shader/vkd3d_shader_main.c +++ b/libs/vkd3d-shader/vkd3d_shader_main.c @@ -1025,7 +1025,7 @@ int vkd3d_shader_scan(const struct vkd3d_shader_compile_info *compile_info, char if (messages) *messages = NULL; - if ((ret = vkd3d_shader_validate_compile_info(compile_info, true)) < 0) + if ((ret = vkd3d_shader_validate_compile_info(compile_info, false)) < 0) return ret; vkd3d_shader_message_context_init(&message_context, compile_info->log_level); -- 2.34.1

5 11

[PATCH vkd3d] vkd3d-shader: Add tiled resource opcode definitions.
by Zebediah Figura Jan. 10, 2022

Jan. 10, 2022

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- libs/vkd3d-shader/sm4.h | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/libs/vkd3d-shader/sm4.h b/libs/vkd3d-shader/sm4.h index f6b4b612d..62bb4d12b 100644 --- a/libs/vkd3d-shader/sm4.h +++ b/libs/vkd3d-shader/sm4.h @@ -354,6 +354,22 @@ enum vkd3d_sm4_opcode VKD3D_SM5_OP_DTOU = 0xd7, VKD3D_SM5_OP_ITOD = 0xd8, VKD3D_SM5_OP_UTOD = 0xd9, + VKD3D_SM5_OP_GATHER4_S = 0xdb, + VKD3D_SM5_OP_GATHER4_C_S = 0xdc, + VKD3D_SM5_OP_GATHER4_PO_S = 0xdd, + VKD3D_SM5_OP_GATHER4_PO_C_S = 0xde, + VKD3D_SM5_OP_LD_S = 0xdf, + VKD3D_SM5_OP_LD2DMS_S = 0xe0, + VKD3D_SM5_OP_LD_UAV_TYPED_S = 0xe1, + VKD3D_SM5_OP_LD_RAW_S = 0xe2, + VKD3D_SM5_OP_LD_STRUCTURED_S = 0xe3, + VKD3D_SM5_OP_SAMPLE_LOD_S = 0xe4, + VKD3D_SM5_OP_SAMPLE_C_LZ_S = 0xe5, + VKD3D_SM5_OP_SAMPLE_CL_S = 0xe6, + VKD3D_SM5_OP_SAMPLE_B_CL_S = 0xe7, + VKD3D_SM5_OP_SAMPLE_GRAD_CL_S = 0xe8, + VKD3D_SM5_OP_SAMPLE_C_CL_S = 0xe9, + VKD3D_SM5_OP_CHECK_ACCESS_FULLY_MAPPED = 0xea, }; enum vkd3d_sm4_instruction_modifier -- 2.34.1

4 3

[PATCH] msvidc32: Make the temporary buffer large enough according to the output depth
by André Zwing Jan. 10, 2022

Jan. 10, 2022

Signed-off-by: André Zwing <nerv(a)dawncrow.de> --- While working on https://bugs.winehq.org/show_bug.cgi?id=52278 I came across those lines and think it's a quite obviously fix --- dlls/msvidc32/msvideo1.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msvidc32/msvideo1.c b/dlls/msvidc32/msvideo1.c index 7b866d04caf..cf45b9f169e 100644 --- a/dlls/msvidc32/msvideo1.c +++ b/dlls/msvidc32/msvideo1.c @@ -459,7 +459,7 @@ static LRESULT CRAM_Decompress( Msvideo1Context *info, ICDECOMPRESS *icd, DWORD if (icd->lpbiOutput->biBitCount != info->depth) { - output = HeapAlloc(GetProcessHeap(), 0, icd->lpbiOutput->biWidth * icd->lpbiOutput->biHeight * info->depth / 8); + output = HeapAlloc(GetProcessHeap(), 0, icd->lpbiOutput->biWidth * icd->lpbiOutput->biHeight * icd->lpbiOutput->biBitCount / 8); if (!output) return ICERR_MEMORY; } @@ -505,7 +505,7 @@ static LRESULT CRAM_DecompressEx( Msvideo1Context *info, ICDECOMPRESSEX *icd, DW if (icd->lpbiDst->biBitCount != info->depth) { - output = HeapAlloc(GetProcessHeap(), 0, icd->lpbiDst->biWidth * icd->lpbiDst->biHeight * info->depth / 8); + output = HeapAlloc(GetProcessHeap(), 0, icd->lpbiDst->biWidth * icd->lpbiDst->biHeight * icd->lpbiDst->biBitCount / 8); if (!output) return ICERR_MEMORY; } -- 2.25.1

1 0

[PATCH] msvidc32: Make the temporary buffer large enough according to the output depth
by André Zwing Jan. 10, 2022

Jan. 10, 2022

--- While working on https://bugs.winehq.org/show_bug.cgi?id=52278 I came across those lines and think it's a quite obviously fix Signed-off-by: André Zwing <nerv(a)dawncrow.de> --- dlls/msvidc32/msvideo1.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msvidc32/msvideo1.c b/dlls/msvidc32/msvideo1.c index 7b866d04caf..cf45b9f169e 100644 --- a/dlls/msvidc32/msvideo1.c +++ b/dlls/msvidc32/msvideo1.c @@ -459,7 +459,7 @@ static LRESULT CRAM_Decompress( Msvideo1Context *info, ICDECOMPRESS *icd, DWORD if (icd->lpbiOutput->biBitCount != info->depth) { - output = HeapAlloc(GetProcessHeap(), 0, icd->lpbiOutput->biWidth * icd->lpbiOutput->biHeight * info->depth / 8); + output = HeapAlloc(GetProcessHeap(), 0, icd->lpbiOutput->biWidth * icd->lpbiOutput->biHeight * icd->lpbiOutput->biBitCount / 8); if (!output) return ICERR_MEMORY; } @@ -505,7 +505,7 @@ static LRESULT CRAM_DecompressEx( Msvideo1Context *info, ICDECOMPRESSEX *icd, DW if (icd->lpbiDst->biBitCount != info->depth) { - output = HeapAlloc(GetProcessHeap(), 0, icd->lpbiDst->biWidth * icd->lpbiDst->biHeight * info->depth / 8); + output = HeapAlloc(GetProcessHeap(), 0, icd->lpbiDst->biWidth * icd->lpbiDst->biHeight * icd->lpbiDst->biBitCount / 8); if (!output) return ICERR_MEMORY; } -- 2.25.1

1 0

[PATCH vkd3d v2 10/10] vkd3d-shader/hlsl: Support array initializers.
by Francisco Casas Jan. 10, 2022

Jan. 10, 2022

Signed-off-by: Francisco Casas <fcasas(a)codeweavers.com> --- libs/vkd3d-shader/hlsl.y | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index 6fb4eb78..158ab492 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -1347,7 +1347,14 @@ static void generic_var_initializer(struct hlsl_ctx *ctx, struct hlsl_ir_var *va } else if (type->type == HLSL_CLASS_ARRAY) { - hlsl_fixme(ctx, &v->loc, "Initializers for arrays not supported yet."); + for (int i = 0; i < type->e.array.elements_count; i++) + { + struct hlsl_type *elem_type = type->e.array.type; + unsigned int elem_offset = i * elem_type->reg_size; + + generic_var_initializer(ctx, var, v, reg_offset + elem_offset, elem_type, + initializer_i, instrs); + } return; } else if (type->type == HLSL_CLASS_OBJECT) -- 2.25.1

1 0

[PATCH vkd3d v2 09/10] vkd3d-shader/hlsl: Use generic variable initializer for struct fields.
by Francisco Casas Jan. 10, 2022

Jan. 10, 2022

This adds support for nested structs and implicit casting of initializer arguments. Signed-off-by: Francisco Casas <fcasas(a)codeweavers.com> --- libs/vkd3d-shader/hlsl.y | 42 ++++++++-------------------------------- 1 file changed, 8 insertions(+), 34 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index 69ae48a1..6fb4eb78 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -1326,39 +1326,6 @@ static void numeric_var_initializer(struct hlsl_ctx *ctx, struct hlsl_ir_var *va } } -static void struct_var_initializer(struct hlsl_ctx *ctx, struct hlsl_ir_var *var, - struct parse_initializer *initializer) -{ - struct hlsl_type *type = var->data_type; - struct hlsl_struct_field *field; - unsigned int i = 0; - - LIST_FOR_EACH_ENTRY(field, type->e.elements, struct hlsl_struct_field, entry) - { - struct hlsl_ir_node *node = initializer->args[i]; - struct hlsl_ir_store *store; - struct hlsl_ir_constant *c; - - if (i++ >= initializer->args_count) - break; - - if (hlsl_type_component_count(field->type) == hlsl_type_component_count(node->data_type)) - { - if (!(c = hlsl_new_uint_constant(ctx, field->reg_offset, node->loc))) - break; - list_add_tail(initializer->instrs, &c->node.entry); - - if (!(store = hlsl_new_store(ctx, var, &c->node, node, 0, node->loc))) - break; - list_add_tail(initializer->instrs, &store->node.entry); - } - else - { - hlsl_fixme(ctx, &node->loc, "Implicit cast in structure initializer."); - } - } -} - static void generic_var_initializer(struct hlsl_ctx *ctx, struct hlsl_ir_var *var, struct parse_variable_def *v, unsigned int reg_offset, struct hlsl_type *type, unsigned int *initializer_i, struct list *instrs) @@ -1369,7 +1336,14 @@ static void generic_var_initializer(struct hlsl_ctx *ctx, struct hlsl_ir_var *va } else if (type->type == HLSL_CLASS_STRUCT) { - struct_var_initializer(ctx, var, &v->initializer); + struct hlsl_struct_field *field; + + LIST_FOR_EACH_ENTRY(field, type->e.elements, struct hlsl_struct_field, entry) + { + generic_var_initializer(ctx, var, v, reg_offset + field->reg_offset, field->type, + initializer_i, instrs); + } + return; } else if (type->type == HLSL_CLASS_ARRAY) { -- 2.25.1

1 0

[PATCH vkd3d v2 05/10] tests: Test flattening of initializers.
by Francisco Casas Jan. 10, 2022

Jan. 10, 2022

Signed-off-by: Francisco Casas <fcasas(a)codeweavers.com> --- Makefile.am | 2 + tests/hlsl-initializer-flattening.shader_test | 54 +++++++++++++++++++ 2 files changed, 56 insertions(+) create mode 100644 tests/hlsl-initializer-flattening.shader_test diff --git a/Makefile.am b/Makefile.am index 1ac43c6d..d15e50c3 100644 --- a/Makefile.am +++ b/Makefile.am @@ -68,6 +68,7 @@ vkd3d_shader_tests = \ tests/hlsl-duplicate-modifiers.shader_test \ tests/hlsl-for.shader_test \ tests/hlsl-function-overload.shader_test \ + tests/hlsl-initializer-flattening.shader_test \ tests/hlsl-initializer-invalid-n-args.shader_test \ tests/hlsl-initializer-local-array.shader_test \ tests/hlsl-initializer-numeric.shader_test \ @@ -294,6 +295,7 @@ XFAIL_TESTS = \ tests/cast-to-uint.shader_test \ tests/conditional.shader_test \ tests/hlsl-array-dimension.shader_test \ + tests/hlsl-initializer-flattening.shader_test \ tests/hlsl-initializer-invalid-n-args.shader_test \ tests/hlsl-initializer-local-array.shader_test \ tests/hlsl-initializer-numeric.shader_test \ diff --git a/tests/hlsl-initializer-flattening.shader_test b/tests/hlsl-initializer-flattening.shader_test new file mode 100644 index 00000000..b32ced40 --- /dev/null +++ b/tests/hlsl-initializer-flattening.shader_test @@ -0,0 +1,54 @@ +[pixel shader] +float4 main() : sv_target +{ + float4 aaa = {1, {{{2, {3}}, 4}}}; + return aaa; +} + +[test] +draw quad +probe all rgba (1, 2, 3, 4) + + +[pixel shader] +float4 main() : sv_target +{ + float4 aaa[3] = { + 11, {{{12, {13}}, 14}, + 21, 22}, 23, {{24, + 31, {32, 33}, 34}}, + }; + return aaa[1]; +} + +[test] +draw quad +probe all rgba (21, 22, 23, 24) + + +[pixel shader] +struct stu1 +{ + float4 aaa; + float4 bbb; +}; + +struct stu2 +{ + int3 ccc; + stu1 ddd; +}; + +float4 main() : sv_target +{ + struct stu2 val = { + 11, {12, 13, + 21, {{{22}}}, 23}, {{24, + 31, 32}}, 33, 34, + }; + return val.ddd.aaa; +} + +[test] +draw quad +probe all rgba (21, 22, 23, 24) -- 2.25.1

1 0

[PATCH vkd3d v2 04/10] tests: Test complex initializers for numeric types.
by Francisco Casas Jan. 10, 2022

Jan. 10, 2022

Signed-off-by: Francisco Casas <fcasas(a)codeweavers.com> --- Makefile.am | 2 ++ tests/hlsl-initializer-numeric.shader_test | 35 ++++++++++++++++++++++ 2 files changed, 37 insertions(+) create mode 100644 tests/hlsl-initializer-numeric.shader_test diff --git a/Makefile.am b/Makefile.am index cdb59a85..1ac43c6d 100644 --- a/Makefile.am +++ b/Makefile.am @@ -70,6 +70,7 @@ vkd3d_shader_tests = \ tests/hlsl-function-overload.shader_test \ tests/hlsl-initializer-invalid-n-args.shader_test \ tests/hlsl-initializer-local-array.shader_test \ + tests/hlsl-initializer-numeric.shader_test \ tests/hlsl-initializer-static-array.shader_test \ tests/hlsl-initializer-struct.shader_test \ tests/hlsl-invalid.shader_test \ @@ -295,6 +296,7 @@ XFAIL_TESTS = \ tests/hlsl-array-dimension.shader_test \ tests/hlsl-initializer-invalid-n-args.shader_test \ tests/hlsl-initializer-local-array.shader_test \ + tests/hlsl-initializer-numeric.shader_test \ tests/hlsl-initializer-static-array.shader_test \ tests/hlsl-initializer-struct.shader_test \ tests/hlsl-bool-cast.shader_test \ diff --git a/tests/hlsl-initializer-numeric.shader_test b/tests/hlsl-initializer-numeric.shader_test new file mode 100644 index 00000000..2fce3909 --- /dev/null +++ b/tests/hlsl-initializer-numeric.shader_test @@ -0,0 +1,35 @@ +[pixel shader] +float4 main() : sv_target +{ + int4 aa = {1, 2, 3, 4}; + return aa; +} + +[test] +draw quad +probe all rgba (1.0, 2.0, 3.0, 4.0) 4 + + +[pixel shader] +float4 main() : sv_target +{ + float4 aa = {1, 2, 3, 4}; + return aa; +} + +[test] +draw quad +probe all rgba (1.0, 2.0, 3.0, 4.0) 4 + + +[pixel shader] +float4 main() : sv_target +{ + float3 aa = {1, 2, 3}; + float4 bb = {aa.x, aa.y, aa.z, 4.0}; + return bb; +} + +[test] +draw quad +probe all rgba (1.0, 2.0, 3.0, 4.0) 4 -- 2.25.1

1 0