Zebediah Figura : vkd3d-shader: Allow compiling d3d bytecode to SPIR-V.

[Alexandre Julliard]

Module: vkd3d
Branch: master
Commit: 4ff389854ce7167f945864002317473bd8517687
URL:    https://gitlab.winehq.org/wine/vkd3d/-/commit/4ff389854ce7167f94586400231747...

Author: Zebediah Figura 
Date:   Sat Mar 12 16:57:27 2022 -0600

vkd3d-shader: Allow compiling d3d bytecode to SPIR-V.

---

libs/vkd3d-shader/vkd3d_shader_main.c | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/libs/vkd3d-shader/vkd3d_shader_main.c b/libs/vkd3d-shader/vkd3d_shader_main.c
index 49ce886a..de7a66e0 100644
--- a/libs/vkd3d-shader/vkd3d_shader_main.c
+++ b/libs/vkd3d-shader/vkd3d_shader_main.c
@@ -1626,14 +1626,10 @@ static int compile_d3d_bytecode(const struct vkd3d_shader_compile_info *compile_
         return ret;
     }

-    if (compile_info->target_type == VKD3D_SHADER_TARGET_D3D_ASM)
-    {
-        ret = vkd3d_dxbc_binary_to_text(&parser->instructions, &parser->shader_version, compile_info, out, VSIR_ASM_D3D);
-        vkd3d_shader_parser_destroy(parser);
-        return ret;
-    }
+    ret = vkd3d_shader_parser_compile(parser, compile_info, out, message_context);

-    return VKD3D_ERROR;
+    vkd3d_shader_parser_destroy(parser);
+    return ret;
 }

static int compile_dxbc_dxil(const struct vkd3d_shader_compile_info *compile_info,
@@ -1911,6 +1907,10 @@ const enum vkd3d_shader_target_type *vkd3d_shader_get_supported_target_types(

static const enum vkd3d_shader_target_type d3dbc_types[] =
     {
+        VKD3D_SHADER_TARGET_SPIRV_BINARY,
+#ifdef HAVE_SPIRV_TOOLS
+        VKD3D_SHADER_TARGET_SPIRV_TEXT,
+#endif
         VKD3D_SHADER_TARGET_D3D_ASM,
     };