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

Conor McCarthy : vkd3d: Move descriptor range iteration to the count function.
by Alexandre Julliard 20 Apr '21

20 Apr '21

Module: vkd3d Branch: master Commit: e94a4549c804c10d76f71fd5cf4089dbc57410ec URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=e94a4549c804c10d76f71fd… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Sat Apr 17 01:01:40 2021 +1000 vkd3d: Move descriptor range iteration to the count function. Simplifies future validation of consecutive range upper bounds (a bounded range must not follow an unbounded one) and handling of the last range. 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 | 68 +++++++++++++++++++++++++++++------------------------- 1 file changed, 37 insertions(+), 31 deletions(-) diff --git a/libs/vkd3d/state.c b/libs/vkd3d/state.c index 4464a5f..5275371 100644 --- a/libs/vkd3d/state.c +++ b/libs/vkd3d/state.c @@ -325,37 +325,44 @@ struct d3d12_root_signature_info }; static HRESULT d3d12_root_signature_info_count_descriptors(struct d3d12_root_signature_info *info, - const D3D12_DESCRIPTOR_RANGE *range) + const D3D12_ROOT_DESCRIPTOR_TABLE *table) { - if (range->NumDescriptors == 0xffffffff) - { - FIXME("Unhandled unbound descriptor range.\n"); - return E_NOTIMPL; - } + unsigned int i; - switch (range->RangeType) + for (i = 0; i < table->NumDescriptorRanges; ++i) { - case D3D12_DESCRIPTOR_RANGE_TYPE_SRV: - /* XXX: Vulkan buffer and image descriptors have different types. In order - * 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->binding_count += range->NumDescriptors; - break; - case D3D12_DESCRIPTOR_RANGE_TYPE_UAV: - /* As above. */ - info->binding_count += range->NumDescriptors; - break; - case D3D12_DESCRIPTOR_RANGE_TYPE_CBV: - break; - case D3D12_DESCRIPTOR_RANGE_TYPE_SAMPLER: - break; - default: - FIXME("Unhandled descriptor type %#x.\n", range->RangeType); + const D3D12_DESCRIPTOR_RANGE *range = &table->pDescriptorRanges[i]; + + if (range->NumDescriptors == 0xffffffff) + { + FIXME("Unhandled unbound descriptor range.\n"); return E_NOTIMPL; - } + } + + switch (range->RangeType) + { + case D3D12_DESCRIPTOR_RANGE_TYPE_SRV: + /* XXX: Vulkan buffer and image descriptors have different types. In order + * 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->binding_count += range->NumDescriptors; + break; + case D3D12_DESCRIPTOR_RANGE_TYPE_UAV: + /* As above. */ + info->binding_count += range->NumDescriptors; + break; + case D3D12_DESCRIPTOR_RANGE_TYPE_CBV: + break; + case D3D12_DESCRIPTOR_RANGE_TYPE_SAMPLER: + break; + default: + FIXME("Unhandled descriptor type %#x.\n", range->RangeType); + return E_NOTIMPL; + } - info->binding_count += range->NumDescriptors; + info->binding_count += range->NumDescriptors; + } return S_OK; } @@ -363,7 +370,7 @@ static HRESULT d3d12_root_signature_info_count_descriptors(struct d3d12_root_sig static HRESULT d3d12_root_signature_info_from_desc(struct d3d12_root_signature_info *info, const D3D12_ROOT_SIGNATURE_DESC *desc) { - unsigned int i, j; + unsigned int i; HRESULT hr; memset(info, 0, sizeof(*info)); @@ -375,10 +382,9 @@ static HRESULT d3d12_root_signature_info_from_desc(struct d3d12_root_signature_i switch (p->ParameterType) { case D3D12_ROOT_PARAMETER_TYPE_DESCRIPTOR_TABLE: - for (j = 0; j < p->u.DescriptorTable.NumDescriptorRanges; ++j) - if (FAILED(hr = d3d12_root_signature_info_count_descriptors(info, - &p->u.DescriptorTable.pDescriptorRanges[j]))) - return hr; + if (FAILED(hr = d3d12_root_signature_info_count_descriptors(info, + &p->u.DescriptorTable))) + return hr; ++info->cost; break;

1 0

Conor McCarthy : vkd3d: Remove an unused function parameter.
by Alexandre Julliard 20 Apr '21

20 Apr '21

Module: vkd3d Branch: master Commit: c7c3376760eedced18f0b7589e6f348e55cc4e7d URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=c7c3376760eedced18f0b75… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Sat Apr 17 01:01:41 2021 +1000 vkd3d: Remove an unused function parameter. 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 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libs/vkd3d/state.c b/libs/vkd3d/state.c index 5275371..c4fcde9 100644 --- a/libs/vkd3d/state.c +++ b/libs/vkd3d/state.c @@ -421,7 +421,7 @@ static HRESULT d3d12_root_signature_info_from_desc(struct d3d12_root_signature_i } static HRESULT d3d12_root_signature_init_push_constants(struct d3d12_root_signature *root_signature, - const D3D12_ROOT_SIGNATURE_DESC *desc, const struct d3d12_root_signature_info *info, + const D3D12_ROOT_SIGNATURE_DESC *desc, struct VkPushConstantRange push_constants[D3D12_SHADER_VISIBILITY_PIXEL + 1], uint32_t *push_constant_range_count) { @@ -847,7 +847,7 @@ static HRESULT d3d12_root_signature_init(struct d3d12_root_signature *root_signa context.descriptor_binding = 0; } - if (FAILED(hr = d3d12_root_signature_init_push_constants(root_signature, desc, &info, + if (FAILED(hr = d3d12_root_signature_init_push_constants(root_signature, desc, root_signature->push_constant_ranges, &root_signature->push_constant_range_count))) goto fail; if (FAILED(hr = d3d12_root_signature_init_root_descriptor_tables(root_signature, desc, &context)))

1 0

Conor McCarthy : vkd3d: Store root signature Vulkan descriptor set layouts in an array.
by Alexandre Julliard 20 Apr '21

20 Apr '21

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

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

20 Apr '21

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/css: Fix the color of links on index page titles.
by Alexandre Julliard 20 Apr '21

20 Apr '21

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 : winetest: Position the up/down arrows with CSS instead of a table.
by Alexandre Julliard 20 Apr '21

20 Apr '21

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/dissect: Fix handling of skipped test unit.
by Alexandre Julliard 20 Apr '21

20 Apr '21

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 : testbot/reporttest: Update the tests to match the current Wine.
by Alexandre Julliard 20 Apr '21

20 Apr '21

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 19 Apr '21

19 Apr '21

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 : d3d11: Use wined3d_device_context_get_shader_resource_view().
by Alexandre Julliard 19 Apr '21

19 Apr '21

Module: wine Branch: master Commit: 455bd2ffac632d402a9b6056fcc934ecbab4f1b5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=455bd2ffac632d402a9b6056… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sat Apr 17 18:39:33 2021 -0500 d3d11: Use 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/d3d11/device.c | 39 ++++++++++++++++++++++++--------------- 1 file changed, 24 insertions(+), 15 deletions(-) diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index 9fd144c0fb6..469ca0d6c49 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -1650,7 +1650,7 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_VSGetConstantBuffers(ID3D1 static void STDMETHODCALLTYPE d3d11_immediate_context_PSGetShaderResources(ID3D11DeviceContext1 *iface, UINT start_slot, UINT view_count, ID3D11ShaderResourceView **views) { - struct d3d_device *device = device_from_immediate_ID3D11DeviceContext1(iface); + struct d3d11_immediate_context *context = impl_from_ID3D11DeviceContext1(iface); unsigned int i; TRACE("iface %p, start_slot %u, view_count %u, views %p.\n", @@ -1662,7 +1662,8 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_PSGetShaderResources(ID3D1 struct wined3d_shader_resource_view *wined3d_view; struct d3d_shader_resource_view *view_impl; - if (!(wined3d_view = wined3d_device_get_ps_resource_view(device->wined3d_device, start_slot + i))) + if (!(wined3d_view = wined3d_device_context_get_shader_resource_view( + context->wined3d_context, WINED3D_SHADER_TYPE_PIXEL, start_slot + i))) { views[i] = NULL; continue; @@ -1914,7 +1915,7 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_IAGetPrimitiveTopology(ID3 static void STDMETHODCALLTYPE d3d11_immediate_context_VSGetShaderResources(ID3D11DeviceContext1 *iface, UINT start_slot, UINT view_count, ID3D11ShaderResourceView **views) { - struct d3d_device *device = device_from_immediate_ID3D11DeviceContext1(iface); + struct d3d11_immediate_context *context = impl_from_ID3D11DeviceContext1(iface); unsigned int i; TRACE("iface %p, start_slot %u, view_count %u, views %p.\n", iface, start_slot, view_count, views); @@ -1925,7 +1926,8 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_VSGetShaderResources(ID3D1 struct wined3d_shader_resource_view *wined3d_view; struct d3d_shader_resource_view *view_impl; - if (!(wined3d_view = wined3d_device_get_vs_resource_view(device->wined3d_device, start_slot + i))) + if (!(wined3d_view = wined3d_device_context_get_shader_resource_view( + context->wined3d_context, WINED3D_SHADER_TYPE_VERTEX, start_slot + i))) { views[i] = NULL; continue; @@ -1992,7 +1994,7 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_GetPredication(ID3D11Devic static void STDMETHODCALLTYPE d3d11_immediate_context_GSGetShaderResources(ID3D11DeviceContext1 *iface, UINT start_slot, UINT view_count, ID3D11ShaderResourceView **views) { - struct d3d_device *device = device_from_immediate_ID3D11DeviceContext1(iface); + struct d3d11_immediate_context *context = impl_from_ID3D11DeviceContext1(iface); unsigned int i; TRACE("iface %p, start_slot %u, view_count %u, views %p.\n", iface, start_slot, view_count, views); @@ -2003,7 +2005,8 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_GSGetShaderResources(ID3D1 struct wined3d_shader_resource_view *wined3d_view; struct d3d_shader_resource_view *view_impl; - if (!(wined3d_view = wined3d_device_get_gs_resource_view(device->wined3d_device, start_slot + i))) + if (!(wined3d_view = wined3d_device_context_get_shader_resource_view( + context->wined3d_context, WINED3D_SHADER_TYPE_GEOMETRY, start_slot + i))) { views[i] = NULL; continue; @@ -2292,7 +2295,7 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_RSGetScissorRects(ID3D11De static void STDMETHODCALLTYPE d3d11_immediate_context_HSGetShaderResources(ID3D11DeviceContext1 *iface, UINT start_slot, UINT view_count, ID3D11ShaderResourceView **views) { - struct d3d_device *device = device_from_immediate_ID3D11DeviceContext1(iface); + struct d3d11_immediate_context *context = impl_from_ID3D11DeviceContext1(iface); unsigned int i; TRACE("iface %p, start_slot %u, view_count %u, views %p.\n", iface, start_slot, view_count, views); @@ -2303,7 +2306,8 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_HSGetShaderResources(ID3D1 struct wined3d_shader_resource_view *wined3d_view; struct d3d_shader_resource_view *view_impl; - if (!(wined3d_view = wined3d_device_get_hs_resource_view(device->wined3d_device, start_slot + i))) + if (!(wined3d_view = wined3d_device_context_get_shader_resource_view( + context->wined3d_context, WINED3D_SHADER_TYPE_HULL, start_slot + i))) { views[i] = NULL; continue; @@ -2383,7 +2387,7 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_HSGetConstantBuffers(ID3D1 static void STDMETHODCALLTYPE d3d11_immediate_context_DSGetShaderResources(ID3D11DeviceContext1 *iface, UINT start_slot, UINT view_count, ID3D11ShaderResourceView **views) { - struct d3d_device *device = device_from_immediate_ID3D11DeviceContext1(iface); + struct d3d11_immediate_context *context = impl_from_ID3D11DeviceContext1(iface); unsigned int i; TRACE("iface %p, start_slot %u, view_count %u, views %p.\n", @@ -2395,7 +2399,8 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_DSGetShaderResources(ID3D1 struct wined3d_shader_resource_view *wined3d_view; struct d3d_shader_resource_view *view_impl; - if (!(wined3d_view = wined3d_device_get_ds_resource_view(device->wined3d_device, start_slot + i))) + if (!(wined3d_view = wined3d_device_context_get_shader_resource_view( + context->wined3d_context, WINED3D_SHADER_TYPE_DOMAIN, start_slot + i))) { views[i] = NULL; continue; @@ -2475,7 +2480,7 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_DSGetConstantBuffers(ID3D1 static void STDMETHODCALLTYPE d3d11_immediate_context_CSGetShaderResources(ID3D11DeviceContext1 *iface, UINT start_slot, UINT view_count, ID3D11ShaderResourceView **views) { - struct d3d_device *device = device_from_immediate_ID3D11DeviceContext1(iface); + struct d3d11_immediate_context *context = impl_from_ID3D11DeviceContext1(iface); unsigned int i; TRACE("iface %p, start_slot %u, view_count %u, views %p.\n", iface, start_slot, view_count, views); @@ -2486,7 +2491,8 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_CSGetShaderResources(ID3D1 struct wined3d_shader_resource_view *wined3d_view; struct d3d_shader_resource_view *view_impl; - if (!(wined3d_view = wined3d_device_get_cs_resource_view(device->wined3d_device, start_slot + i))) + if (!(wined3d_view = wined3d_device_context_get_shader_resource_view( + context->wined3d_context, WINED3D_SHADER_TYPE_COMPUTE, start_slot + i))) { views[i] = NULL; continue; @@ -5024,7 +5030,8 @@ static void STDMETHODCALLTYPE d3d10_device_PSGetShaderResources(ID3D10Device1 *i struct wined3d_shader_resource_view *wined3d_view; struct d3d_shader_resource_view *view_impl; - if (!(wined3d_view = wined3d_device_get_ps_resource_view(device->wined3d_device, start_slot + i))) + if (!(wined3d_view = wined3d_device_context_get_shader_resource_view( + device->immediate_context.wined3d_context, WINED3D_SHADER_TYPE_PIXEL, start_slot + i))) { views[i] = NULL; continue; @@ -5261,7 +5268,8 @@ static void STDMETHODCALLTYPE d3d10_device_VSGetShaderResources(ID3D10Device1 *i struct wined3d_shader_resource_view *wined3d_view; struct d3d_shader_resource_view *view_impl; - if (!(wined3d_view = wined3d_device_get_vs_resource_view(device->wined3d_device, start_slot + i))) + if (!(wined3d_view = wined3d_device_context_get_shader_resource_view( + device->immediate_context.wined3d_context, WINED3D_SHADER_TYPE_VERTEX, start_slot + i))) { views[i] = NULL; continue; @@ -5340,7 +5348,8 @@ static void STDMETHODCALLTYPE d3d10_device_GSGetShaderResources(ID3D10Device1 *i struct wined3d_shader_resource_view *wined3d_view; struct d3d_shader_resource_view *view_impl; - if (!(wined3d_view = wined3d_device_get_gs_resource_view(device->wined3d_device, start_slot + i))) + if (!(wined3d_view = wined3d_device_context_get_shader_resource_view( + device->immediate_context.wined3d_context, WINED3D_SHADER_TYPE_GEOMETRY, start_slot + i))) { views[i] = NULL; continue;

1 0