April 2021 - Wine-Commits - list.winehq.org

Conor McCarthy : vkd3d: Store root signature Vulkan descriptor set layouts in an array.
by Alexandre Julliard April 20, 2021

April 20, 2021

Module: vkd3d Branch: master Commit: 8b99fc66d3b4dba3d213c7115aa79a22ece38719 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=8b99fc66d3b4dba3d213c71… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Sat Apr 17 01:01:42 2021 +1000 vkd3d: Store root signature Vulkan descriptor set layouts in an array. They need to be in an array for pipeline layout creation anyway, and this is useful when more layouts are needed for unbounded arrays. 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 | 4 ++-- libs/vkd3d/state.c | 59 ++++++++++++++++++++-------------------------- libs/vkd3d/vkd3d_private.h | 5 ++-- 3 files changed, 31 insertions(+), 37 deletions(-) Diff: https://source.winehq.org/git/vkd3d.git/?a=commitdiff;h=8b99fc66d3b4dba3d21…

1 0

Conor McCarthy : vkd3d: Rename descriptor_count where binding_count is more accurate.
by Alexandre Julliard April 20, 2021

April 20, 2021

Module: vkd3d Branch: master Commit: 59419c6bdec430cd526fb829d834271a41450ec0 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=59419c6bdec430cd526fb82… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Sat Apr 17 01:01:38 2021 +1000 vkd3d: Rename descriptor_count where binding_count is more accurate. 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/state.c | 24 ++++++++++++------------ libs/vkd3d/vkd3d_private.h | 2 +- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/libs/vkd3d/state.c b/libs/vkd3d/state.c index 81f3343..81da3f9 100644 --- a/libs/vkd3d/state.c +++ b/libs/vkd3d/state.c @@ -323,7 +323,7 @@ struct d3d12_root_signature_info size_t srv_count; size_t sampler_count; - size_t descriptor_count; + size_t binding_count; size_t root_constant_count; size_t root_descriptor_count; @@ -359,7 +359,7 @@ static HRESULT d3d12_root_signature_info_count_descriptors(struct d3d12_root_sig return E_NOTIMPL; } - info->descriptor_count += range->NumDescriptors; + info->binding_count += range->NumDescriptors; return S_OK; } @@ -389,19 +389,19 @@ static HRESULT d3d12_root_signature_info_from_desc(struct d3d12_root_signature_i case D3D12_ROOT_PARAMETER_TYPE_CBV: ++info->root_descriptor_count; ++info->cbv_count; - ++info->descriptor_count; + ++info->binding_count; info->cost += 2; break; case D3D12_ROOT_PARAMETER_TYPE_SRV: ++info->root_descriptor_count; ++info->buffer_srv_count; - ++info->descriptor_count; + ++info->binding_count; info->cost += 2; break; case D3D12_ROOT_PARAMETER_TYPE_UAV: ++info->root_descriptor_count; ++info->buffer_uav_count; - ++info->descriptor_count; + ++info->binding_count; info->cost += 2; break; @@ -417,7 +417,7 @@ static HRESULT d3d12_root_signature_info_from_desc(struct d3d12_root_signature_i } info->sampler_count += desc->NumStaticSamplers; - info->descriptor_count += desc->NumStaticSamplers; + info->binding_count += desc->NumStaticSamplers; return S_OK; } @@ -813,9 +813,9 @@ static HRESULT d3d12_root_signature_init(struct d3d12_root_signature *root_signa * to preserve compatibility between Vulkan resource bindings for the same * root signature, we create descriptor set layouts with two bindings for * each SRV and UAV. */ - info.descriptor_count += info.srv_count + info.uav_count; + info.binding_count += info.srv_count + info.uav_count; - root_signature->descriptor_count = info.descriptor_count; + root_signature->binding_count = info.binding_count; root_signature->static_sampler_count = desc->NumStaticSamplers; root_signature->root_descriptor_count = info.root_descriptor_count; @@ -824,7 +824,7 @@ static HRESULT d3d12_root_signature_init(struct d3d12_root_signature *root_signa if (!(root_signature->parameters = vkd3d_calloc(root_signature->parameter_count, sizeof(*root_signature->parameters)))) goto fail; - if (!(root_signature->descriptor_mapping = vkd3d_calloc(root_signature->descriptor_count, + if (!(root_signature->descriptor_mapping = vkd3d_calloc(root_signature->binding_count, sizeof(*root_signature->descriptor_mapping)))) goto fail; root_signature->root_constant_count = info.root_constant_count; @@ -835,7 +835,7 @@ static HRESULT d3d12_root_signature_init(struct d3d12_root_signature *root_signa sizeof(*root_signature->static_samplers)))) goto fail; - if (!(binding_desc = vkd3d_calloc(info.descriptor_count, sizeof(*binding_desc)))) + if (!(binding_desc = vkd3d_calloc(info.binding_count, sizeof(*binding_desc)))) goto fail; context.current_binding = binding_desc; @@ -1564,7 +1564,7 @@ static HRESULT d3d12_pipeline_state_init_compute(struct d3d12_pipeline_state *st shader_interface.type = VKD3D_SHADER_STRUCTURE_TYPE_INTERFACE_INFO; shader_interface.next = NULL; shader_interface.bindings = root_signature->descriptor_mapping; - shader_interface.binding_count = root_signature->descriptor_count; + shader_interface.binding_count = root_signature->binding_count; shader_interface.push_constant_buffers = root_signature->root_constants; shader_interface.push_constant_buffer_count = root_signature->root_constant_count; shader_interface.combined_samplers = NULL; @@ -2273,7 +2273,7 @@ static HRESULT d3d12_pipeline_state_init_graphics(struct d3d12_pipeline_state *s shader_interface.type = VKD3D_SHADER_STRUCTURE_TYPE_INTERFACE_INFO; shader_interface.next = NULL; shader_interface.bindings = root_signature->descriptor_mapping; - shader_interface.binding_count = root_signature->descriptor_count; + shader_interface.binding_count = root_signature->binding_count; shader_interface.push_constant_buffers = root_signature->root_constants; shader_interface.push_constant_buffer_count = root_signature->root_constant_count; shader_interface.combined_samplers = NULL; diff --git a/libs/vkd3d/vkd3d_private.h b/libs/vkd3d/vkd3d_private.h index 4af970c..b096a8c 100644 --- a/libs/vkd3d/vkd3d_private.h +++ b/libs/vkd3d/vkd3d_private.h @@ -711,7 +711,7 @@ struct d3d12_root_signature D3D12_ROOT_SIGNATURE_FLAGS flags; - unsigned int descriptor_count; + unsigned int binding_count; struct vkd3d_shader_resource_binding *descriptor_mapping; unsigned int root_constant_count;

1 0

Zebediah Figura : vkd3d-shader: Store variables with external linkage in a dedicated list.
by Alexandre Julliard April 20, 2021

April 20, 2021

Module: vkd3d Branch: master Commit: 8f26986615aaef68869a8868273c5b4fc21bdfd4 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=8f26986615aaef68869a886… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Apr 15 19:03:44 2021 -0500 vkd3d-shader: Store variables with external linkage in a dedicated list. 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: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/hlsl.c | 1 + libs/vkd3d-shader/hlsl.h | 3 ++- libs/vkd3d-shader/hlsl_codegen.c | 22 ++++++++++++---------- 3 files changed, 15 insertions(+), 11 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.c b/libs/vkd3d-shader/hlsl.c index 10105ea..50b40d6 100644 --- a/libs/vkd3d-shader/hlsl.c +++ b/libs/vkd3d-shader/hlsl.c @@ -1578,6 +1578,7 @@ static bool hlsl_ctx_init(struct hlsl_ctx *ctx, const struct hlsl_profile_info * rb_init(&ctx->functions, compare_function_rb); list_init(&ctx->static_initializers); + list_init(&ctx->extern_vars); return true; } diff --git a/libs/vkd3d-shader/hlsl.h b/libs/vkd3d-shader/hlsl.h index 8493f74..3a0bf38 100644 --- a/libs/vkd3d-shader/hlsl.h +++ b/libs/vkd3d-shader/hlsl.h @@ -213,7 +213,7 @@ struct hlsl_ir_var const char *name; const char *semantic; const struct hlsl_reg_reservation *reg_reservation; - struct list scope_entry, param_entry; + struct list scope_entry, param_entry, extern_entry; unsigned int first_write, last_read; struct hlsl_reg reg; @@ -418,6 +418,7 @@ struct hlsl_ctx struct hlsl_scope *cur_scope; struct hlsl_scope *globals; struct list scopes; + struct list extern_vars; struct list types; struct rb_tree functions; diff --git a/libs/vkd3d-shader/hlsl_codegen.c b/libs/vkd3d-shader/hlsl_codegen.c index 9ebd149..12d5988 100644 --- a/libs/vkd3d-shader/hlsl_codegen.c +++ b/libs/vkd3d-shader/hlsl_codegen.c @@ -45,7 +45,8 @@ static void prepend_uniform_copy(struct hlsl_ctx *ctx, struct list *instrs, stru return; } vkd3d_string_buffer_release(&ctx->string_buffers, name); - list_add_head(&ctx->globals->vars, &const_var->scope_entry); + list_add_before(&var->scope_entry, &const_var->scope_entry); + list_add_tail(&ctx->extern_vars, &const_var->extern_entry); var->is_uniform = 0; const_var->is_uniform = 1; @@ -87,7 +88,8 @@ static void prepend_input_copy(struct hlsl_ctx *ctx, struct list *instrs, struct } vkd3d_string_buffer_release(&ctx->string_buffers, name); varying->is_input_varying = 1; - list_add_head(&ctx->globals->vars, &varying->scope_entry); + list_add_before(&var->scope_entry, &varying->scope_entry); + list_add_tail(&ctx->extern_vars, &varying->extern_entry); if (!(load = hlsl_new_var_load(varying, var->loc))) { @@ -164,7 +166,8 @@ static void append_output_copy(struct hlsl_ctx *ctx, struct list *instrs, struct } vkd3d_string_buffer_release(&ctx->string_buffers, name); varying->is_output_varying = 1; - list_add_head(&ctx->globals->vars, &varying->scope_entry); + list_add_before(&var->scope_entry, &varying->scope_entry); + list_add_tail(&ctx->extern_vars, &varying->extern_entry); if (!(offset = hlsl_new_uint_constant(ctx, field_offset * 4, var->loc))) { @@ -593,7 +596,7 @@ static void compute_liveness(struct hlsl_ctx *ctx, struct hlsl_ir_function_decl var->first_write = var->last_read = 0; } - LIST_FOR_EACH_ENTRY(var, &ctx->globals->vars, struct hlsl_ir_var, scope_entry) + LIST_FOR_EACH_ENTRY(var, &ctx->extern_vars, struct hlsl_ir_var, extern_entry) { if (var->is_uniform || var->is_input_varying) var->first_write = 1; @@ -601,11 +604,6 @@ static void compute_liveness(struct hlsl_ctx *ctx, struct hlsl_ir_function_decl var->last_read = UINT_MAX; } - LIST_FOR_EACH_ENTRY(var, entry_func->parameters, struct hlsl_ir_var, param_entry) - { - var->first_write = 1; - } - if (entry_func->return_var) entry_func->return_var->last_read = UINT_MAX; @@ -846,7 +844,7 @@ static void allocate_const_registers(struct hlsl_ctx *ctx, struct hlsl_ir_functi struct liveness liveness = {0}; struct hlsl_ir_var *var; - LIST_FOR_EACH_ENTRY(var, &ctx->globals->vars, struct hlsl_ir_var, scope_entry) + LIST_FOR_EACH_ENTRY(var, &ctx->extern_vars, struct hlsl_ir_var, extern_entry) { if (var->is_uniform && var->last_read) { @@ -928,12 +926,16 @@ int hlsl_emit_dxbc(struct hlsl_ctx *ctx, struct hlsl_ir_function_decl *entry_fun LIST_FOR_EACH_ENTRY(var, &ctx->globals->vars, struct hlsl_ir_var, scope_entry) { + if (var->data_type->type == HLSL_CLASS_OBJECT) + list_add_tail(&ctx->extern_vars, &var->extern_entry); if (var->is_uniform) prepend_uniform_copy(ctx, entry_func->body, var); } LIST_FOR_EACH_ENTRY(var, entry_func->parameters, struct hlsl_ir_var, param_entry) { + if (var->data_type->type == HLSL_CLASS_OBJECT) + list_add_tail(&ctx->extern_vars, &var->extern_entry); if (var->is_uniform) prepend_uniform_copy(ctx, entry_func->body, var); if (var->is_input_varying)

1 0

Francois Gouget : winetest: Position the up/down arrows with CSS instead of a table.
by Alexandre Julliard April 20, 2021

April 20, 2021

Module: tools Branch: master Commit: b01d24020d48917def3cfb6feb5b3eb0d26669df URL: https://source.winehq.org/git/tools.git/?a=commit;h=b01d24020d48917def3cfb6… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Apr 20 16:47:45 2021 +0200 winetest: Position the up/down arrows with CSS instead of a table. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- winetest/dissect | 8 ++++---- winetest/report.css | 5 +++++ 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/winetest/dissect b/winetest/dissect index 2d0e9c2..c58e47f 100755 --- a/winetest/dissect +++ b/winetest/dissect @@ -929,10 +929,10 @@ print REPORT "</div>\n"; for (my $i = 0; $i <= $#boxes; $i++) { printf REPORT "<div id=\"%s\" class=\"%s\">\n", $boxes[$i]->{id}, $boxes[$i]->{class}; - printf REPORT "<div class=\"updownbar\"><table><tr><td width=\"100%%\">%s</td>\n", $boxes[$i]->{title}; - printf REPORT "<td class=\"arrow\"><a href=\"#%s\">↑</a></td>\n", $boxes[$i]->{prev} if defined $boxes[$i]->{prev}; - printf REPORT "<td class=\"arrow\"><a href=\"#%s\">↓</a></td>\n", $boxes[$i]->{next} if defined $boxes[$i]->{next}; - print REPORT "</tr></table></div>\n"; + printf REPORT "<div class=\"updownbar\">%s<div class='ralign'>", $boxes[$i]->{title}; + printf REPORT "<a href=\"#%s\">↑</a>", $boxes[$i]->{prev} if defined $boxes[$i]->{prev}; + printf REPORT "<a href=\"#%s\">↓</a>", $boxes[$i]->{next} if defined $boxes[$i]->{next}; + print REPORT "</div></div>\n"; print REPORT $boxes[$i]->{data}, "</div>\n"; } print REPORT end_html(); diff --git a/winetest/report.css b/winetest/report.css index eafbe42..41b0b04 100644 --- a/winetest/report.css +++ b/winetest/report.css @@ -62,3 +62,8 @@ table.output td { td.arrow :link { color: #ffffff; text-decoration: none; } td.arrow :visited { color: #ffffff; text-decoration: none; } td.arrow :hover { color: #ffffff; text-decoration: underline; } + +.ralign { + display: inline-block; + float: right; +}

1 0

Francois Gouget : winetest/css: Fix the div.updownbar index pages' CSS style.
by Alexandre Julliard April 20, 2021

April 20, 2021

Module: tools Branch: master Commit: 69da6842b440e867486afd2b07103b33a9fd0fa1 URL: https://source.winehq.org/git/tools.git/?a=commit;h=69da6842b440e867486afd2… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Apr 20 16:42:36 2021 +0200 winetest/css: Fix the div.updownbar index pages' CSS style. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- winetest/report.css | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/winetest/report.css b/winetest/report.css index 3cb2e98..eafbe42 100644 --- a/winetest/report.css +++ b/winetest/report.css @@ -29,8 +29,7 @@ div.output, div.test { } div.updownbar { - padding: 10px - margin-top: 10px; + padding: 4px; margin-bottom: 5px; font-size: large; background-color: #601919;

1 0

Francois Gouget : winetest/dissect: Fix handling of skipped test unit.
by Alexandre Julliard April 20, 2021

April 20, 2021

Module: tools Branch: master Commit: 42f389faf327f4634d9b1f147d9462062b5eb64c URL: https://source.winehq.org/git/tools.git/?a=commit;h=42f389faf327f4634d9b1f1… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Apr 20 16:50:09 2021 +0200 winetest/dissect: Fix handling of skipped test unit. close_test_unit() adds an entry in summary.txt for every test unit. So the report parser must set $summary instead of manually adding a redundant summary.txt entry. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- winetest/dissect | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/winetest/dissect b/winetest/dissect index c58e47f..ce3329e 100755 --- a/winetest/dissect +++ b/winetest/dissect @@ -627,7 +627,7 @@ while ($line = <IN>) { if ($l_type eq "skipped") { add_test_line("skipped", "Skipped by user request"); - print SUM "- $dll $unit skipped - - - $source\n"; + $summary = "skipped - - -"; mydie "too many test units skipped by user request (>$maxuserskips at $dll:$unit)" if ++$skipped_units > $maxuserskips; $rc = 0; }

1 0

Francois Gouget : winetest/css: Fix the color of links on index page titles.
by Alexandre Julliard April 20, 2021

April 20, 2021

Module: tools Branch: master Commit: 3e0d8b17e7054f119b695e46a5df10ca717ffcc8 URL: https://source.winehq.org/git/tools.git/?a=commit;h=3e0d8b17e7054f119b695e4… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Apr 20 16:46:33 2021 +0200 winetest/css: Fix the color of links on index page titles. The color and decorations must be specified for the hover and visited cases too. Also add support for putting links in h2 titles. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- winetest/summary.css | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/winetest/summary.css b/winetest/summary.css index 2bc9b44..9793cdf 100644 --- a/winetest/summary.css +++ b/winetest/summary.css @@ -27,9 +27,10 @@ h1, h2 { padding: 4px; margin: 0; } -h1 :link { - color: #ffe0e0; -} +h1 :link, h2 :link { color: #ffe0e0; } +h1 a:visited, h2 a:visited { color: #ffe0e0; } +h1 a:hover, h2 a:hover { color: #ffe0e0; text-decoration: underline; } + div.main, div.group { margin: 10px 0 0 0; background-color: white;

1 0

Francois Gouget : testbot/reporttest: Update the tests to match the current Wine.
by Alexandre Julliard April 20, 2021

April 20, 2021

Module: tools Branch: master Commit: 906b5f1004b9484969cb520e25a18468ae208820 URL: https://source.winehq.org/git/tools.git/?a=commit;h=906b5f1004b9484969cb520… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Apr 20 16:52:22 2021 +0200 testbot/reporttest: Update the tests to match the current Wine. Specifically, match Wine's test renames and deletions. This avoids puzzling results in the index pages. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/src/reporttest/report.template | 24 +++++++++++------------- 1 file changed, 11 insertions(+), 13 deletions(-) diff --git a/testbot/src/reporttest/report.template b/testbot/src/reporttest/report.template index f1dbfd6..6af2ff5 100644 --- a/testbot/src/reporttest/report.template +++ b/testbot/src/reporttest/report.template @@ -423,20 +423,20 @@ comctl32:button skipped dlls/comctl32/tests/button.c ----- Skipping a test unit by user request ----- Expected assessement: Skipped by user -comctl32:comboex start dlls/comctl32/tests/comboex.c +comctl32:combo start dlls/comctl32/tests/combo.c ----- WTBS Simple success in a todo test ----- WTBS Simple trace, ok, todo, skip sampler ----- A test unit with a subprocess and failed, todo and skipped tests in the ----- main process. ----- Expected assessement: 2 failures, 1 todo, 1 skip -comboex.c:40: Test failed: A failure in the main process -comboex.c:41: Test succeeded inside todo block: Success in the main process -comboex.c:42: Test marked todo: Fixme in the main process -comboex.c:43: Tests skipped: Skipped in the main process +combo.c:40: Test failed: A failure in the main process +combo.c:41: Test succeeded inside todo block: Success in the main process +combo.c:42: Test marked todo: Fixme in the main process +combo.c:43: Tests skipped: Skipped in the main process This line says nothing is wrong because it's from the subprocess -1234:comboex: 116 tests executed (0 marked as todo, 0 failures), 0 skipped. -0c9c:comboex: 116 tests executed (1 marked as todo, 2 failures), 1 skipped. -comctl32:comboex:0c9c done (2) in 0s +1234:combo: 116 tests executed (0 marked as todo, 0 failures), 0 skipped. +0c9c:combo: 116 tests executed (1 marked as todo, 2 failures), 1 skipped. +comctl32:combo:0c9c done (2) in 0s comctl32:datetime start dlls/comctl32/tests/datetime.c ----- A test unit reporting a failure but with no test failed line @@ -874,7 +874,6 @@ stub msvcrt:data stub msvcrt:dir stub msvcrt:environ stub msvcrt:file -stub msvcrt:headers stub msvcrt:heap stub msvcrt:locale stub msvcrt:misc @@ -962,17 +961,16 @@ stub qmgr:enum_jobs stub qmgr:file stub qmgr:job stub qmgr:qmgr -stub quartz:avisplitter +stub quartz:avisplit stub quartz:dsoundrender stub quartz:filtergraph stub quartz:filtermapper stub quartz:memallocator -stub quartz:misc stub quartz:mpegsplit -stub quartz:referenceclock +stub quartz:systemclock stub quartz:videorenderer stub rasapi32:rasapi -stub reg.exe:reg +stub reg.exe:add stub regedit.exe:regedit stub riched20:editor stub riched20:richole

1 0

Zebediah Figura : wined3d: Introduce wined3d_device_context_get_shader_resource_view().
by Alexandre Julliard April 19, 2021

April 19, 2021

Module: wine Branch: master Commit: c060af96f2e6759eec3f240d08468850e853bc52 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c060af96f2e6759eec3f240d… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sat Apr 17 18:39:32 2021 -0500 wined3d: Introduce wined3d_device_context_get_shader_resource_view(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/device.c | 12 ++++++++++++ dlls/wined3d/wined3d.spec | 1 + include/wine/wined3d.h | 2 ++ 3 files changed, 15 insertions(+) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index f4ba0573c24..11b99353059 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -2475,6 +2475,18 @@ void CDECL wined3d_device_set_vs_resource_view(struct wined3d_device *device, wined3d_device_context_set_shader_resource_view(&device->cs->c, WINED3D_SHADER_TYPE_VERTEX, idx, view); } +struct wined3d_shader_resource_view * CDECL wined3d_device_context_get_shader_resource_view( + const struct wined3d_device_context *context, enum wined3d_shader_type shader_type, unsigned int idx) +{ + if (idx >= MAX_SHADER_RESOURCE_VIEWS) + { + WARN("Invalid view index %u.\n", idx); + return NULL; + } + + return context->state->shader_resource_view[shader_type][idx]; +} + static struct wined3d_shader_resource_view *wined3d_device_get_shader_resource_view( const struct wined3d_device *device, enum wined3d_shader_type shader_type, unsigned int idx) { diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index 012f24e6556..f820ebd76d8 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -171,6 +171,7 @@ @ cdecl wined3d_device_context_get_rasterizer_state(ptr) @ cdecl wined3d_device_context_get_scissor_rects(ptr ptr ptr) @ cdecl wined3d_device_context_get_shader(ptr long) +@ cdecl wined3d_device_context_get_shader_resource_view(ptr long long) @ cdecl wined3d_device_context_get_viewports(ptr ptr ptr) @ cdecl wined3d_device_context_issue_query(ptr ptr long) @ cdecl wined3d_device_context_map(ptr ptr long ptr ptr long) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 9b7ff4041fc..9729d2c1eac 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2568,6 +2568,8 @@ void __cdecl wined3d_device_context_get_scissor_rects(const struct wined3d_devic unsigned int *rect_count, RECT *rects); struct wined3d_shader * __cdecl wined3d_device_context_get_shader(const struct wined3d_device_context *context, enum wined3d_shader_type type); +struct wined3d_shader_resource_view * __cdecl wined3d_device_context_get_shader_resource_view( + const struct wined3d_device_context *context, enum wined3d_shader_type shader_type, unsigned int idx); void __cdecl wined3d_device_context_get_viewports(const struct wined3d_device_context *context, unsigned int *viewport_count, struct wined3d_viewport *viewports); void __cdecl wined3d_device_context_issue_query(struct wined3d_device_context *context,

1 0

Zebediah Figura : wined3d: Introduce wined3d_device_context_get_sampler().
by Alexandre Julliard April 19, 2021

April 19, 2021

Module: wine Branch: master Commit: 0a2ea1cadc720452d0717ba9cc9249ef769c0442 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0a2ea1cadc720452d0717ba9… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sat Apr 17 18:39:34 2021 -0500 wined3d: Introduce wined3d_device_context_get_sampler(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/device.c | 14 ++++++++++++++ dlls/wined3d/wined3d.spec | 1 + include/wine/wined3d.h | 2 ++ 3 files changed, 17 insertions(+) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 11b99353059..d239d59a8f2 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -2514,6 +2514,20 @@ void CDECL wined3d_device_set_vs_sampler(struct wined3d_device *device, UINT idx wined3d_device_context_set_sampler(&device->cs->c, WINED3D_SHADER_TYPE_VERTEX, idx, sampler); } +struct wined3d_sampler * CDECL wined3d_device_context_get_sampler(const struct wined3d_device_context *context, + enum wined3d_shader_type shader_type, unsigned int idx) +{ + TRACE("context %p, shader_type %#x, idx %u.\n", context, shader_type, idx); + + if (idx >= MAX_SAMPLER_OBJECTS) + { + WARN("Invalid sampler index %u.\n", idx); + return NULL; + } + + return context->state->sampler[shader_type][idx]; +} + static struct wined3d_sampler *wined3d_device_get_sampler(const struct wined3d_device *device, enum wined3d_shader_type shader_type, unsigned int idx) { diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index f820ebd76d8..6a7a8811051 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -169,6 +169,7 @@ @ cdecl wined3d_device_context_get_constant_buffer(ptr long long) @ cdecl wined3d_device_context_get_depth_stencil_state(ptr ptr) @ cdecl wined3d_device_context_get_rasterizer_state(ptr) +@ cdecl wined3d_device_context_get_sampler(ptr long long) @ cdecl wined3d_device_context_get_scissor_rects(ptr ptr ptr) @ cdecl wined3d_device_context_get_shader(ptr long) @ cdecl wined3d_device_context_get_shader_resource_view(ptr long long) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 9729d2c1eac..26dc7844090 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2564,6 +2564,8 @@ struct wined3d_depth_stencil_state * __cdecl wined3d_device_context_get_depth_st const struct wined3d_device_context *context, unsigned int *stencil_ref); struct wined3d_rasterizer_state * __cdecl wined3d_device_context_get_rasterizer_state( struct wined3d_device_context *context); +struct wined3d_sampler * __cdecl wined3d_device_context_get_sampler(const struct wined3d_device_context *context, + enum wined3d_shader_type shader_type, unsigned int idx); void __cdecl wined3d_device_context_get_scissor_rects(const struct wined3d_device_context *context, unsigned int *rect_count, RECT *rects); struct wined3d_shader * __cdecl wined3d_device_context_get_shader(const struct wined3d_device_context *context,

1 0