- Wine-Commits - list.winehq.org

Francisco Casas : vkd3d-shader/hlsl: Use hlsl_ir_index for resource access.
by Alexandre Julliard May 3, 2023

May 3, 2023

Module: vkd3d Branch: master Commit: 4aaf6b88951903d96cccc1bbb63ce3bb80e15e7d URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/4aaf6b88951903d96cccc1bbb63ce… Author: Francisco Casas <fcasas(a)codeweavers.com> Date: Fri Mar 10 17:23:49 2023 -0300 vkd3d-shader/hlsl: Use hlsl_ir_index for resource access. This patch makes index expressions on resources hlsl_ir_index nodes instead of hlsl_ir_resource_load nodes, because it is not known if they will be used later as the lhs of an hlsl_ir_resource_store. For now, the only benefit is consistency. --- libs/vkd3d-shader/hlsl.c | 5 +++++ libs/vkd3d-shader/hlsl.h | 1 + libs/vkd3d-shader/hlsl.y | 42 ++++++++++++++++++++++------------------ libs/vkd3d-shader/hlsl_codegen.c | 20 ++++++++++++++++++- 4 files changed, 48 insertions(+), 20 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.c b/libs/vkd3d-shader/hlsl.c index 51da0510..9de37a93 100644 --- a/libs/vkd3d-shader/hlsl.c +++ b/libs/vkd3d-shader/hlsl.c @@ -1369,6 +1369,11 @@ bool hlsl_index_is_noncontiguous(struct hlsl_ir_index *index) return type->class == HLSL_CLASS_MATRIX && !hlsl_type_is_row_major(type); } +bool hlsl_index_is_resource_access(struct hlsl_ir_index *index) +{ + return index->val.node->data_type->class == HLSL_CLASS_OBJECT; +} + struct hlsl_ir_node *hlsl_new_index(struct hlsl_ctx *ctx, struct hlsl_ir_node *val, struct hlsl_ir_node *idx, const struct vkd3d_shader_location *loc) { diff --git a/libs/vkd3d-shader/hlsl.h b/libs/vkd3d-shader/hlsl.h index b15950f4..45c17717 100644 --- a/libs/vkd3d-shader/hlsl.h +++ b/libs/vkd3d-shader/hlsl.h @@ -1106,6 +1106,7 @@ struct hlsl_ir_store *hlsl_new_store_component(struct hlsl_ctx *ctx, struct hlsl const struct hlsl_deref *lhs, unsigned int comp, struct hlsl_ir_node *rhs); bool hlsl_index_is_noncontiguous(struct hlsl_ir_index *index); +bool hlsl_index_is_resource_access(struct hlsl_ir_index *index); struct hlsl_ir_node *hlsl_new_index(struct hlsl_ctx *ctx, struct hlsl_ir_node *val, struct hlsl_ir_node *idx, const struct vkd3d_shader_location *loc); diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index 1ce65e84..a5814c0a 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -755,9 +755,7 @@ static bool add_array_access(struct hlsl_ctx *ctx, struct list *instrs, struct h && (expr_type->base_type == HLSL_TYPE_TEXTURE || expr_type->base_type == HLSL_TYPE_UAV) && expr_type->sampler_dim != HLSL_SAMPLER_DIM_GENERIC) { - struct hlsl_resource_load_params load_params = {.type = HLSL_RESOURCE_LOAD}; unsigned int dim_count = hlsl_sampler_dim_count(expr_type->sampler_dim); - struct hlsl_ir_node *resource_load; if (index_type->class > HLSL_CLASS_VECTOR || index_type->dimx != dim_count) { @@ -777,13 +775,10 @@ static bool add_array_access(struct hlsl_ctx *ctx, struct list *instrs, struct h if (!(index = add_zero_mipmap_level(ctx, instrs, index, dim_count, loc))) return false; - load_params.format = expr_type->e.resource_format; - load_params.resource = array; - load_params.coords = index; - - if (!(resource_load = hlsl_new_resource_load(ctx, &load_params, loc))) + if (!(return_index = hlsl_new_index(ctx, array, index, loc))) return false; - list_add_tail(instrs, &resource_load->entry); + list_add_tail(instrs, &return_index->entry); + return true; } @@ -1716,7 +1711,7 @@ static struct hlsl_ir_node *add_assignment(struct hlsl_ctx *ctx, struct list *in if (!(rhs = add_implicit_conversion(ctx, instrs, rhs, lhs_type, &rhs->loc))) return NULL; - while (lhs->type != HLSL_IR_LOAD && lhs->type != HLSL_IR_RESOURCE_LOAD && lhs->type != HLSL_IR_INDEX) + while (lhs->type != HLSL_IR_LOAD && lhs->type != HLSL_IR_INDEX) { if (lhs->type == HLSL_IR_EXPR && hlsl_ir_expr(lhs)->op == HLSL_OP1_CAST) { @@ -1753,17 +1748,19 @@ static struct hlsl_ir_node *add_assignment(struct hlsl_ctx *ctx, struct list *in } } - if (lhs->type == HLSL_IR_RESOURCE_LOAD) + if (lhs->type == HLSL_IR_INDEX && hlsl_index_is_resource_access(hlsl_ir_index(lhs))) { - struct hlsl_ir_resource_load *load = hlsl_ir_resource_load(lhs); + struct hlsl_ir_node *load_coords = hlsl_ir_index(lhs)->idx.node; + struct hlsl_deref resource_deref; struct hlsl_type *resource_type; struct hlsl_ir_swizzle *coords; struct hlsl_ir_node *store; unsigned int dim_count; - /* Such an lvalue was produced by an index expression. */ - assert(load->load_type == HLSL_RESOURCE_LOAD); - resource_type = hlsl_deref_get_type(ctx, &load->resource); + if (!hlsl_init_deref_from_index_chain(ctx, &resource_deref, hlsl_ir_index(lhs)->val.node)) + return NULL; + + resource_type = hlsl_deref_get_type(ctx, &resource_deref); assert(resource_type->class == HLSL_CLASS_OBJECT); assert(resource_type->base_type == HLSL_TYPE_TEXTURE || resource_type->base_type == HLSL_TYPE_UAV); @@ -1778,16 +1775,23 @@ static struct hlsl_ir_node *add_assignment(struct hlsl_ctx *ctx, struct list *in "Resource store expressions must write to all components."); /* Remove the (implicit) mipmap level from the load expression. */ - assert(load->coords.node->data_type->class == HLSL_CLASS_VECTOR); - assert(load->coords.node->data_type->base_type == HLSL_TYPE_UINT); - assert(load->coords.node->data_type->dimx == dim_count + 1); - if (!(coords = hlsl_new_swizzle(ctx, HLSL_SWIZZLE(X, Y, Z, W), dim_count, load->coords.node, &lhs->loc))) + assert(load_coords->data_type->class == HLSL_CLASS_VECTOR); + assert(load_coords->data_type->base_type == HLSL_TYPE_UINT); + assert(load_coords->data_type->dimx == dim_count + 1); + if (!(coords = hlsl_new_swizzle(ctx, HLSL_SWIZZLE(X, Y, Z, W), dim_count, load_coords, &lhs->loc))) + { + hlsl_cleanup_deref(&resource_deref); return NULL; + } list_add_tail(instrs, &coords->node.entry); - if (!(store = hlsl_new_resource_store(ctx, &load->resource, &coords->node, rhs, &lhs->loc))) + if (!(store = hlsl_new_resource_store(ctx, &resource_deref, &coords->node, rhs, &lhs->loc))) + { + hlsl_cleanup_deref(&resource_deref); return NULL; + } list_add_tail(instrs, &store->entry); + hlsl_cleanup_deref(&resource_deref); } else if (lhs->type == HLSL_IR_INDEX && hlsl_index_is_noncontiguous(hlsl_ir_index(lhs))) { diff --git a/libs/vkd3d-shader/hlsl_codegen.c b/libs/vkd3d-shader/hlsl_codegen.c index c103841d..d23014e6 100644 --- a/libs/vkd3d-shader/hlsl_codegen.c +++ b/libs/vkd3d-shader/hlsl_codegen.c @@ -862,7 +862,8 @@ static bool lower_calls(struct hlsl_ctx *ctx, struct hlsl_ir_node *instr, void * * record access before knowing if they will be used in the lhs of an assignment --in which case * they are lowered into a deref-- or as the load of an element within a larger value. * For the latter case, this pass takes care of lowering hlsl_ir_indexes into individual - * hlsl_ir_loads. */ + * hlsl_ir_loads, or individual hlsl_ir_resource_loads, in case the indexing is a + * resource access. */ static bool lower_index_loads(struct hlsl_ctx *ctx, struct hlsl_ir_node *instr, void *context) { struct hlsl_deref var_deref; @@ -877,6 +878,23 @@ static bool lower_index_loads(struct hlsl_ctx *ctx, struct hlsl_ir_node *instr, index = hlsl_ir_index(instr); val = index->val.node; + if (hlsl_index_is_resource_access(index)) + { + struct hlsl_resource_load_params params = {0}; + struct hlsl_ir_node *load; + + params.type = HLSL_RESOURCE_LOAD; + params.resource = val; + params.coords = index->idx.node; + params.format = val->data_type->e.resource_format; + + if (!(load = hlsl_new_resource_load(ctx, &params, &instr->loc))) + return false; + list_add_before(&instr->entry, &load->entry); + hlsl_replace_node(instr, load); + return true; + } + if (!(var = hlsl_new_synthetic_var(ctx, "index-val", val->data_type, &instr->loc))) return false; hlsl_init_simple_deref_from_var(&var_deref, var);

1 0

Francisco Casas : vkd3d-shader/hlsl: Don't keep the implicit mipmap level on hlsl_ir_index.
by Alexandre Julliard May 3, 2023

May 3, 2023

Module: vkd3d Branch: master Commit: 34ddc13390f650607f602322ff3d28aabe974609 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/34ddc13390f650607f602322ff3d2… Author: Francisco Casas <fcasas(a)codeweavers.com> Date: Fri Apr 28 13:03:36 2023 -0400 vkd3d-shader/hlsl: Don't keep the implicit mipmap level on hlsl_ir_index. --- libs/vkd3d-shader/hlsl.y | 54 ++++------------------------------------ libs/vkd3d-shader/hlsl_codegen.c | 47 +++++++++++++++++++++++++++++++++- 2 files changed, 51 insertions(+), 50 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index a5814c0a..75c0e421 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -712,39 +712,6 @@ static struct hlsl_ir_node *add_binary_arithmetic_expr(struct hlsl_ctx *ctx, str enum hlsl_ir_expr_op op, struct hlsl_ir_node *arg1, struct hlsl_ir_node *arg2, const struct vkd3d_shader_location *loc); -static struct hlsl_ir_node *add_zero_mipmap_level(struct hlsl_ctx *ctx, struct list *instrs, - struct hlsl_ir_node *index, unsigned int dim_count, const struct vkd3d_shader_location *loc) -{ - struct hlsl_ir_load *coords_load; - struct hlsl_deref coords_deref; - struct hlsl_ir_constant *zero; - struct hlsl_ir_store *store; - struct hlsl_ir_var *coords; - - if (!(coords = hlsl_new_synthetic_var(ctx, "coords", - hlsl_get_vector_type(ctx, HLSL_TYPE_UINT, dim_count + 1), loc))) - return NULL; - - hlsl_init_simple_deref_from_var(&coords_deref, coords); - if (!(store = hlsl_new_store_index(ctx, &coords_deref, NULL, index, (1u << dim_count) - 1, loc))) - return NULL; - list_add_tail(instrs, &store->node.entry); - - if (!(zero = hlsl_new_uint_constant(ctx, 0, loc))) - return NULL; - list_add_tail(instrs, &zero->node.entry); - - if (!(store = hlsl_new_store_index(ctx, &coords_deref, NULL, &zero->node, 1u << dim_count, loc))) - return NULL; - list_add_tail(instrs, &store->node.entry); - - if (!(coords_load = hlsl_new_var_load(ctx, coords, loc))) - return NULL; - list_add_tail(instrs, &coords_load->node.entry); - - return &coords_load->node; -} - static bool add_array_access(struct hlsl_ctx *ctx, struct list *instrs, struct hlsl_ir_node *array, struct hlsl_ir_node *index, const struct vkd3d_shader_location *loc) { @@ -772,9 +739,6 @@ static bool add_array_access(struct hlsl_ctx *ctx, struct list *instrs, struct h hlsl_get_vector_type(ctx, HLSL_TYPE_UINT, dim_count), &index->loc))) return false; - if (!(index = add_zero_mipmap_level(ctx, instrs, index, dim_count, loc))) - return false; - if (!(return_index = hlsl_new_index(ctx, array, index, loc))) return false; list_add_tail(instrs, &return_index->entry); @@ -1750,10 +1714,9 @@ static struct hlsl_ir_node *add_assignment(struct hlsl_ctx *ctx, struct list *in if (lhs->type == HLSL_IR_INDEX && hlsl_index_is_resource_access(hlsl_ir_index(lhs))) { - struct hlsl_ir_node *load_coords = hlsl_ir_index(lhs)->idx.node; + struct hlsl_ir_node *coords = hlsl_ir_index(lhs)->idx.node; struct hlsl_deref resource_deref; struct hlsl_type *resource_type; - struct hlsl_ir_swizzle *coords; struct hlsl_ir_node *store; unsigned int dim_count; @@ -1774,18 +1737,11 @@ static struct hlsl_ir_node *add_assignment(struct hlsl_ctx *ctx, struct list *in hlsl_error(ctx, &lhs->loc, VKD3D_SHADER_ERROR_HLSL_INVALID_WRITEMASK, "Resource store expressions must write to all components."); - /* Remove the (implicit) mipmap level from the load expression. */ - assert(load_coords->data_type->class == HLSL_CLASS_VECTOR); - assert(load_coords->data_type->base_type == HLSL_TYPE_UINT); - assert(load_coords->data_type->dimx == dim_count + 1); - if (!(coords = hlsl_new_swizzle(ctx, HLSL_SWIZZLE(X, Y, Z, W), dim_count, load_coords, &lhs->loc))) - { - hlsl_cleanup_deref(&resource_deref); - return NULL; - } - list_add_tail(instrs, &coords->node.entry); + assert(coords->data_type->class == HLSL_CLASS_VECTOR); + assert(coords->data_type->base_type == HLSL_TYPE_UINT); + assert(coords->data_type->dimx == dim_count); - if (!(store = hlsl_new_resource_store(ctx, &resource_deref, &coords->node, rhs, &lhs->loc))) + if (!(store = hlsl_new_resource_store(ctx, &resource_deref, coords, rhs, &lhs->loc))) { hlsl_cleanup_deref(&resource_deref); return NULL; diff --git a/libs/vkd3d-shader/hlsl_codegen.c b/libs/vkd3d-shader/hlsl_codegen.c index d23014e6..f3bf7375 100644 --- a/libs/vkd3d-shader/hlsl_codegen.c +++ b/libs/vkd3d-shader/hlsl_codegen.c @@ -858,6 +858,42 @@ static bool lower_calls(struct hlsl_ctx *ctx, struct hlsl_ir_node *instr, void * return true; } +static struct hlsl_ir_node *add_zero_mipmap_level(struct hlsl_ctx *ctx, struct hlsl_ir_node *index, + const struct vkd3d_shader_location *loc) +{ + unsigned int dim_count = index->data_type->dimx; + struct hlsl_ir_load *coords_load; + struct hlsl_deref coords_deref; + struct hlsl_ir_constant *zero; + struct hlsl_ir_store *store; + struct hlsl_ir_var *coords; + + assert(dim_count < 4); + + if (!(coords = hlsl_new_synthetic_var(ctx, "coords", + hlsl_get_vector_type(ctx, HLSL_TYPE_UINT, dim_count + 1), loc))) + return NULL; + + hlsl_init_simple_deref_from_var(&coords_deref, coords); + if (!(store = hlsl_new_store_index(ctx, &coords_deref, NULL, index, (1u << dim_count) - 1, loc))) + return NULL; + list_add_after(&index->entry, &store->node.entry); + + if (!(zero = hlsl_new_uint_constant(ctx, 0, loc))) + return NULL; + list_add_after(&store->node.entry, &zero->node.entry); + + if (!(store = hlsl_new_store_index(ctx, &coords_deref, NULL, &zero->node, 1u << dim_count, loc))) + return NULL; + list_add_after(&zero->node.entry, &store->node.entry); + + if (!(coords_load = hlsl_new_var_load(ctx, coords, loc))) + return NULL; + list_add_after(&store->node.entry, &coords_load->node.entry); + + return &coords_load->node; +} + /* hlsl_ir_index nodes are a parse-time construct used to represent array indexing and struct * record access before knowing if they will be used in the lhs of an assignment --in which case * they are lowered into a deref-- or as the load of an element within a larger value. @@ -880,12 +916,21 @@ static bool lower_index_loads(struct hlsl_ctx *ctx, struct hlsl_ir_node *instr, if (hlsl_index_is_resource_access(index)) { + unsigned int dim_count = hlsl_sampler_dim_count(val->data_type->sampler_dim); + struct hlsl_ir_node *coords = index->idx.node; struct hlsl_resource_load_params params = {0}; struct hlsl_ir_node *load; + assert(coords->data_type->class == HLSL_CLASS_VECTOR); + assert(coords->data_type->base_type == HLSL_TYPE_UINT); + assert(coords->data_type->dimx == dim_count); + + if (!(coords = add_zero_mipmap_level(ctx, coords, &instr->loc))) + return false; + params.type = HLSL_RESOURCE_LOAD; params.resource = val; - params.coords = index->idx.node; + params.coords = coords; params.format = val->data_type->e.resource_format; if (!(load = hlsl_new_resource_load(ctx, &params, &instr->loc)))

1 0

Tag vkd3d-1.7.1 : Alexandre Julliard : Release 1.7.1
by Alexandre Julliard May 3, 2023

May 3, 2023

Module: vkd3d Branch: refs/tags/vkd3d-1.7.1 Tag: 9ed6c6d6998fcd14a3a836dfe247b73961be8af6 URL: https://gitlab.winehq.org/wine/vkd3d/-/tags/9ed6c6d6998fcd14a3a836dfe247b73… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Wed May 3 21:52:16 2023 +0200 Release 1.7.1

1 0

Giovanni Mascellani : Release 1.7.1.
by Alexandre Julliard May 3, 2023

May 3, 2023

Module: vkd3d Branch: vkd3d-1.7.x Commit: 154acd2c2bbf6351857275f4662da5df192d4e8b URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/154acd2c2bbf6351857275f4662da… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Thu Apr 27 15:59:37 2023 +0200 Release 1.7.1. --- ANNOUNCE | 66 +++++++++++++++--------------------------------------------- configure.ac | 2 +- 2 files changed, 17 insertions(+), 51 deletions(-) diff --git a/ANNOUNCE b/ANNOUNCE index abc46f45..1cbf8e42 100644 --- a/ANNOUNCE +++ b/ANNOUNCE @@ -1,17 +1,12 @@ -The Wine team is proud to announce that release 1.7 of vkd3d, the Direct3D to +The Wine team is proud to announce that release 1.7.1 of vkd3d, the Direct3D to Vulkan translation library, is now available. -This release contains improvements that are listed in the release notes below. -The main highlights are: - - - Support for many more HLSL features and intrinsics. - - Much improved support for the Direct3D shader model 1/2/3 HLSL profiles. - - Public vkd3d-shader API for parsing and serialising DXBC blobs. - - Miscellaneous bug fixes. +This is a bugfix release, only containing targeted fixes for a couple +of defects that had slipped in in vkd3d 1.7. The source is available from the following location: - https://dl.winehq.org/vkd3d/source/vkd3d-1.7.tar.xz + https://dl.winehq.org/vkd3d/source/vkd3d-1.7.1.tar.xz The current source can also be pulled directly from the git repository: @@ -22,49 +17,20 @@ for the complete list. ---------------------------------------------------------------- -What's new in vkd3d 1.7 -======================= - +What's new in vkd3d 1.7.1 +========================= -*** libvkd3d-shader -- New features for the HLSL source type: - - Support for calling user-defined functions. - - Support for array parameters to user-defined functions. - - Much improved support for the Direct3D shader model 1/2/3 profiles. - - Support for the SV_DispatchThreadID, SV_GroupID, and SV_GroupThreadID - compute shader system-value semantics. - - Support for the optional "offset" parameter of the texture object Load() - method. - - Support for the all() intrinsic function. - - Support for the distance() intrinsic function. - - Support for the exp() and exp2() intrinsic functions. - - Support for the frac() intrinsic function. - - Support for the lit() intrinsic function. - - Support for the reflect() intrinsic function. - - Support for the sin() and cos() intrinsic functions. - - Support for the smoothstep() intrinsic function. - - Support for the sqrt() and rsqrt() intrinsic functions. - - Support for the step() intrinsic function. - - Support for the transpose() intrinsic function. - - Support for the case-insensitive variants of the "float" and "dword" data - types. - - Partial support for minimum precision data types like "min16float". These - are currently interpreted as their regular counterparts. - - Improved constant propagation support, in particular to constant - propagation through swizzles. +*** libvkd3d -- HLSL static variables are now properly zero-initialised. +- Release 1.7 has a bug that causes an internal mutex in its command + queue implementation to be unlocked too early under certain usage + patterns. This is known to further cause internal inconsistencies + that manifest as program deadlocks for some programs. In release + 1.7.1 the mutex is correctly kept locked until required. -- The Direct3D shader model 4 and 5 disassembler outputs sample counts for - multi-sampled resource declarations. +*** libvkd3d-utils -- New interfaces: - - vkd3d_shader_parse_dxbc() provides support for parsing DXBC blobs. - - vkd3d_shader_serialize_dxbc() provides support for serialising DXBC blobs. - - vkd3d_shader_free_dxbc() is used to free vkd3d_shader_dxbc_desc - structures, as returned by vkd3d_shader_parse_dxbc(). - - The VKD3D_SHADER_COMPILE_OPTION_WRITE_TESS_GEOM_POINT_SIZE compile option - can be used to specify whether SPIR-V shaders targeting Vulkan - environments should write point sizes for geometry and tessellation - shaders. If left unspecified, point sizes will be written. +- Symbol D3D12CreateDevice is mistakenly not exported in release 1.7, + breaking library clients that need it. The symbol is exported again + in release 1.7.1. diff --git a/configure.ac b/configure.ac index 29225c8c..bcf683ea 100644 --- a/configure.ac +++ b/configure.ac @@ -1,5 +1,5 @@ AC_PREREQ([2.69]) -AC_INIT([vkd3d],[1.7]) +AC_INIT([vkd3d],[1.7.1]) AC_CONFIG_AUX_DIR([bin]) AC_CONFIG_MACRO_DIR([m4])

1 0

Conor McCarthy : vkd3d: Leave the command queue op mutex locked after a partial flush.
by Alexandre Julliard May 3, 2023

May 3, 2023

Module: vkd3d Branch: vkd3d-1.7.x Commit: 7b9b0179ec883c37b1b29ca17de3d013257f0b36 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/7b9b0179ec883c37b1b29ca17de3d… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Wed Apr 5 00:54:51 2023 +1000 vkd3d: Leave the command queue op mutex locked after a partial flush. All return paths in d3d12_command_queue_flush_ops_locked() must leave the op mutex locked. --- libs/vkd3d/command.c | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c index e5ead7d3..6eddcfa2 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -6781,16 +6781,16 @@ static bool d3d12_command_queue_op_array_append(struct d3d12_command_queue_op_ar return true; } -static HRESULT d3d12_command_queue_fixup_after_flush(struct d3d12_command_queue *queue, unsigned int done_count) +static void d3d12_command_queue_delete_aux_ops(struct d3d12_command_queue *queue, + unsigned int done_count) { - HRESULT hr; - queue->aux_op_queue.count -= done_count; memmove(queue->aux_op_queue.ops, &queue->aux_op_queue.ops[done_count], queue->aux_op_queue.count * sizeof(*queue->aux_op_queue.ops)); +} - vkd3d_mutex_lock(&queue->op_mutex); - +static HRESULT d3d12_command_queue_fixup_after_flush_locked(struct d3d12_command_queue *queue) +{ d3d12_command_queue_swap_queues(queue); d3d12_command_queue_op_array_append(&queue->op_queue, queue->aux_op_queue.count, queue->aux_op_queue.ops); @@ -6798,11 +6798,7 @@ static HRESULT d3d12_command_queue_fixup_after_flush(struct d3d12_command_queue queue->aux_op_queue.count = 0; queue->is_flushing = false; - hr = d3d12_command_queue_record_as_blocked(queue); - - vkd3d_mutex_unlock(&queue->op_mutex); - - return hr; + return d3d12_command_queue_record_as_blocked(queue); } static HRESULT d3d12_command_queue_flush_ops(struct d3d12_command_queue *queue, bool *flushed_any) @@ -6855,7 +6851,9 @@ static HRESULT d3d12_command_queue_flush_ops_locked(struct d3d12_command_queue * if (op->u.wait.value > fence->max_pending_value) { vkd3d_mutex_unlock(&fence->mutex); - return d3d12_command_queue_fixup_after_flush(queue, i); + d3d12_command_queue_delete_aux_ops(queue, i); + vkd3d_mutex_lock(&queue->op_mutex); + return d3d12_command_queue_fixup_after_flush_locked(queue); } d3d12_command_queue_wait_locked(queue, fence, op->u.wait.value); d3d12_fence_decref(fence);

1 0

Henri Verbeet : vkd3d-utils: Export D3D12CreateDevice() once again.
by Alexandre Julliard May 3, 2023

May 3, 2023

Module: vkd3d Branch: vkd3d-1.7.x Commit: cb2acc35f2e4501888311dac6870612184a51db2 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/cb2acc35f2e4501888311dac68706… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Apr 4 14:44:42 2023 +0200 vkd3d-utils: Export D3D12CreateDevice() once again. Commit d27fee64ab51c60078215f461a797edd32bc8871 inadvertently stopped exporting D3D12CreateDevice(). --- libs/vkd3d-utils/vkd3d_utils_main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/vkd3d-utils/vkd3d_utils_main.c b/libs/vkd3d-utils/vkd3d_utils_main.c index 3911c11b..aa1ac5fe 100644 --- a/libs/vkd3d-utils/vkd3d_utils_main.c +++ b/libs/vkd3d-utils/vkd3d_utils_main.c @@ -85,7 +85,7 @@ HRESULT WINAPI D3D12CreateDeviceVKD3D(IUnknown *adapter, D3D_FEATURE_LEVEL minim return vkd3d_create_device(&device_create_info, iid, device); } -HRESULT WINAPI D3D12CreateDevice(IUnknown *adapter, +VKD3D_UTILS_API HRESULT WINAPI D3D12CreateDevice(IUnknown *adapter, D3D_FEATURE_LEVEL minimum_feature_level, REFIID iid, void **device) { return D3D12CreateDeviceVKD3D(adapter, minimum_feature_level, iid, device, VKD3D_API_VERSION_1_0);

1 0

Paul Gofman : d3dx9: Fix dst pitch for compressed format in D3DXLoadSurfaceFromMemory().
by Alexandre Julliard May 2, 2023

May 2, 2023

Module: wine Branch: master Commit: 0b9620266f08d57c2db41b934a77b6ce4a94aeda URL: https://gitlab.winehq.org/wine/wine/-/commit/0b9620266f08d57c2db41b934a77b6… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Fri Apr 28 21:11:33 2023 -0600 d3dx9: Fix dst pitch for compressed format in D3DXLoadSurfaceFromMemory(). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=54901 --- dlls/d3dx9_36/surface.c | 2 +- dlls/d3dx9_36/tests/surface.c | 24 ++++++++++++++++++++++++ 2 files changed, 25 insertions(+), 1 deletion(-) diff --git a/dlls/d3dx9_36/surface.c b/dlls/d3dx9_36/surface.c index 26809a47e18..ccb5c2ffadb 100644 --- a/dlls/d3dx9_36/surface.c +++ b/dlls/d3dx9_36/surface.c @@ -2148,7 +2148,7 @@ HRESULT WINAPI D3DXLoadSurfaceFromMemory(IDirect3DSurface9 *dst_surface, } tx_compress_dxtn(4, dst_size_aligned.width, dst_size_aligned.height, dst_uncompressed, gl_format, lockrect.pBits, - lockrect.Pitch * destformatdesc->block_width / destformatdesc->block_byte_count); + lockrect.Pitch); heap_free(dst_uncompressed); } } diff --git a/dlls/d3dx9_36/tests/surface.c b/dlls/d3dx9_36/tests/surface.c index c3ac4ba74b3..9395bf41d80 100644 --- a/dlls/d3dx9_36/tests/surface.c +++ b/dlls/d3dx9_36/tests/surface.c @@ -847,6 +847,7 @@ static void test_D3DXLoadSurface(IDirect3DDevice9 *device) static const DWORD pixdata_g16r16[] = { 0x07d23fbe, 0xdc7f44a4, 0xe4d8976b, 0x9a84fe89 }; static const DWORD pixdata_a8b8g8r8[] = { 0xc3394cf0, 0x235ae892, 0x09b197fd, 0x8dc32bf6 }; static const DWORD pixdata_a2r10g10b10[] = { 0x57395aff, 0x5b7668fd, 0xb0d856b5, 0xff2c61d6 }; + BYTE buffer[4 * 8 * 4]; hr = create_file("testdummy.bmp", noimage, sizeof(noimage)); /* invalid image */ testdummy_ok = SUCCEEDED(hr); @@ -1463,6 +1464,29 @@ static void test_D3DXLoadSurface(IDirect3DDevice9 *device) check_release((IUnknown *)newsurf, 1); check_release((IUnknown *)tex, 0); + /* Test updating subarea of compressed texture. */ + hr = IDirect3DDevice9_CreateTexture(device, 32, 16, 1, 0, D3DFMT_DXT5, D3DPOOL_SYSTEMMEM, &tex, NULL); + ok(hr == D3D_OK, "Got unexpected hr %#lx.\n", hr); + hr = IDirect3DTexture9_GetSurfaceLevel(tex, 0, &newsurf); + ok(hr == D3D_OK, "Got unexpected hr %#lx.\n", hr); + SetRect(&destrect, 0, 0, 4, 8); + SetRect(&rect, 0, 0, 4, 8); + memset(buffer, 0x40, sizeof(buffer)); + hr = D3DXLoadSurfaceFromMemory(newsurf, NULL, &destrect, buffer, + D3DFMT_A8B8G8R8, 4 * 4, NULL, &rect, D3DX_FILTER_NONE, 0); + ok(hr == D3D_OK, "Got unexpected hr %#lx.\n", hr); + + hr = IDirect3DSurface9_LockRect(newsurf, &lockrect, &destrect, D3DLOCK_READONLY); + ok(hr == D3D_OK, "Got unexpected hr %#lx.\n", hr); + /* 2 identical 16 bytes DXT5 blocks. The exact values in blocks may differ from Windows due to + * different compression algorithms. */ + ok(!memcmp(lockrect.pBits, (char *)lockrect.pBits + lockrect.Pitch, 16), "data mismatch.\n"); + hr = IDirect3DSurface9_UnlockRect(newsurf); + ok(hr == D3D_OK, "Got unexpected hr %#lx.\n", hr); + + check_release((IUnknown *)newsurf, 1); + check_release((IUnknown *)tex, 0); + /* Test a rect larger than but not an integer multiple of the block size. */ hr = IDirect3DDevice9_CreateTexture(device, 4, 8, 1, 0, D3DFMT_DXT5, D3DPOOL_SYSTEMMEM, &tex, NULL); ok(hr == D3D_OK, "Got unexpected hr %#lx.\n", hr);

1 0

Mohamad Al-Jaf : hrtfapo: Add CreateHrtfApo() stub.
by Alexandre Julliard May 2, 2023

May 2, 2023

Module: wine Branch: master Commit: eff714e339caed6e36a3857f07b0c3e1c13306e6 URL: https://gitlab.winehq.org/wine/wine/-/commit/eff714e339caed6e36a3857f07b0c3… Author: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> Date: Sun Dec 18 23:42:38 2022 -0500 hrtfapo: Add CreateHrtfApo() stub. Needed by Britannia VR: Out of Your Mind. --- dlls/hrtfapo/Makefile.in | 3 +++ dlls/hrtfapo/hrtfapo.spec | 2 +- dlls/hrtfapo/main.c | 29 +++++++++++++++++++++++++++++ 3 files changed, 33 insertions(+), 1 deletion(-) diff --git a/dlls/hrtfapo/Makefile.in b/dlls/hrtfapo/Makefile.in index c2a24658436..16a745e0fca 100644 --- a/dlls/hrtfapo/Makefile.in +++ b/dlls/hrtfapo/Makefile.in @@ -1 +1,4 @@ MODULE = hrtfapo.dll + +C_SRCS = \ + main.c diff --git a/dlls/hrtfapo/hrtfapo.spec b/dlls/hrtfapo/hrtfapo.spec index d9395a66c7e..42248518619 100644 --- a/dlls/hrtfapo/hrtfapo.spec +++ b/dlls/hrtfapo/hrtfapo.spec @@ -1,4 +1,4 @@ -@ stub CreateHrtfApo +@ stdcall CreateHrtfApo(ptr ptr) @ stub CreateHrtfApoWithDatasetType @ stub CreateHrtfEngineFactory @ stub IsHrtfApoAvailable diff --git a/dlls/hrtfapo/main.c b/dlls/hrtfapo/main.c new file mode 100644 index 00000000000..711f0bc9c29 --- /dev/null +++ b/dlls/hrtfapo/main.c @@ -0,0 +1,29 @@ +/* + * Copyright (C) 2023 Mohamad Al-Jaf + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "hrtfapoapi.h" + +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(xaudio2); + +HRESULT WINAPI CreateHrtfApo(const HrtfApoInit *init, IXAPO **xapo) +{ + FIXME("(%p, %p): stub!\n", init, xapo); + return E_NOTIMPL; +}

1 0

Mohamad Al-Jaf : hrtfapo: Add stub DLL.
by Alexandre Julliard May 2, 2023

May 2, 2023

Module: wine Branch: master Commit: 9c46b673ba99de85bff98ee2f2a8924b9ae24e83 URL: https://gitlab.winehq.org/wine/wine/-/commit/9c46b673ba99de85bff98ee2f2a892… Author: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> Date: Sun Dec 18 23:31:01 2022 -0500 hrtfapo: Add stub DLL. --- configure | 2 ++ configure.ac | 1 + dlls/hrtfapo/Makefile.in | 1 + dlls/hrtfapo/hrtfapo.spec | 5 +++++ 4 files changed, 9 insertions(+) diff --git a/configure b/configure index 6201d4444fd..001e80be636 100755 --- a/configure +++ b/configure @@ -1151,6 +1151,7 @@ enable_hidclass_sys enable_hidparse_sys enable_hlink enable_hnetcfg +enable_hrtfapo enable_http_sys enable_httpapi enable_ia2comproxy @@ -21391,6 +21392,7 @@ wine_fn_config_makefile dlls/hlink enable_hlink wine_fn_config_makefile dlls/hlink/tests enable_tests wine_fn_config_makefile dlls/hnetcfg enable_hnetcfg wine_fn_config_makefile dlls/hnetcfg/tests enable_tests +wine_fn_config_makefile dlls/hrtfapo enable_hrtfapo wine_fn_config_makefile dlls/http.sys enable_http_sys wine_fn_config_makefile dlls/httpapi enable_httpapi wine_fn_config_makefile dlls/httpapi/tests enable_tests diff --git a/configure.ac b/configure.ac index 265c7425a8e..0a6171e7fd3 100644 --- a/configure.ac +++ b/configure.ac @@ -2629,6 +2629,7 @@ WINE_CONFIG_MAKEFILE(dlls/hlink) WINE_CONFIG_MAKEFILE(dlls/hlink/tests) WINE_CONFIG_MAKEFILE(dlls/hnetcfg) WINE_CONFIG_MAKEFILE(dlls/hnetcfg/tests) +WINE_CONFIG_MAKEFILE(dlls/hrtfapo) WINE_CONFIG_MAKEFILE(dlls/http.sys) WINE_CONFIG_MAKEFILE(dlls/httpapi) WINE_CONFIG_MAKEFILE(dlls/httpapi/tests) diff --git a/dlls/hrtfapo/Makefile.in b/dlls/hrtfapo/Makefile.in new file mode 100644 index 00000000000..c2a24658436 --- /dev/null +++ b/dlls/hrtfapo/Makefile.in @@ -0,0 +1 @@ +MODULE = hrtfapo.dll diff --git a/dlls/hrtfapo/hrtfapo.spec b/dlls/hrtfapo/hrtfapo.spec new file mode 100644 index 00000000000..d9395a66c7e --- /dev/null +++ b/dlls/hrtfapo/hrtfapo.spec @@ -0,0 +1,5 @@ +@ stub CreateHrtfApo +@ stub CreateHrtfApoWithDatasetType +@ stub CreateHrtfEngineFactory +@ stub IsHrtfApoAvailable +@ stub GetHrtfEngineMinFrameCount

1 0

Mohamad Al-Jaf : include: Add hrtfapoapi.idl file.
by Alexandre Julliard May 2, 2023

May 2, 2023

Module: wine Branch: master Commit: 2b32ba593dc06db3689ce07908265af96b9c03b3 URL: https://gitlab.winehq.org/wine/wine/-/commit/2b32ba593dc06db3689ce07908265a… Author: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> Date: Thu Dec 8 19:43:52 2022 -0500 include: Add hrtfapoapi.idl file. --- include/Makefile.in | 1 + include/hrtfapoapi.idl | 108 +++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 109 insertions(+) diff --git a/include/Makefile.in b/include/Makefile.in index c957fed884c..0dae4cab2bf 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -340,6 +340,7 @@ SOURCES = \ highlevelmonitorconfigurationapi.h \ hlguids.h \ hlink.idl \ + hrtfapoapi.idl \ hstring.idl \ htiface.idl \ htiframe.idl \ diff --git a/include/hrtfapoapi.idl b/include/hrtfapoapi.idl new file mode 100644 index 00000000000..15b479d0216 --- /dev/null +++ b/include/hrtfapoapi.idl @@ -0,0 +1,108 @@ +/* + * Copyright (C) 2023 Mohamad Al-Jaf + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +import "xapo.idl"; + +cpp_quote("#include <float.h>") + +cpp_quote("#define HRTF_MAX_GAIN_LIMIT 12.0f") +cpp_quote("#define HRTF_MIN_GAIN_LIMIT -96.0f") +cpp_quote("#define HRTF_MIN_UNITY_GAIN_DISTANCE 0.05f") +cpp_quote("#define HRTF_DEFAULT_UNITY_GAIN_DISTANCE 1.0f") +cpp_quote("#define HRTF_DEFAULT_CUTOFF_DISTANCE FLT_MAX") + +typedef struct HrtfPosition +{ + float x; + float y; + float z; +} HrtfPosition; + +typedef struct HrtfOrientation +{ + float element[9]; +} HrtfOrientation; + +typedef enum HrtfDirectivityType +{ + OmniDirectional, + Cardioid, + Cone, +} HrtfDirectivityType; + +typedef enum HrtfEnvironment +{ + Small, + Medium, + Large, + Outdoors, +} HrtfEnvironment; + +typedef struct HrtfDirectivity +{ + HrtfDirectivityType type; + float scaling; +} HrtfDirectivity; + +typedef struct HrtfDirectivityCardioid +{ + HrtfDirectivity directivity; + float order; +} HrtfDirectivityCardioid; + +typedef struct HrtfDirectivityCone +{ + HrtfDirectivity directivity; + float innerAngle; + float outerAngle; +} HrtfDirectivityCone; + +typedef enum HrtfDistanceDecayType +{ + NaturalDecay, + CustomDecay, +} HrtfDistanceDecayType; + +typedef struct HrtfDistanceDecay +{ + HrtfDistanceDecayType type; + float maxGain; + float minGain; + float unityGainDistance; + float cutoffDistance; +} HrtfDistanceDecay; + +typedef struct HrtfApoInit +{ + HrtfDistanceDecay *distanceDecay; + HrtfDirectivity *directivity; +} HrtfApoInit; + +HRESULT __stdcall CreateHrtfApo(const HrtfApoInit *init, IXAPO **xapo); + +[ + object, + uuid(15b3cd66-e9de-4464-b6e6-2bc3cf63d455) +] +interface IXAPOHrtfParameters : IUnknown +{ + HRESULT SetSourcePosition(const HrtfPosition *position); + HRESULT SetSourceOrientation(const HrtfOrientation *orientation); + HRESULT SetSourceGain(float gain); + HRESULT SetEnvironment(HrtfEnvironment environment); +}

1 0