July 2023 - Wine-Commits - list.winehq.org

Francisco Casas : vkd3d-shader/hlsl: Declare vars individually when parsing regular declarations.
by Alexandre Julliard July 4, 2023

July 4, 2023

Module: vkd3d Branch: master Commit: 62c891b7964e7c63146fb87af9a96f7efee1582c URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/62c891b7964e7c63146fb87af9a96… Author: Francisco Casas <fcasas(a)codeweavers.com> Date: Mon Jun 26 15:38:10 2023 -0400 vkd3d-shader/hlsl: Declare vars individually when parsing regular declarations. In a declaration with multiple variables, the variables must be created before the initializer of the next variable is parsed. This is required for initializers such as: float a = 1, b = a, c = b + 1; A requisite for this is that the type information is parsed in the same rule as the first variable (as a variable_def_typed) so it is immediately available to declare the first variable. Then, the next untyped variable declaration is parsed, and the type from the first variable can be used to declare the second, before the third is parsed, and so on. --- libs/vkd3d-shader/hlsl.y | 79 ++++++++++++++++++++++++-------- tests/hlsl/initializer-multi.shader_test | 4 +- 2 files changed, 62 insertions(+), 21 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index e581d0c4..629e0777 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -73,6 +73,10 @@ struct parse_variable_def struct hlsl_semantic semantic; struct hlsl_reg_reservation reg_reservation; struct parse_initializer initializer; + + struct hlsl_type *basic_type; + unsigned int modifiers; + struct vkd3d_shader_location modifiers_loc; }; struct parse_function @@ -1964,11 +1968,12 @@ static void check_invalid_in_out_modifiers(struct hlsl_ctx *ctx, unsigned int mo } } -static void declare_var(struct hlsl_ctx *ctx, struct hlsl_type *basic_type, - unsigned int modifiers, const struct vkd3d_shader_location *modifiers_loc, struct parse_variable_def *v) +static void declare_var(struct hlsl_ctx *ctx, struct parse_variable_def *v) { + struct hlsl_type *basic_type = v->basic_type; struct hlsl_ir_function_decl *func; struct hlsl_semantic new_semantic; + uint32_t modifiers = v->modifiers; bool unbounded_res_array = false; struct hlsl_ir_var *var; struct hlsl_type *type; @@ -4554,6 +4559,7 @@ static void validate_texture_format_type(struct hlsl_ctx *ctx, struct hlsl_type %type <list> unary_expr %type <list> variables_def %type <list> variables_def_optional +%type <list> variables_def_typed %token <name> VAR_IDENTIFIER %token <name> NEW_IDENTIFIER @@ -4616,6 +4622,7 @@ static void validate_texture_format_type(struct hlsl_ctx *ctx, struct hlsl_type %type <variable_def> type_spec %type <variable_def> variable_decl %type <variable_def> variable_def +%type <variable_def> variable_def_typed %% @@ -4710,7 +4717,11 @@ struct_declaration: { LIST_FOR_EACH_ENTRY_SAFE(v, v_next, $3, struct parse_variable_def, entry) { - declare_var(ctx, type, modifiers, &@1, v); + v->basic_type = type; + v->modifiers = modifiers; + v->modifiers_loc = @1; + + declare_var(ctx, v); } if (!($$ = initialize_vars(ctx, $3))) @@ -5562,23 +5573,9 @@ type_spec: } declaration: - var_modifiers type variables_def ';' + variables_def_typed ';' { - struct parse_variable_def *v, *v_next; - struct hlsl_type *type; - unsigned int modifiers = $1; - - if (!(type = apply_type_modifiers(ctx, $2, &modifiers, true, &@1))) - YYABORT; - - check_invalid_in_out_modifiers(ctx, modifiers, &@1); - - LIST_FOR_EACH_ENTRY_SAFE(v, v_next, $3, struct parse_variable_def, entry) - { - declare_var(ctx, type, modifiers, &@1, v); - } - - if (!($$ = initialize_vars(ctx, $3))) + if (!($$ = initialize_vars(ctx, $1))) YYABORT; } @@ -5602,6 +5599,33 @@ variables_def: list_add_tail($$, &$3->entry); } +variables_def_typed: + variable_def_typed + { + if (!($$ = make_empty_list(ctx))) + YYABORT; + list_add_head($$, &$1->entry); + + declare_var(ctx, $1); + } + | variables_def_typed ',' variable_def + { + struct parse_variable_def *head_def; + + assert(!list_empty($1)); + head_def = LIST_ENTRY(list_head($1), struct parse_variable_def, entry); + + assert(head_def->basic_type); + $3->basic_type = head_def->basic_type; + $3->modifiers = head_def->modifiers; + $3->modifiers_loc = head_def->modifiers_loc; + + declare_var(ctx, $3); + + $$ = $1; + list_add_tail($$, &$3->entry); + } + variable_decl: any_identifier arrays colon_attribute { @@ -5643,6 +5667,23 @@ variable_def: ctx->in_state_block = 0; } +variable_def_typed: + var_modifiers type variable_def + { + unsigned int modifiers = $1; + struct hlsl_type *type; + + if (!(type = apply_type_modifiers(ctx, $2, &modifiers, true, &@1))) + YYABORT; + + check_invalid_in_out_modifiers(ctx, modifiers, &@1); + + $$ = $3; + $$->basic_type = type; + $$->modifiers = modifiers; + $$->modifiers_loc = @1; + } + arrays: %empty { diff --git a/tests/hlsl/initializer-multi.shader_test b/tests/hlsl/initializer-multi.shader_test index 9c45a533..73dd9f2f 100644 --- a/tests/hlsl/initializer-multi.shader_test +++ b/tests/hlsl/initializer-multi.shader_test @@ -1,4 +1,4 @@ -[pixel shader todo] +[pixel shader] float4 main() : sv_target { float a = 2.0, b = a + 1.0, c = b; @@ -7,7 +7,7 @@ float4 main() : sv_target } [test] -todo draw quad +draw quad probe all rgba (2, 3, 3, 0)

1 0

Francisco Casas : vkd3d-shader/hlsl: Declare vars individually when parsing struct declarations.
by Alexandre Julliard July 4, 2023

July 4, 2023

Module: vkd3d Branch: master Commit: 01800942a9ea585b8ad41501465f74ff66863499 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/01800942a9ea585b8ad41501465f7… Author: Francisco Casas <fcasas(a)codeweavers.com> Date: Mon Jun 26 15:47:56 2023 -0400 vkd3d-shader/hlsl: Declare vars individually when parsing struct declarations. A struct declaration with variables is now absorbed into the 'declaration' rule, like any other variable declaration. A struct declaration without variables is now reduced to the 'struct_declaration_without_vars' rule. They both are reduced to a 'declaration_statement' in the end. --- libs/vkd3d-shader/hlsl.y | 75 ++++++++++++-------------------- tests/hlsl/initializer-multi.shader_test | 8 ++-- 2 files changed, 31 insertions(+), 52 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index 629e0777..80ba8e11 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -4554,11 +4554,10 @@ static void validate_texture_format_type(struct hlsl_ctx *ctx, struct hlsl_type %type <list> shift_expr %type <list> statement %type <list> statement_list -%type <list> struct_declaration +%type <list> struct_declaration_without_vars %type <list> type_specs %type <list> unary_expr %type <list> variables_def -%type <list> variables_def_optional %type <list> variables_def_typed %token <name> VAR_IDENTIFIER @@ -4691,47 +4690,19 @@ preproc_directive: } } -struct_declaration: - var_modifiers struct_spec variables_def_optional ';' +struct_declaration_without_vars: + var_modifiers struct_spec ';' { - struct parse_variable_def *v, *v_next; - struct hlsl_type *type; - unsigned int modifiers = $1; + if (!$2->name) + hlsl_error(ctx, &@2, VKD3D_SHADER_ERROR_HLSL_INVALID_SYNTAX, + "Anonymous struct type must declare a variable."); - if (!$3) - { - if (!$2->name) - hlsl_error(ctx, &@2, VKD3D_SHADER_ERROR_HLSL_INVALID_SYNTAX, - "Anonymous struct type must declare a variable."); - if (modifiers) - hlsl_error(ctx, &@1, VKD3D_SHADER_ERROR_HLSL_INVALID_MODIFIER, - "Modifiers are not allowed on struct type declarations."); - } + if ($1) + hlsl_error(ctx, &@1, VKD3D_SHADER_ERROR_HLSL_INVALID_MODIFIER, + "Modifiers are not allowed on struct type declarations."); - if (!(type = apply_type_modifiers(ctx, $2, &modifiers, true, &@1))) + if (!($$ = make_empty_list(ctx))) YYABORT; - - check_invalid_in_out_modifiers(ctx, modifiers, &@1); - - if ($3) - { - LIST_FOR_EACH_ENTRY_SAFE(v, v_next, $3, struct parse_variable_def, entry) - { - v->basic_type = type; - v->modifiers = modifiers; - v->modifiers_loc = @1; - - declare_var(ctx, v); - } - - if (!($$ = initialize_vars(ctx, $3))) - YYABORT; - } - else - { - if (!($$ = make_empty_list(ctx))) - YYABORT; - } } struct_spec: @@ -5511,7 +5482,7 @@ type: declaration_statement: declaration - | struct_declaration + | struct_declaration_without_vars | typedef { if (!($$ = make_empty_list(ctx))) @@ -5579,13 +5550,6 @@ declaration: YYABORT; } -variables_def_optional: - %empty - { - $$ = NULL; - } - | variables_def - variables_def: variable_def { @@ -5668,7 +5632,22 @@ variable_def: } variable_def_typed: - var_modifiers type variable_def + var_modifiers struct_spec variable_def + { + unsigned int modifiers = $1; + struct hlsl_type *type; + + if (!(type = apply_type_modifiers(ctx, $2, &modifiers, true, &@1))) + YYABORT; + + check_invalid_in_out_modifiers(ctx, modifiers, &@1); + + $$ = $3; + $$->basic_type = type; + $$->modifiers = modifiers; + $$->modifiers_loc = @1; + } + | var_modifiers type variable_def { unsigned int modifiers = $1; struct hlsl_type *type; diff --git a/tests/hlsl/initializer-multi.shader_test b/tests/hlsl/initializer-multi.shader_test index 73dd9f2f..8f8a31e2 100644 --- a/tests/hlsl/initializer-multi.shader_test +++ b/tests/hlsl/initializer-multi.shader_test @@ -20,7 +20,7 @@ float4 main() : sv_target } -[pixel shader todo] +[pixel shader] float4 main() : sv_target { struct apple { @@ -32,11 +32,11 @@ float4 main() : sv_target } [test] -todo draw quad +draw quad probe all rgba (7.2, 8.0, 7.2, 8.0) -[pixel shader todo] +[pixel shader] float4 main() : sv_target { struct apple { @@ -48,5 +48,5 @@ float4 main() : sv_target } [test] -todo draw quad +draw quad probe all rgba (5.2, 9.0, 5.2, 9.0)

1 0

Francisco Casas : vkd3d-shader/hlsl: Split declare_vars().
by Alexandre Julliard July 4, 2023

July 4, 2023

Module: vkd3d Branch: master Commit: a34cf2e64e6c5c534b810ebb74dfb3da1458474c URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/a34cf2e64e6c5c534b810ebb74dfb… Author: Francisco Casas <fcasas(a)codeweavers.com> Date: Mon Jun 26 14:50:16 2023 -0400 vkd3d-shader/hlsl: Split declare_vars(). Basically, declare_vars() is separated in three functions: 1. check_invalid_in_out_modifiers(), which is to be called once per declaration and emits an error when in or out modifiers are used for these non-parameter variables. 2. declare_var(), which now handles one variable at the time and doesn't free any memory. 3. initialize_vars(), which takes care of preparing the initialization instructions of several variables and frees their struct parse_variable_def, using exclusively free_parse_variable_def(). This allows to declare variables individually before the initializer of the next variable in the same declaration is parsed, which is used in the following patches. Also, simplifies memory management. --- libs/vkd3d-shader/hlsl.y | 388 ++++++++++++++++++++++++++--------------------- 1 file changed, 218 insertions(+), 170 deletions(-)

1 0

Francisco Casas : tests: Test multiple variable initializers.
by Alexandre Julliard July 4, 2023

July 4, 2023

Module: vkd3d Branch: master Commit: 396edae281a3ebd9a5d6be99247c1cd39adb3bd5 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/396edae281a3ebd9a5d6be99247c1… Author: Francisco Casas <fcasas(a)codeweavers.com> Date: Thu Jun 22 12:49:47 2023 -0400 tests: Test multiple variable initializers. --- Makefile.am | 1 + tests/hlsl/initializer-multi.shader_test | 52 ++++++++++++++++++++++++++++++++ 2 files changed, 53 insertions(+) diff --git a/Makefile.am b/Makefile.am index d6685c43..cafa8f2f 100644 --- a/Makefile.am +++ b/Makefile.am @@ -98,6 +98,7 @@ vkd3d_shader_tests = \ tests/hlsl/initializer-invalid-arg-count.shader_test \ tests/hlsl/initializer-local-array.shader_test \ tests/hlsl/initializer-matrix.shader_test \ + tests/hlsl/initializer-multi.shader_test \ tests/hlsl/initializer-nested.shader_test \ tests/hlsl/initializer-numeric.shader_test \ tests/hlsl/initializer-objects.shader_test \ diff --git a/tests/hlsl/initializer-multi.shader_test b/tests/hlsl/initializer-multi.shader_test new file mode 100644 index 00000000..9c45a533 --- /dev/null +++ b/tests/hlsl/initializer-multi.shader_test @@ -0,0 +1,52 @@ +[pixel shader todo] +float4 main() : sv_target +{ + float a = 2.0, b = a + 1.0, c = b; + + return float4(a, b, c, 0); +} + +[test] +todo draw quad +probe all rgba (2, 3, 3, 0) + + +[pixel shader fail] +float4 main() : sv_target +{ + float a = 2.0, b = c + 1.0, c = b; + + return float4(0); +} + + +[pixel shader todo] +float4 main() : sv_target +{ + struct apple { + float a; + int b; + } apple1 = {7.2, 8.1}, apple2 = apple1; + + return float4(apple1.a, apple1.b, apple2.a, apple2.b); +} + +[test] +todo draw quad +probe all rgba (7.2, 8.0, 7.2, 8.0) + + +[pixel shader todo] +float4 main() : sv_target +{ + struct apple { + float a; + int b; + } apple1 = {5.2, 9.1}, apples[2] = {apple1, apple1}; + + return float4(apples[0].a, apples[0].b, apples[1].a, apples[1].b); +} + +[test] +todo draw quad +probe all rgba (5.2, 9.0, 5.2, 9.0)

1 0

Francisco Casas : tests: Test semantics in uniform variables.
by Alexandre Julliard July 4, 2023

July 4, 2023

Module: vkd3d Branch: master Commit: d8e6a1066de0726fbd4e7a7c420e5b854cbfc22b URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/d8e6a1066de0726fbd4e7a7c420e5… Author: Francisco Casas <fcasas(a)codeweavers.com> Date: Wed Jun 28 15:50:59 2023 -0400 tests: Test semantics in uniform variables. --- Makefile.am | 1 + tests/hlsl/uniform-semantics.shader_test | 28 ++++++++++++++++++++++++++++ 2 files changed, 29 insertions(+) diff --git a/Makefile.am b/Makefile.am index 793c3818..d6685c43 100644 --- a/Makefile.am +++ b/Makefile.am @@ -174,6 +174,7 @@ vkd3d_shader_tests = \ tests/hlsl/uav-rwbuffer.shader_test \ tests/hlsl/uav-rwstructuredbuffer.shader_test \ tests/hlsl/uav-rwtexture.shader_test \ + tests/hlsl/uniform-semantics.shader_test \ tests/hlsl/vector-indexing-uniform.shader_test \ tests/hlsl/vector-indexing.shader_test \ tests/hlsl/writemask-assignop-0.shader_test \ diff --git a/tests/hlsl/uniform-semantics.shader_test b/tests/hlsl/uniform-semantics.shader_test new file mode 100644 index 00000000..1125117f --- /dev/null +++ b/tests/hlsl/uniform-semantics.shader_test @@ -0,0 +1,28 @@ +% Semantics can be used in uniforms even though they are ignored. + +[pixel shader] +float a : SEMANTIC; + +float4 main() : sv_target +{ + return a; +} + +[test] +uniform 0 float 3.5 +draw quad +probe all rgba (3.5, 3.5, 3.5, 3.5) + + +[pixel shader] +float2 a : sv_position; + +float4 main() : sv_target +{ + return float4(a, a); +} + +[test] +uniform 0 float4 4.0 5.0 6.0 7.0 +draw quad +probe all rgba (4.0, 5.0, 4.0, 5.0)

1 0

Matteo Bruni : wined3d: Reduce CS spin count to 2000.
by Alexandre Julliard July 4, 2023

July 4, 2023

Module: wine Branch: master Commit: f032ccc2715a5525601f741337a7bc7df6873c9d URL: https://gitlab.winehq.org/wine/wine/-/commit/f032ccc2715a5525601f741337a7bc… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Sun May 6 03:09:44 2018 +0200 wined3d: Reduce CS spin count to 2000. Over the last few Wine releases we greatly reduced the need for the application thread to wait for replies from the CS thread. Compared to the time when the command stream was initially introduced, it's now quite likely that, when the command queues become empty, they are going to stay like that for a while (e.g. the game is throttling the framerate or is busy doing some CPU work on its part before generating more commands). As a first step, reduce the spin count to reduce the busy waiting in wined3d_cs_run(). In my tests this significantly reduces CPU usage, with minimally decreased performance in a few rare cases but also significantly improved performance in many cases (notably with integrated GPUs where freeing the CPU directly allows more power to be allocated to the GPU). --- dlls/wined3d/wined3d_private.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index c71ac59270b..efdcff41e58 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -5079,7 +5079,7 @@ enum wined3d_push_constants #else #define WINED3D_CS_QUEUE_SIZE 0x400000u #endif -#define WINED3D_CS_SPIN_COUNT 10000000u +#define WINED3D_CS_SPIN_COUNT 2000u #define WINED3D_CS_QUEUE_MASK (WINED3D_CS_QUEUE_SIZE - 1) C_ASSERT(!(WINED3D_CS_QUEUE_SIZE & (WINED3D_CS_QUEUE_SIZE - 1)));

1 0

Matteo Bruni : wined3d: Make the CS thread yield CPU when it can't block waiting.
by Alexandre Julliard July 4, 2023

July 4, 2023

Module: wine Branch: master Commit: fcccca153a1db3d1151c62521b0670ecb4194619 URL: https://gitlab.winehq.org/wine/wine/-/commit/fcccca153a1db3d1151c62521b0670… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Thu Nov 15 22:39:45 2018 +0100 wined3d: Make the CS thread yield CPU when it can't block waiting. It can't block because there are pending queries. --- dlls/wined3d/cs.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index 2cd53cd7a5b..04e37f5e712 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -3422,8 +3422,13 @@ static DWORD WINAPI wined3d_cs_run(void *ctx) if (wined3d_cs_queue_is_empty(cs, queue)) { YieldProcessor(); - if (++spin_count >= WINED3D_CS_SPIN_COUNT && list_empty(&cs->query_poll_list)) - wined3d_cs_wait_event(cs); + if (++spin_count >= WINED3D_CS_SPIN_COUNT) + { + if (list_empty(&cs->query_poll_list)) + wined3d_cs_wait_event(cs); + else + Sleep(0); + } continue; } }

1 0

Matteo Bruni : wined3d: Call YieldProcessor() when spinning waiting for CS commands.
by Alexandre Julliard July 4, 2023

July 4, 2023

Module: wine Branch: master Commit: ecdeab593bdb42c6c8854cdef9c59daba9ba6ce1 URL: https://gitlab.winehq.org/wine/wine/-/commit/ecdeab593bdb42c6c8854cdef9c59d… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Sun May 6 03:14:21 2018 +0200 wined3d: Call YieldProcessor() when spinning waiting for CS commands. Yielding to other threads might help to get new packets and (very slightly) reduce contention on the queue head and tail pointers. --- dlls/wined3d/cs.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index 14f2ca9bb4a..2cd53cd7a5b 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -3421,6 +3421,7 @@ static DWORD WINAPI wined3d_cs_run(void *ctx) queue = &cs->queue[WINED3D_CS_QUEUE_DEFAULT]; if (wined3d_cs_queue_is_empty(cs, queue)) { + YieldProcessor(); if (++spin_count >= WINED3D_CS_SPIN_COUNT && list_empty(&cs->query_poll_list)) wined3d_cs_wait_event(cs); continue;

1 0

Matteo Bruni : wined3d: Block in wined3d_cs_emit_present() when we reach the latency limit.
by Alexandre Julliard July 4, 2023

July 4, 2023

Module: wine Branch: master Commit: 30c3697017220cc22ccdda7a3d86e7f4956551b3 URL: https://gitlab.winehq.org/wine/wine/-/commit/30c3697017220cc22ccdda7a3d86e7… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Fri Apr 20 03:37:13 2018 +0200 wined3d: Block in wined3d_cs_emit_present() when we reach the latency limit. Avoid busy spinning for a potentially long time. --- dlls/wined3d/cs.c | 25 ++++++++++++++++++++++++- dlls/wined3d/wined3d_private.h | 3 ++- 2 files changed, 26 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index 6a09ec2a35a..14f2ca9bb4a 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -724,6 +724,8 @@ static void wined3d_cs_exec_present(struct wined3d_cs *cs, const void *data) } InterlockedDecrement(&cs->pending_presents); + if (InterlockedCompareExchange(&cs->waiting_for_present, FALSE, TRUE)) + SetEvent(cs->present_event); } void wined3d_cs_emit_present(struct wined3d_cs *cs, struct wined3d_swapchain *swapchain, @@ -734,6 +736,8 @@ void wined3d_cs_emit_present(struct wined3d_cs *cs, struct wined3d_swapchain *sw unsigned int i; LONG pending; + wined3d_not_from_cs(cs); + op = wined3d_device_context_require_space(&cs->c, sizeof(*op), WINED3D_CS_QUEUE_DEFAULT); op->opcode = WINED3D_CS_OP_PRESENT; op->dst_window_override = dst_window_override; @@ -757,8 +761,17 @@ void wined3d_cs_emit_present(struct wined3d_cs *cs, struct wined3d_swapchain *sw * ahead of the worker thread. */ while (pending >= swapchain->max_frame_latency) { - YieldProcessor(); + InterlockedExchange(&cs->waiting_for_present, TRUE); + pending = InterlockedCompareExchange(&cs->pending_presents, 0, 0); + if (pending >= swapchain->max_frame_latency || !InterlockedCompareExchange(&cs->waiting_for_present, FALSE, TRUE)) + { + TRACE_(d3d_perf)("Reached latency limit (%u frames), blocking to wait.\n", swapchain->max_frame_latency); + wined3d_mutex_unlock(); + WaitForSingleObject(cs->present_event, INFINITE); + wined3d_mutex_lock(); + TRACE_(d3d_perf)("Woken up from the wait.\n"); + } } } @@ -3472,11 +3485,18 @@ struct wined3d_cs *wined3d_cs_create(struct wined3d_device *device, heap_free(cs->data); goto fail; } + if (!(cs->present_event = CreateEventW(NULL, FALSE, FALSE, NULL))) + { + ERR("Failed to create command stream present event.\n"); + heap_free(cs->data); + goto fail; + } if (!(GetModuleHandleExW(GET_MODULE_HANDLE_EX_FLAG_FROM_ADDRESS, (const WCHAR *)wined3d_cs_run, &cs->wined3d_module))) { ERR("Failed to get wined3d module handle.\n"); + CloseHandle(cs->present_event); CloseHandle(cs->event); heap_free(cs->data); goto fail; @@ -3486,6 +3506,7 @@ struct wined3d_cs *wined3d_cs_create(struct wined3d_device *device, { ERR("Failed to create wined3d command stream thread.\n"); FreeLibrary(cs->wined3d_module); + CloseHandle(cs->present_event); CloseHandle(cs->event); heap_free(cs->data); goto fail; @@ -3508,6 +3529,8 @@ void wined3d_cs_destroy(struct wined3d_cs *cs) { wined3d_cs_emit_stop(cs); CloseHandle(cs->thread); + if (!CloseHandle(cs->present_event)) + ERR("Closing present event failed.\n"); if (!CloseHandle(cs->event)) ERR("Closing event failed.\n"); } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index be576fcfbde..c71ac59270b 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -5131,8 +5131,9 @@ struct wined3d_cs struct list query_poll_list; BOOL queries_flushed; - HANDLE event; + HANDLE event, present_event; LONG waiting_for_event; + LONG waiting_for_present; LONG pending_presents; };

1 0

Matteo Bruni : wined3d: Increase the CS queue size to 16 MiB on 64-bit architectures.
by Alexandre Julliard July 4, 2023

July 4, 2023

Module: wine Branch: master Commit: 203cbab6444922079e5e39d0bb68f6562b1ba19d URL: https://gitlab.winehq.org/wine/wine/-/commit/203cbab6444922079e5e39d0bb68f6… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Wed Mar 8 18:40:56 2017 +0100 wined3d: Increase the CS queue size to 16 MiB on 64-bit architectures. With the buffer / texture mapping acceleration bits working properly, we can get many outstanding commands and, to avoid blocking the client thread while waiting for free space, we need a larger queue. 16 MiB was always enough in my testing (8 MiB wasn't in a few cases). Keep a lower limit on 32-bit since we're often times address space-starved there. Tweaked by Zebediah Figura. --- dlls/wined3d/wined3d_private.h | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 001534e8c38..be576fcfbde 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -5074,7 +5074,11 @@ enum wined3d_push_constants }; #define WINED3D_CS_QUERY_POLL_INTERVAL 10u +#if defined(_WIN64) +#define WINED3D_CS_QUEUE_SIZE 0x1000000u +#else #define WINED3D_CS_QUEUE_SIZE 0x400000u +#endif #define WINED3D_CS_SPIN_COUNT 10000000u #define WINED3D_CS_QUEUE_MASK (WINED3D_CS_QUEUE_SIZE - 1)

1 0