[PATCH v4 2/4] vkd3d-shader: Treat the HLSL case specially in vkd3d_shader_compile().

[Giovanni Mascellani]

From: Giovanni Mascellani

---
 libs/vkd3d-shader/vkd3d_shader_main.c | 37 +++++++++++++++------------
 1 file changed, 21 insertions(+), 16 deletions(-)

diff --git a/libs/vkd3d-shader/vkd3d_shader_main.c b/libs/vkd3d-shader/vkd3d_shader_main.c
index 0f36984b1..5d53bb2d1 100644
--- a/libs/vkd3d-shader/vkd3d_shader_main.c
+++ b/libs/vkd3d-shader/vkd3d_shader_main.c
@@ -1718,26 +1718,31 @@ int vkd3d_shader_compile(const struct vkd3d_shader_compile_info *compile_info,

vkd3d_shader_dump_shader(compile_info);

-    switch (compile_info->source_type)
+    if (compile_info->source_type == VKD3D_SHADER_SOURCE_HLSL)
     {
-        case VKD3D_SHADER_SOURCE_DXBC_TPF:
-            ret = compile_dxbc_tpf(compile_info, out, &message_context);
-            break;
-
-        case VKD3D_SHADER_SOURCE_HLSL:
-            ret = compile_hlsl(compile_info, out, &message_context);
-            break;
+        ret = compile_hlsl(compile_info, out, &message_context);
+    }
+    else
+    {
+        switch (compile_info->source_type)
+        {
+            case VKD3D_SHADER_SOURCE_DXBC_TPF:
+                ret = compile_dxbc_tpf(compile_info, out, &message_context);
+                break;

-        case VKD3D_SHADER_SOURCE_D3D_BYTECODE:
-            ret = compile_d3d_bytecode(compile_info, out, &message_context);
-            break;
+            case VKD3D_SHADER_SOURCE_D3D_BYTECODE:
+                ret = compile_d3d_bytecode(compile_info, out, &message_context);
+                break;

-        case VKD3D_SHADER_SOURCE_DXBC_DXIL:
-            ret = compile_dxbc_dxil(compile_info, out, &message_context);
-            break;
+            case VKD3D_SHADER_SOURCE_DXBC_DXIL:
+                ret = compile_dxbc_dxil(compile_info, out, &message_context);
+                break;

-        default:
-            vkd3d_unreachable();
+            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);