[PATCH 0/1] MR5164: wined3d: Pass "shader->function" as source to vkd3d_shader_scan() in shader_spirv_scan_shader().

[PATCH 1/1] wined3d: Pass "shader->function" as source to vkd3d_shader_scan() in shader_spirv_scan_shader().

[Henri Verbeet]

From: Henri Verbeet

Much like we do in shader_spirv_find_graphics_program_variant_vk() for
shader_spirv_compile_shader(). When compiling an Aon9 shader,
"shader->byte_code" points to the DXBC container, while
"shader->function" points to the contained d3dbc shader.
---
 dlls/wined3d/shader_spirv.c | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/dlls/wined3d/shader_spirv.c b/dlls/wined3d/shader_spirv.c
index 1677c8e5e39..acdf47b504e 100644
--- a/dlls/wined3d/shader_spirv.c
+++ b/dlls/wined3d/shader_spirv.c
@@ -751,8 +751,16 @@ static void shader_spirv_scan_shader(struct wined3d_shader *shader,

info.type = VKD3D_SHADER_STRUCTURE_TYPE_COMPILE_INFO;
     info.next = descriptor_info;
-    info.source.code = shader->byte_code;
-    info.source.size = shader->byte_code_size;
+    if (shader->source_type == VKD3D_SHADER_SOURCE_D3D_BYTECODE)
+    {
+        info.source.code = shader->function;
+        info.source.size = shader->functionLength;
+    }
+    else
+    {
+        info.source.code = shader->byte_code;
+        info.source.size = shader->byte_code_size;
+    }
     info.source_type = shader->source_type;
     info.target_type = VKD3D_SHADER_TARGET_SPIRV_BINARY;
     info.options = spirv_compile_options;

[PATCH 1/1] wined3d: Pass "shader->function" as source to vkd3d_shader_scan() in shader_spirv_scan_shader().

[Marvin]

Hi,

It looks like your patch introduced the new failures shown below.
Please investigate and fix them before resubmitting your patch.
If they are not new, fixing them anyway would help a lot. Otherwise
please ask for the known failures list to be updated.

The tests also ran into some preexisting test failures. If you know how
to fix them that would be helpful. See the TestBot job for the details:

The full results can be found at:
https://testbot.winehq.org/JobDetails.pl?Key=143420

Your paranoid android.

=== debian11b (64 bit WoW report) ===

dinput:
joystick8: Timeout

ntoskrnl.exe:
ntoskrnl.c:1546: Test failed: wrong class {00000000-0000-0000-0000-000000000000}
ntoskrnl.c:1569: Test failed: wrong class {00000000-0000-0000-0000-000000000000}
ntoskrnl.c:1571: Test failed: got flags 0
ntoskrnl.c:1585: Test failed: wrong class {00000000-0000-0000-0000-000000000000}
ntoskrnl.c:1630: Test succeeded inside todo block: expected failure
ntoskrnl.c:1636: Test failed: got error 0x6
ntoskrnl.c:1644: Test failed: got error 0x6
ntoskrnl.c:1649: Test failed: got error 0x6
ntoskrnl.c:1653: Test failed: got error 0x6
ntoskrnl.c:1655: Test failed: got size 200
ntoskrnl.c:1656: Test failed: got hardware IDs "ROOT\WINETEST\0\x00etest#0#{deadbeef-29ef-4538-a5fd-b69573a362c0}\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x84i\xca\xff\xffo\x00\x00"...
ntoskrnl.c:1661: Test failed: got error 0x6
ntoskrnl.c:1663: Test failed: got size 400
ntoskrnl.c:1664: Test failed: got container ID L""
ntoskrnl.c:1668: Test failed: got error 0x6
ntoskrnl.c:1670: Test failed: got size 200
ntoskrnl.c:1671: Test failed: got compatible IDs "ROOT\WINETEST\0\x00etest#0#{deadbeef-29ef-4538-a5fd-b69573a362c0}\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x84i\xca\xff\xffo\x00\x00"...
ntoskrnl.c:1684: Test failed: wrong class {00000000-0000-0000-0000-000000000000}
ntoskrnl.c:1686: Test failed: got flags 0
ntoskrnl.c:1690: Test failed: failed to get interface path, error 0x57
ntoskrnl.c:1691: Test failed: wrong path "\WINETEST\0"
ntoskrnl.c:1705: Test failed: got size 200
ntoskrnl.c:1715: Test failed: got size 200
ntoskrnl.c:1848: Test failed: got error 0

windows.gaming.input:
input.c:345: Test failed: IVectorView_RawGameController_GetMany returned count 1

wintrust:
crypt.c:819: Test succeeded inside todo block: Expected the catalog file to exist
Unhandled exception: page fault on read access to 0x0000000000000000 in 64-bit code (0x00000078b69bff).

[PATCH 0/1] MR5164: wined3d: Pass "shader->function" as source to vkd3d_shader_scan() in shader_spirv_scan_shader(). - approved

[Zebediah Figura (＠zfigura)]

This merge request was approved by Zebediah Figura.

[PATCH 0/1] MR5164: wined3d: Pass "shader->function" as source to vkd3d_shader_scan() in shader_spirv_scan_shader(). - approved

[Jan Sikorski (＠jsikorski)]

This merge request was approved by Jan Sikorski.