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.

wined3d: Pass "shader->function" as source to vkd3d_shader_scan() in shader_spirv_scan_shader().
9e79b9ff · Henri Verbeet · Alexandre Julliard · 440edde5 · 9e79b9ff
Commit 9e79b9ff authored Feb 26, 2024 by Henri Verbeet Committed by Alexandre Julliard Mar 01, 2024
Hide whitespace changes
Inline Side-by-side

Showing with 10 additions and 2 deletions

shader_spirv.c dlls/wined3d/shader_spirv.c +10 -2

No files found.
--- 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;
+    if (shader->source_type == VKD3D_SHADER_SOURCE_D3D_BYTECODE)
-    info.source.size = shader->byte_code_size;
+    {
+        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;