wine-commits March 2022

wine-commits@winehq.org

2 participants
1138 discussions

Zebediah Figura : vkd3d-shader/hlsl: Cast pow() input to float.
by Alexandre Julliard 18 Mar '22

18 Mar '22

Module: vkd3d Branch: master Commit: 8fe4d7d37eb03bfd2c35245affa3b367f4f60856 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=8fe4d7d37eb03bfd2c35245… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Mar 8 17:58:13 2022 -0600 vkd3d-shader/hlsl: Cast pow() input to float. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Francisco Casas <fcasas(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/hlsl.y | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index dc9b1439..1ab56fba 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -1800,10 +1800,13 @@ static bool intrinsic_min(struct hlsl_ctx *ctx, static bool intrinsic_pow(struct hlsl_ctx *ctx, const struct parse_initializer *params, const struct vkd3d_shader_location *loc) { - struct hlsl_ir_node *log, *exp; + struct hlsl_ir_node *log, *exp, *arg; struct hlsl_ir_expr *mul; - if (!(log = hlsl_new_unary_expr(ctx, HLSL_OP1_LOG2, params->args[0], *loc))) + if (!(arg = intrinsic_float_convert_arg(ctx, params, params->args[0], loc))) + return false; + + if (!(log = hlsl_new_unary_expr(ctx, HLSL_OP1_LOG2, arg, *loc))) return false; list_add_tail(params->instrs, &log->entry);

1 0

Francisco Casas : vkd3d-shader/hlsl: Remove redundant type check in declare_vars().
by Alexandre Julliard 18 Mar '22

18 Mar '22

Module: vkd3d Branch: master Commit: a7e6d6b9d26fd0fcc0f1be9ae6c8419abdf0df84 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=a7e6d6b9d26fd0fcc0f1be9… Author: Francisco Casas <fcasas(a)codeweavers.com> Date: Thu Mar 10 12:14:11 2022 -0300 vkd3d-shader/hlsl: Remove redundant type check in declare_vars(). Signed-off-by: Francisco Casas <fcasas(a)codeweavers.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/hlsl.y | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index 521ca0a7..dc9b1439 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -1612,23 +1612,17 @@ static struct list *declare_vars(struct hlsl_ctx *ctx, struct hlsl_type *basic_t continue; } - if (type->type == HLSL_CLASS_STRUCT) - { - struct_var_initializer(ctx, statements_list, var, &v->initializer); - vkd3d_free(v); - continue; - } - if (type->type > HLSL_CLASS_LAST_NUMERIC) + if (type->type > HLSL_CLASS_LAST_NUMERIC && type->type != HLSL_CLASS_STRUCT) { FIXME("Initializers for non scalar/struct variables not supported yet.\n"); free_parse_initializer(&v->initializer); vkd3d_free(v); continue; } - if (v->arrays.count) + + if (type->type == HLSL_CLASS_STRUCT) { - hlsl_fixme(ctx, &v->loc, "Array initializer."); - free_parse_initializer(&v->initializer); + struct_var_initializer(ctx, statements_list, var, &v->initializer); vkd3d_free(v); continue; }

1 0

Giovanni Mascellani : vkd3d-shader/hlsl: Allow offsets for scalar and vector variables.
by Alexandre Julliard 18 Mar '22

18 Mar '22

Module: vkd3d Branch: master Commit: 84059d61c32950b634e44cac491ea8173705cc4d URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=84059d61c32950b634e44ca… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Thu Mar 10 12:14:05 2022 -0300 vkd3d-shader/hlsl: Allow offsets for scalar and vector variables. Signed-off-by: Francisco Casas <fcasas(a)codeweavers.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/hlsl.h | 3 +-- libs/vkd3d-shader/hlsl_codegen.c | 22 +++++----------------- libs/vkd3d-shader/hlsl_sm1.c | 4 ++-- libs/vkd3d-shader/hlsl_sm4.c | 14 +++++++++----- 4 files changed, 17 insertions(+), 26 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.h b/libs/vkd3d-shader/hlsl.h index 2e8ba4af..0543e144 100644 --- a/libs/vkd3d-shader/hlsl.h +++ b/libs/vkd3d-shader/hlsl.h @@ -794,8 +794,7 @@ unsigned int hlsl_swizzle_from_writemask(unsigned int writemask); bool hlsl_offset_from_deref(struct hlsl_ctx *ctx, const struct hlsl_deref *deref, unsigned int *offset); unsigned int hlsl_offset_from_deref_safe(struct hlsl_ctx *ctx, const struct hlsl_deref *deref); -struct hlsl_reg hlsl_reg_from_deref(struct hlsl_ctx *ctx, const struct hlsl_deref *deref, - const struct hlsl_type *type); +struct hlsl_reg hlsl_reg_from_deref(struct hlsl_ctx *ctx, const struct hlsl_deref *deref); bool hlsl_fold_constants(struct hlsl_ctx *ctx, struct hlsl_ir_node *instr, void *context); diff --git a/libs/vkd3d-shader/hlsl_codegen.c b/libs/vkd3d-shader/hlsl_codegen.c index ca3acba0..98be3aeb 100644 --- a/libs/vkd3d-shader/hlsl_codegen.c +++ b/libs/vkd3d-shader/hlsl_codegen.c @@ -1542,11 +1542,6 @@ static void allocate_objects(struct hlsl_ctx *ctx, enum hlsl_base_type type) } } -static bool type_is_single_reg(const struct hlsl_type *type) -{ - return type->type == HLSL_CLASS_SCALAR || type->type == HLSL_CLASS_VECTOR; -} - bool hlsl_offset_from_deref(struct hlsl_ctx *ctx, const struct hlsl_deref *deref, unsigned int *offset) { struct hlsl_ir_node *offset_node = deref->offset.node; @@ -1589,8 +1584,7 @@ unsigned int hlsl_offset_from_deref_safe(struct hlsl_ctx *ctx, const struct hlsl return 0; } -struct hlsl_reg hlsl_reg_from_deref(struct hlsl_ctx *ctx, const struct hlsl_deref *deref, - const struct hlsl_type *type) +struct hlsl_reg hlsl_reg_from_deref(struct hlsl_ctx *ctx, const struct hlsl_deref *deref) { const struct hlsl_ir_var *var = deref->var; struct hlsl_reg ret = var->reg; @@ -1598,16 +1592,10 @@ struct hlsl_reg hlsl_reg_from_deref(struct hlsl_ctx *ctx, const struct hlsl_dere ret.id += offset / 4; - if (type_is_single_reg(var->data_type)) - { - assert(!offset); - ret.writemask = var->reg.writemask; - } - else - { - assert(type_is_single_reg(type)); - ret.writemask = ((1 << type->dimx) - 1) << (offset % 4); - } + ret.writemask = 0xf & (0xf << (offset % 4)); + if (var->reg.writemask) + ret.writemask = hlsl_combine_writemasks(var->reg.writemask, ret.writemask); + return ret; } diff --git a/libs/vkd3d-shader/hlsl_sm1.c b/libs/vkd3d-shader/hlsl_sm1.c index 90ec6058..f661dbc2 100644 --- a/libs/vkd3d-shader/hlsl_sm1.c +++ b/libs/vkd3d-shader/hlsl_sm1.c @@ -663,7 +663,7 @@ static void write_sm1_expr(struct hlsl_ctx *ctx, struct vkd3d_bytecode_buffer *b static void write_sm1_load(struct hlsl_ctx *ctx, struct vkd3d_bytecode_buffer *buffer, const struct hlsl_ir_node *instr) { const struct hlsl_ir_load *load = hlsl_ir_load(instr); - const struct hlsl_reg reg = hlsl_reg_from_deref(ctx, &load->src, instr->data_type); + const struct hlsl_reg reg = hlsl_reg_from_deref(ctx, &load->src); struct sm1_instruction sm1_instr = { .opcode = D3DSIO_MOV, @@ -707,7 +707,7 @@ static void write_sm1_store(struct hlsl_ctx *ctx, struct vkd3d_bytecode_buffer * { const struct hlsl_ir_store *store = hlsl_ir_store(instr); const struct hlsl_ir_node *rhs = store->rhs.node; - const struct hlsl_reg reg = hlsl_reg_from_deref(ctx, &store->lhs, rhs->data_type); + const struct hlsl_reg reg = hlsl_reg_from_deref(ctx, &store->lhs); struct sm1_instruction sm1_instr = { .opcode = D3DSIO_MOV, diff --git a/libs/vkd3d-shader/hlsl_sm4.c b/libs/vkd3d-shader/hlsl_sm4.c index 6996bb2d..802db3c1 100644 --- a/libs/vkd3d-shader/hlsl_sm4.c +++ b/libs/vkd3d-shader/hlsl_sm4.c @@ -870,6 +870,8 @@ static void sm4_register_from_deref(struct hlsl_ctx *ctx, struct sm4_register *r if (hlsl_sm4_register_from_semantic(ctx, &var->semantic, false, &reg->type, swizzle_type, &has_idx)) { + unsigned int offset = hlsl_offset_from_deref_safe(ctx, deref); + if (has_idx) { reg->idx[0] = var->semantic.index; @@ -877,11 +879,11 @@ static void sm4_register_from_deref(struct hlsl_ctx *ctx, struct sm4_register *r } reg->dim = VKD3D_SM4_DIMENSION_VEC4; - *writemask = (1u << data_type->dimx) - 1; + *writemask = ((1u << data_type->dimx) - 1) << (offset % 4); } else { - struct hlsl_reg hlsl_reg = hlsl_reg_from_deref(ctx, deref, data_type); + struct hlsl_reg hlsl_reg = hlsl_reg_from_deref(ctx, deref); assert(hlsl_reg.allocated); reg->type = VKD3D_SM4_RT_INPUT; @@ -899,6 +901,8 @@ static void sm4_register_from_deref(struct hlsl_ctx *ctx, struct sm4_register *r if (hlsl_sm4_register_from_semantic(ctx, &var->semantic, true, &reg->type, swizzle_type, &has_idx)) { + unsigned int offset = hlsl_offset_from_deref_safe(ctx, deref); + if (has_idx) { reg->idx[0] = var->semantic.index; @@ -909,11 +913,11 @@ static void sm4_register_from_deref(struct hlsl_ctx *ctx, struct sm4_register *r reg->dim = VKD3D_SM4_DIMENSION_SCALAR; else reg->dim = VKD3D_SM4_DIMENSION_VEC4; - *writemask = (1u << data_type->dimx) - 1; + *writemask = ((1u << data_type->dimx) - 1) << (offset % 4); } else { - struct hlsl_reg hlsl_reg = hlsl_reg_from_deref(ctx, deref, data_type); + struct hlsl_reg hlsl_reg = hlsl_reg_from_deref(ctx, deref); assert(hlsl_reg.allocated); reg->type = VKD3D_SM4_RT_OUTPUT; @@ -925,7 +929,7 @@ static void sm4_register_from_deref(struct hlsl_ctx *ctx, struct sm4_register *r } else { - struct hlsl_reg hlsl_reg = hlsl_reg_from_deref(ctx, deref, data_type); + struct hlsl_reg hlsl_reg = hlsl_reg_from_deref(ctx, deref); assert(hlsl_reg.allocated); reg->type = VKD3D_SM4_RT_TEMP;

1 0

Zebediah Figura : vkd3d-shader/hlsl: Correctly calculate offsets for array elements.
by Alexandre Julliard 18 Mar '22

18 Mar '22

Module: vkd3d Branch: master Commit: ee764359d0fb2b9febb202de661a19234b8e293a URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=ee764359d0fb2b9febb202d… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Mar 17 21:58:35 2022 +0100 vkd3d-shader/hlsl: Correctly calculate offsets for array elements. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- Makefile.am | 2 +- libs/vkd3d-shader/hlsl.c | 7 +++++++ libs/vkd3d-shader/hlsl.h | 1 + libs/vkd3d-shader/hlsl.y | 2 +- libs/vkd3d-shader/hlsl_codegen.c | 2 +- tests/hlsl-struct-array.shader_test | 19 +++++++++++++++++++ 6 files changed, 30 insertions(+), 3 deletions(-) diff --git a/Makefile.am b/Makefile.am index 79aacfcd..f2c8440c 100644 --- a/Makefile.am +++ b/Makefile.am @@ -96,6 +96,7 @@ vkd3d_shader_tests = \ tests/hlsl-state-block-syntax.shader_test \ tests/hlsl-static-initializer.shader_test \ tests/hlsl-storage-qualifiers.shader_test \ + tests/hlsl-struct-array.shader_test \ tests/hlsl-struct-assignment.shader_test \ tests/hlsl-struct-semantics.shader_test \ tests/hlsl-vector-indexing.shader_test \ @@ -339,7 +340,6 @@ XFAIL_TESTS = \ tests/hlsl-majority-pragma.shader_test \ tests/hlsl-majority-typedef.shader_test \ tests/hlsl-mul.shader_test \ - tests/hlsl-nested-arrays.shader_test \ tests/hlsl-numeric-constructor-truncation.shader_test \ tests/hlsl-numeric-types.shader_test \ tests/hlsl-return-implicit-conversion.shader_test \ diff --git a/libs/vkd3d-shader/hlsl.c b/libs/vkd3d-shader/hlsl.c index ea5e35d2..d88b0b6d 100644 --- a/libs/vkd3d-shader/hlsl.c +++ b/libs/vkd3d-shader/hlsl.c @@ -202,6 +202,13 @@ static void hlsl_type_calculate_reg_size(struct hlsl_ctx *ctx, struct hlsl_type } } +/* Returns the size of a type, considered as part of an array of that type. + * As such it includes padding after the type. */ +unsigned int hlsl_type_get_array_element_reg_size(const struct hlsl_type *type) +{ + return align(type->reg_size, 4); +} + static struct hlsl_type *hlsl_new_type(struct hlsl_ctx *ctx, const char *name, enum hlsl_type_class type_class, enum hlsl_base_type base_type, unsigned dimx, unsigned dimy) { diff --git a/libs/vkd3d-shader/hlsl.h b/libs/vkd3d-shader/hlsl.h index 243ed72b..2e8ba4af 100644 --- a/libs/vkd3d-shader/hlsl.h +++ b/libs/vkd3d-shader/hlsl.h @@ -783,6 +783,7 @@ bool hlsl_scope_add_type(struct hlsl_scope *scope, struct hlsl_type *type); struct hlsl_type *hlsl_type_clone(struct hlsl_ctx *ctx, struct hlsl_type *old, unsigned int default_majority, unsigned int modifiers); unsigned int hlsl_type_component_count(struct hlsl_type *type); +unsigned int hlsl_type_get_array_element_reg_size(const struct hlsl_type *type); unsigned int hlsl_type_get_sm4_offset(const struct hlsl_type *type, unsigned int offset); bool hlsl_types_are_equal(const struct hlsl_type *t1, const struct hlsl_type *t2); diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index 92dcb3f2..521ca0a7 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -607,7 +607,7 @@ static struct hlsl_ir_load *add_array_load(struct hlsl_ctx *ctx, struct list *in return NULL; } - if (!(c = hlsl_new_uint_constant(ctx, data_type->reg_size, loc))) + if (!(c = hlsl_new_uint_constant(ctx, hlsl_type_get_array_element_reg_size(data_type), loc))) return NULL; list_add_tail(instrs, &c->node.entry); if (!(mul = hlsl_new_binary_expr(ctx, HLSL_OP2_MUL, index, &c->node))) diff --git a/libs/vkd3d-shader/hlsl_codegen.c b/libs/vkd3d-shader/hlsl_codegen.c index 62dbce5e..ca3acba0 100644 --- a/libs/vkd3d-shader/hlsl_codegen.c +++ b/libs/vkd3d-shader/hlsl_codegen.c @@ -621,7 +621,7 @@ static bool split_array_copies(struct hlsl_ctx *ctx, struct hlsl_ir_node *instr, if (type->type != HLSL_CLASS_ARRAY) return false; element_type = type->e.array.type; - element_size = element_type->reg_size; + element_size = hlsl_type_get_array_element_reg_size(element_type); for (i = 0; i < type->e.array.elements_count; ++i) { diff --git a/tests/hlsl-struct-array.shader_test b/tests/hlsl-struct-array.shader_test new file mode 100644 index 00000000..a5df9cdb --- /dev/null +++ b/tests/hlsl-struct-array.shader_test @@ -0,0 +1,19 @@ +% In SM4, array elements are always aligned to the next vec4, although structs are not. + +[pixel shader] +uniform struct +{ + float p, q; +} colours[3]; + +float4 main() : sv_target +{ + return float4(colours[0].q, colours[1].p, colours[2].q, colours[2].p); +} + +[test] +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.5 0.6 0.0 0.0 +draw quad +probe all rgba (0.2, 0.3, 0.6, 0.5)

1 0

Conor McCarthy : vkd3d: Do not copy descriptors having identical views.
by Alexandre Julliard 18 Mar '22

18 Mar '22

Module: vkd3d Branch: master Commit: 2b0fd2a055a4ad4a865a3314963cabd4a48f7249 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=2b0fd2a055a4ad4a865a331… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Tue Feb 22 01:19:01 2022 +1000 vkd3d: Do not copy descriptors having identical views. Improves performance in Control, which copies large numbers of descriptors per frame where often only ~10% are not identical. Signed-off-by: Conor McCarthy <cmccarthy(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d/command.c | 8 +++--- libs/vkd3d/device.c | 11 ++++++-- libs/vkd3d/resource.c | 63 +++++++++++++++++++++++++++------------------- libs/vkd3d/vkd3d_private.h | 11 +++++++- 4 files changed, 60 insertions(+), 33 deletions(-) Diff: https://source.winehq.org/git/vkd3d.git/?a=commitdiff;h=2b0fd2a055a4ad4a865…

1 0

Conor McCarthy : vkd3d: Optimise descriptor copying for Vulkan-backed heaps.
by Alexandre Julliard 18 Mar '22

18 Mar '22

Module: vkd3d Branch: master Commit: 5e4f1e1eadf2a9c5810dcae054bd5b170a6e5b46 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=5e4f1e1eadf2a9c5810dcae… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Tue Feb 22 01:19:00 2022 +1000 vkd3d: Optimise descriptor copying for Vulkan-backed heaps. Source descriptors are copied to separate arrays to facilitate use of pre-initialised Vulkan structures, and allow arrayed writes where possible. Signed-off-by: Conor McCarthy <cmccarthy(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d/device.c | 144 ++++++++++++++++++++++++++++++++++ libs/vkd3d/resource.c | 190 ++++++++++++++++++++++++++++++++++++++------- libs/vkd3d/vkd3d_private.h | 24 +++++- 3 files changed, 329 insertions(+), 29 deletions(-) Diff: https://source.winehq.org/git/vkd3d.git/?a=commitdiff;h=5e4f1e1eadf2a9c5810…

1 0

Conor McCarthy : vkd3d: Back descriptor heaps with Vulkan descriptor sets if descriptor indexing is available.
by Alexandre Julliard 18 Mar '22

18 Mar '22

Module: vkd3d Branch: master Commit: 2b71ea406f494e9068c110a99b4ff655b667fc1e URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=2b71ea406f494e9068c110a… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Tue Feb 22 01:18:59 2022 +1000 vkd3d: Back descriptor heaps with Vulkan descriptor sets if descriptor indexing is available. The existing implementation using virtual descriptor heaps, where Vk descriptor sets are created for the bindings in the root descriptor tables, is inefficient when multiple command lists are used with large descriptor heaps. It also cannot support updating a descriptor set after it is bound. This patch creates Vk sets for each D3D12 heap. Because D3D12 heaps can contain CBV, SRV and UAV descriptors in the same heap, multiple Vk sets are needed for each heap, however the total number of populated descriptors is never more than (heap size + UAV counter count). A new 'virtual_heaps' config option is introduced to make the old implementation available when needed. It's not always possible to determine if this is necessary when the device is created. Up to nine Vk descriptor sets may be used. It's theoretically possible to reduce this to eight by placing immutable samplers in the push descriptor set layout, but contradictions in earlier versions of the Vulkan spec made driver support inconsistent. The documentation was corrected in version 1.2.203. This patch also adds support for UAV counter descriptor arrays. It's not practical to add this in a separate patch due to complications with combining the old UAV counter implementation with the new descriptor heap implementation. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47713 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47154 Signed-off-by: Conor McCarthy <cmccarthy(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- README | 3 + include/private/vkd3d_common.h | 4 + include/vkd3d_windows.h | 1 + libs/vkd3d/command.c | 151 +++++++++++++++++++++++++++- libs/vkd3d/device.c | 159 ++++++++++++++++++++++++++++- libs/vkd3d/resource.c | 197 ++++++++++++++++++++++++++++++++++++ libs/vkd3d/state.c | 222 +++++++++++++++++++++++++++++++++++++++-- libs/vkd3d/vkd3d_private.h | 56 +++++++++++ tests/d3d12.c | 13 ++- 9 files changed, 787 insertions(+), 19 deletions(-) Diff: https://source.winehq.org/git/vkd3d.git/?a=commitdiff;h=2b71ea406f494e9068c…

1 0

Cressida Silver : wn20220318_414
by Jeremy Newman 18 Mar '22

18 Mar '22

Module: website Branch: master Commit: 6b279abb889099e70c8bbc3f21269e9feec98d3c URL: https://source.winehq.org/git/website.git/?a=commit;h=6b279abb889099e70c8bb… Author: Cressida Silver <cjsilver(a)codeweavers.com> Date: Fri Mar 18 13:21:15 2022 -0500 wn20220318_414 --- news/en/2022031802.xml | 13 +++ wwn/en/wn20220318_414.xml | 208 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 221 insertions(+) diff --git a/news/en/2022031802.xml b/news/en/2022031802.xml new file mode 100644 index 00000000..355c9bfb --- /dev/null +++ b/news/en/2022031802.xml @@ -0,0 +1,13 @@ +<news> + <date>March 18, 2022</date> + <title>World Wine News Issue 414</title> + <body> + <a href="{$root}/wwn/414">WWN Issue 414</a> was released today. + + <ul> + <li><a href="{$root}/wwn/414#The Curious Case of Phasmophobia">The Curious Case of Phasmophobia</a></li> + <li><a href="{$root}/wwn/414#Bugs: In Memoriam">Bugs: In Memoriam</a></li> + </ul> + + </body> +</news> diff --git a/wwn/en/wn20220318_414.xml b/wwn/en/wn20220318_414.xml new file mode 100644 index 00000000..1805bc76 --- /dev/null +++ b/wwn/en/wn20220318_414.xml @@ -0,0 +1,208 @@ +<kc> + <title>Wine Traffic</title> + <author contact="mailto:wwn@winehq.org">Cressida Silver</author> + <issue num="414" date="03/17/2022"/> + <intro> + + This is the 414th issue of the World Wine News publication. Its main goal is to inform you of what's going on around Wine. + Wine is an open source implementation of the Windows API on top of X and Unix. Think of it as a Windows compatibility layer. + Wine does not require Microsoft Windows, as it is a completely alternative implementation consisting of 100% Microsoft-free code. + + </intro> + + <section title="The Curious Case of Phasmophobia"> + + + Phasmophobia is an online co-op psychological horror game available on Steam. In Phasmophobia investigators are tasked with gathering evidence using various pieces of equipment in order to determine the type of spirit they are dealing with. One way players glean knowledge from the game is by speaking directly to the apparitions. No really, you (the player) speak with the phantom itself. To do this, Phasmophobia requires speech recognition software. + + + + Why all this talk about Phasmophobia? + + + + Wine 7.4 arrived last Friday, and it contains the beginnings of an implementation of the windows.media.speech libraries, which is the groundwork for speech recognition capabilities in Wine. The effort was spearheaded by Bernhard Kölbl, because it seemed if anyone was going to get the spirits in Phasmophobia to listen, it was going to be him. (Though he made it clear that this work wouldn't have been possible without the help of Rémi Bernon, Connor McAdams, Zeb Figura, et al.) + + + + Nothing worthwhile is ever easy though... sigh. Just getting started required fixing some parts of Wine that were broken, missing, or yet to be implemented (e.g., the HSTRING implementation, and WIDL compiler). Not only that, the work involves some (relatively) newer components of the Windows API, namely, the Universal Windows Platform (UWP) and Windows Runtime (WinRT). These components require a ton of boilerplate code to get even simple things going, and they function in new and (sometimes) weird ways. + + + + Once that was sorted, the next step was to select the speech recognition software. Ultimately, <a href="https://alphacephei.com/vosk/">Alpha Cephei's Vosk</a> was chosen. It is an open-source speech recognition toolkit that supports 20+ languages and dialects. Although Bernhard had never worked with Unixlibs before, he was able to get Vosk functioning with Wine. Hard work really does pay. 😀 + + + + This is just the beginning of speech recognition in Wine, and you can expect more patches soon! + + </section> + + <section title="Bugs: In Memoriam"> + + <center> + <table cellspacing="0" cellpadding="3" bordercolor="#222222" border="1"> + <tr> + <td width="100" align="center"> + Bug ID + </td> + <td width="100" align="center"> + Open Date + </td> + <td width="100" align="center"> + Days Open + </td> + <td width="100" align="center"> + Weeks Open + </td> + <td width="100" align="center"> + Months Open + </td> + <td width="100" align="center"> + Years Open + </td> + </tr> + <tr> + <td align="center"> + <a href ="https://bugs.winehq.org/show_bug.cgi?id=20296">20296</a> + </td> + <td align="center">10/9/09</td> + <td align="center">4536</td> + <td align="center">468</td> + <td align="center">149</td> + <td align="center">12</td> + </tr> + <tr> + <td align="center"> + <a href ="https://bugs.winehq.org/show_bug.cgi?id=41053">41053</a> + </td> + <td align="center">8/3/16</td> + <td align="center">2046</td> + <td align="center">292</td> + <td align="center">67</td> + <td align="center">6</td> + </tr> + <tr> + <td align="center"> + <a href ="https://bugs.winehq.org/show_bug.cgi?id=48508">48508</a> + </td> + <td align="center">1/24/20</td> + <td align="center">777</td> + <td align="center">111</td> + <td align="center">25</td> + <td align="center">2</td> + </tr> + <tr> + <td align="center"> + <a href ="https://bugs.winehq.org/show_bug.cgi?id=50887">50887</a> + </td> + <td align="center">3/30/21</td> + <td align="center">346</td> + <td align="center">49</td> + <td align="center">11</td> + <td align="center">1</td> + </tr> + <tr> + <td align="center"> + <a href ="https://bugs.winehq.org/show_bug.cgi?id=52204">52204</a> + </td> + <td align="center">12/11/21</td> + <td align="center">90</td> + <td align="center">13</td> + <td align="center">3</td> + <td align="center">0</td> + </tr> + <tr> + <td align="center"> + <a href ="https://bugs.winehq.org/show_bug.cgi?id=52476">52476</a> + </td> + <td align="center">1/28/22</td> + <td align="center">42</td> + <td align="center">6</td> + <td align="center">1</td> + <td align="center">0</td> + </tr> + <tr> + <td align="center"> + <a href ="https://bugs.winehq.org/show_bug.cgi?id=52562">52562</a> + </td> + <td align="center">2/17/22</td> + <td align="center">22</td> + <td align="center">3</td> + <td align="center">0</td> + <td align="center">0</td> + </tr> + <tr> + <td align="center"> + <a href ="https://bugs.winehq.org/show_bug.cgi?id=52581">52581</a> + </td> + <td align="center">2/22/22</td> + <td align="center">17</td> + <td align="center">2</td> + <td align="center">0</td> + <td align="center">0</td> + </tr> + <tr> + <td align="center"> + <a href ="https://bugs.winehq.org/show_bug.cgi?id=52596">52596</a> + </td> + <td align="center">2/26/22</td> + <td align="center">13</td> + <td align="center">2</td> + <td align="center">0</td> + <td align="center">0</td> + </tr> + <tr> + <td align="center"> + <a href ="https://bugs.winehq.org/show_bug.cgi?id=52614">52614</a> + </td> + <td align="center">3/1/22</td> + <td align="center">10</td> + <td align="center">1</td> + <td align="center">0</td> + <td align="center">0</td> + </tr> + <tr> + <td align="center"> + <a href ="https://bugs.winehq.org/show_bug.cgi?id=52618">52618</a> + </td> + <td align="center">3/2/22</td> + <td align="center">9</td> + <td align="center">1</td> + <td align="center">0</td> + <td align="center">0</td> + </tr> + <tr> + <td align="center"> + <a href ="https://bugs.winehq.org/show_bug.cgi?id=52626">52626</a> + </td> + <td align="center">3/4/22</td> + <td align="center">7</td> + <td align="center">1</td> + <td align="center">0</td> + <td align="center">0</td> + </tr> + <tr> + <td align="center"> + <a href ="https://bugs.winehq.org/show_bug.cgi?id=52637">52637</a> + </td> + <td align="center">3/8/22</td> + <td align="center">3</td> + <td align="center">0</td> + <td align="center">0</td> + <td align="center">0</td> + </tr> + <tr> + <td align="center"> + <a href ="https://bugs.winehq.org/show_bug.cgi?id=52639">52639</a> + </td> + <td align="center">3/8/22</td> + <td align="center">3</td> + <td align="center">0</td> + <td align="center">0</td> + <td align="center">0</td> + </tr> + </table> + </center> + + </section> +</kc>

1 0

Daniel Lehman : propsys/tests: Add some InitVariantFromFileTime tests.
by Alexandre Julliard 17 Mar '22

17 Mar '22

Module: wine Branch: master Commit: 083dea7fce4372840ac18176496a7d05dadd5ad8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=083dea7fce4372840ac18176… Author: Daniel Lehman <dlehman(a)esri.com> Date: Tue Mar 15 07:17:37 2022 -0700 propsys/tests: Add some InitVariantFromFileTime tests. Signed-off-by: Daniel Lehman <dlehman(a)esri.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/propsys/tests/propsys.c | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) diff --git a/dlls/propsys/tests/propsys.c b/dlls/propsys/tests/propsys.c index 36b1a9dca8e..124b3405bcb 100644 --- a/dlls/propsys/tests/propsys.c +++ b/dlls/propsys/tests/propsys.c @@ -2030,6 +2030,40 @@ static void test_PSCreatePropertyStoreFromObject(void) IPropertyStore_Release(propstore); } +static void test_InitVariantFromFileTime(void) +{ + FILETIME ft = {0}; + SYSTEMTIME st; + VARIANT var; + HRESULT hr; + double d; + + VariantInit(&var); + if (0) /* crash on Windows */ + { + InitVariantFromFileTime(&ft, NULL); + InitVariantFromFileTime(NULL, &var); + } + + ft.dwHighDateTime = -1; + ft.dwLowDateTime = -1; + V_VT(&var) = 0xdead; + V_DATE(&var) = 42.0; + hr = InitVariantFromFileTime(&ft, &var); + ok(hr == E_INVALIDARG, "Unexpected hr %#lx.\n", hr); + ok(V_VT(&var) == VT_EMPTY, "Unexpected VT %d\n", V_VT(&var)); + ok(V_DATE(&var) == 0.0, "got wrong value: %f, expected 0.0\n", V_DATE(&var)); + + GetSystemTimeAsFileTime(&ft); + hr = InitVariantFromFileTime(&ft, &var); + ok(V_VT(&var) == VT_DATE, "Unexpected VT %d\n", V_VT(&var)); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + + FileTimeToSystemTime(&ft, &st); + SystemTimeToVariantTime(&st, &d); + ok(V_DATE(&var) == d, "got wrong value: %f, expected %f\n", V_DATE(&var), d); +} + START_TEST(propsys) { test_PSStringFromPropertyKey(); @@ -2053,4 +2087,5 @@ START_TEST(propsys) test_PSCreateMemoryPropertyStore(); test_propertystore(); test_PSCreatePropertyStoreFromObject(); + test_InitVariantFromFileTime(); }

1 0

Daniel Lehman : propsys: Implement InitVariantFromFileTime.
by Alexandre Julliard 17 Mar '22

17 Mar '22

Module: wine Branch: master Commit: f2b8ccb7b0b22b7b5d661d908f8f8ee02f22647d URL: https://source.winehq.org/git/wine.git/?a=commit;h=f2b8ccb7b0b22b7b5d661d90… Author: Daniel Lehman <dlehman(a)esri.com> Date: Tue Mar 15 07:30:59 2022 -0700 propsys: Implement InitVariantFromFileTime. Signed-off-by: Daniel Lehman <dlehman(a)esri.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/propsys/propsys.spec | 2 +- dlls/propsys/propvar.c | 15 +++++++++++++++ include/propvarutil.h | 1 + 3 files changed, 17 insertions(+), 1 deletion(-) diff --git a/dlls/propsys/propsys.spec b/dlls/propsys/propsys.spec index 35828057264..15749952e95 100644 --- a/dlls/propsys/propsys.spec +++ b/dlls/propsys/propsys.spec @@ -49,7 +49,7 @@ @ stub InitVariantFromBooleanArray @ stdcall InitVariantFromBuffer(ptr long ptr) @ stub InitVariantFromDoubleArray -@ stub InitVariantFromFileTime +@ stdcall InitVariantFromFileTime(ptr ptr) @ stub InitVariantFromFileTimeArray @ stdcall InitVariantFromGUIDAsString(ptr ptr) @ stub InitVariantFromInt16Array diff --git a/dlls/propsys/propvar.c b/dlls/propsys/propvar.c index be27c5cb641..8f6c52f7aa7 100644 --- a/dlls/propsys/propvar.c +++ b/dlls/propsys/propvar.c @@ -672,6 +672,21 @@ HRESULT WINAPI InitVariantFromBuffer(const VOID *pv, UINT cb, VARIANT *pvar) return S_OK; } +HRESULT WINAPI InitVariantFromFileTime(const FILETIME *ft, VARIANT *var) +{ + SYSTEMTIME st; + + TRACE("%p, %p\n", ft, var); + + VariantInit(var); + if (!FileTimeToSystemTime(ft, &st)) + return E_INVALIDARG; + if (!SystemTimeToVariantTime(&st, &V_DATE(var))) + return E_INVALIDARG; + V_VT(var) = VT_DATE; + return S_OK; +} + static inline DWORD PROPVAR_HexToNum(const WCHAR *hex) { DWORD ret; diff --git a/include/propvarutil.h b/include/propvarutil.h index 55b64abbe4f..36a670f56e6 100644 --- a/include/propvarutil.h +++ b/include/propvarutil.h @@ -71,6 +71,7 @@ typedef int PROPVAR_COMPARE_FLAGS; HRESULT WINAPI PropVariantChangeType(PROPVARIANT *ppropvarDest, REFPROPVARIANT propvarSrc, PROPVAR_CHANGE_FLAGS flags, VARTYPE vt); HRESULT WINAPI InitPropVariantFromGUIDAsString(REFGUID guid, PROPVARIANT *ppropvar); +HRESULT WINAPI InitVariantFromFileTime(const FILETIME *ft, VARIANT *var); HRESULT WINAPI InitVariantFromGUIDAsString(REFGUID guid, VARIANT *pvar); HRESULT WINAPI InitPropVariantFromBuffer(const VOID *pv, UINT cb, PROPVARIANT *ppropvar); HRESULT WINAPI InitPropVariantFromCLSID(REFCLSID clsid, PROPVARIANT *ppropvar);

1 0

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 March 2022