Giovanni Mascellani : vkd3d-shader: Treat the HLSL case specially in vkd3d_shader_scan().

[Alexandre Julliard]

Module: vkd3d
Branch: master
Commit: 3a1c32acd42be20d012bf85a8cdc6f22bd651dfb
URL:    https://gitlab.winehq.org/wine/vkd3d/-/commit/3a1c32acd42be20d012bf85a8cdc6f...

Author: Giovanni Mascellani 
Date:   Fri Mar  1 11:46:51 2024 +0100

vkd3d-shader: Treat the HLSL case specially in vkd3d_shader_scan().

The other cases are similar and common code can be refactored.
Ideally the HLSL parser will eventually fit the same model, but that
will require more extensive work.

---

libs/vkd3d-shader/vkd3d_shader_main.c | 41 +++++++++++++++++++----------------
 1 file changed, 22 insertions(+), 19 deletions(-)

diff --git a/libs/vkd3d-shader/vkd3d_shader_main.c b/libs/vkd3d-shader/vkd3d_shader_main.c
index 85bdb463..81012216 100644
--- a/libs/vkd3d-shader/vkd3d_shader_main.c
+++ b/libs/vkd3d-shader/vkd3d_shader_main.c
@@ -1555,29 +1555,32 @@ int vkd3d_shader_scan(const struct vkd3d_shader_compile_info *compile_info, char

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 = scan_dxbc(compile_info, &message_context);
-            break;
-
-        case VKD3D_SHADER_SOURCE_HLSL:
-            FIXME("HLSL support not implemented.\n");
-            ret = VKD3D_ERROR_NOT_IMPLEMENTED;
-            break;
+        FIXME("HLSL support not implemented.\n");
+        ret = VKD3D_ERROR_NOT_IMPLEMENTED;
+    }
+    else
+    {
+        switch (compile_info->source_type)
+        {
+            case VKD3D_SHADER_SOURCE_DXBC_TPF:
+                ret = scan_dxbc(compile_info, &message_context);
+                break;

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

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

-        default:
-            ERR("Unsupported source type %#x.\n", compile_info->source_type);
-            ret = VKD3D_ERROR_INVALID_ARGUMENT;
-            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);