Henri Verbeet : vkd3d-shader: Only use scan_dxbc() for scanning dxbc-tpf source.

Alexandre Julliard julliard at winehq.org
Wed Sep 1 15:43:27 CDT 2021


Module: vkd3d
Branch: master
Commit: a8b062000eb633c2f37d03919c391e4c8ccf1535
URL:    https://source.winehq.org/git/vkd3d.git/?a=commit;h=a8b062000eb633c2f37d03919c391e4c8ccf1535

Author: Henri Verbeet <hverbeet at codeweavers.com>
Date:   Wed Sep  1 15:45:07 2021 +0200

vkd3d-shader: Only use scan_dxbc() for scanning dxbc-tpf source.

Signed-off-by: Henri Verbeet <hverbeet at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>

---

 libs/vkd3d-shader/vkd3d_shader_main.c | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/libs/vkd3d-shader/vkd3d_shader_main.c b/libs/vkd3d-shader/vkd3d_shader_main.c
index 5fab515..e28cfad 100644
--- a/libs/vkd3d-shader/vkd3d_shader_main.c
+++ b/libs/vkd3d-shader/vkd3d_shader_main.c
@@ -1006,7 +1006,22 @@ int vkd3d_shader_scan(const struct vkd3d_shader_compile_info *compile_info, char
 
     vkd3d_shader_message_context_init(&message_context, compile_info->log_level);
 
-    ret = scan_dxbc(compile_info, &message_context);
+    switch (compile_info->source_type)
+    {
+        case VKD3D_SHADER_SOURCE_DXBC_TPF:
+            ret = scan_dxbc(compile_info, &message_context);
+            break;
+
+        case VKD3D_SHADER_SOURCE_HLSL:
+            FIXME("HLSL support not implemented.\n");
+            ret = VKD3D_ERROR_NOT_IMPLEMENTED;
+            break;
+
+        default:
+            ERR("Unsupported source type %#x.\n", compile_info->source_type);
+            ret = VKD3D_ERROR_INVALID_ARGUMENT;
+            break;
+    }
 
     vkd3d_shader_message_context_trace_messages(&message_context);
     if (!vkd3d_shader_message_context_copy_messages(&message_context, messages))




More information about the wine-cvs mailing list