Henri Verbeet : vkd3d-shader/hlsl: Support spirv-binary and spirv-text as target formats.

[Alexandre Julliard]

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

Author: Henri Verbeet 
Date:   Thu Apr 18 16:36:21 2024 +0200

vkd3d-shader/hlsl: Support spirv-binary and spirv-text as target formats.

---

libs/vkd3d-shader/hlsl.c              | 4 +++-
 libs/vkd3d-shader/vkd3d_shader_main.c | 4 ++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/libs/vkd3d-shader/hlsl.c b/libs/vkd3d-shader/hlsl.c
index a6a70d4b..5dd80ff1 100644
--- a/libs/vkd3d-shader/hlsl.c
+++ b/libs/vkd3d-shader/hlsl.c
@@ -3918,7 +3918,9 @@ int hlsl_compile_shader(const struct vkd3d_shader_code *hlsl, const struct vkd3d
         return VKD3D_ERROR_INVALID_SHADER;
     }

-    if (target_type == VKD3D_SHADER_TARGET_D3D_ASM)
+    if (target_type == VKD3D_SHADER_TARGET_SPIRV_BINARY
+            || target_type == VKD3D_SHADER_TARGET_SPIRV_TEXT
+            || target_type == VKD3D_SHADER_TARGET_D3D_ASM)
     {
         struct vkd3d_shader_compile_info info = *compile_info;
         struct vkd3d_shader_parser *parser;
diff --git a/libs/vkd3d-shader/vkd3d_shader_main.c b/libs/vkd3d-shader/vkd3d_shader_main.c
index a418fdc1..4342a176 100644
--- a/libs/vkd3d-shader/vkd3d_shader_main.c
+++ b/libs/vkd3d-shader/vkd3d_shader_main.c
@@ -1879,6 +1879,10 @@ const enum vkd3d_shader_target_type *vkd3d_shader_get_supported_target_types(

static const enum vkd3d_shader_target_type hlsl_types[] =
     {
+        VKD3D_SHADER_TARGET_SPIRV_BINARY,
+#ifdef HAVE_SPIRV_TOOLS
+        VKD3D_SHADER_TARGET_SPIRV_TEXT,
+#endif
         VKD3D_SHADER_TARGET_D3D_ASM,
         VKD3D_SHADER_TARGET_D3D_BYTECODE,
         VKD3D_SHADER_TARGET_DXBC_TPF,