Henri Verbeet : wined3d: Pass "shader->function" as source to vkd3d_shader_scan() in shader_spirv_scan_shader().

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 9e79b9ffd9dca20b10eac37c0a5c3db7d405498b
URL:    https://gitlab.winehq.org/wine/wine/-/commit/9e79b9ffd9dca20b10eac37c0a5c3db...

Author: Henri Verbeet 
Date:   Mon Feb 26 15:57:24 2024 +0100

wined3d: Pass "shader->function" as source to vkd3d_shader_scan() in shader_spirv_scan_shader().

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;