Giovanni Mascellani : vkd3d-shader: Refactor common code for vkd3d_shader_scan().

[Alexandre Julliard]

Module: vkd3d
Branch: master
Commit: 0e5d6a97ccd216966865ea930afd96a551fe2ec1
URL:    https://gitlab.winehq.org/wine/vkd3d/-/commit/0e5d6a97ccd216966865ea930afd96...

Author: Giovanni Mascellani <gmascellani(a)codeweavers.com>
Date:   Fri Mar  1 11:55:57 2024 +0100

vkd3d-shader: Refactor common code for vkd3d_shader_scan().

---

 libs/vkd3d-shader/vkd3d_shader_main.c | 76 ++++++++---------------------------
 1 file changed, 17 insertions(+), 59 deletions(-)

diff --git a/libs/vkd3d-shader/vkd3d_shader_main.c b/libs/vkd3d-shader/vkd3d_shader_main.c
index 37fc5775..948998ed 100644
--- a/libs/vkd3d-shader/vkd3d_shader_main.c
+++ b/libs/vkd3d-shader/vkd3d_shader_main.c
@@ -1482,60 +1482,6 @@ static int scan_with_parser(const struct vkd3d_shader_compile_info *compile_info
     return ret;
 }
 
-static int scan_dxbc(const struct vkd3d_shader_compile_info *compile_info,
-        struct vkd3d_shader_message_context *message_context)
-{
-    struct vkd3d_shader_parser *parser;
-    int ret;
-
-    if ((ret = vkd3d_shader_sm4_parser_create(compile_info, message_context, &parser)) < 0)
-    {
-        WARN("Failed to initialise shader parser.\n");
-        return ret;
-    }
-
-    ret = scan_with_parser(compile_info, message_context, NULL, parser);
-    vkd3d_shader_parser_destroy(parser);
-
-    return ret;
-}
-
-static int scan_d3dbc(const struct vkd3d_shader_compile_info *compile_info,
-        struct vkd3d_shader_message_context *message_context)
-{
-    struct vkd3d_shader_parser *parser;
-    int ret;
-
-    if ((ret = vkd3d_shader_sm1_parser_create(compile_info, message_context, &parser)) < 0)
-    {
-        WARN("Failed to initialise shader parser.\n");
-        return ret;
-    }
-
-    ret = scan_with_parser(compile_info, message_context, NULL, parser);
-    vkd3d_shader_parser_destroy(parser);
-
-    return ret;
-}
-
-static int scan_dxil(const struct vkd3d_shader_compile_info *compile_info,
-        struct vkd3d_shader_message_context *message_context)
-{
-    struct vkd3d_shader_parser *parser;
-    int ret;
-
-    if ((ret = vkd3d_shader_sm6_parser_create(compile_info, message_context, &parser)) < 0)
-    {
-        WARN("Failed to initialise shader parser.\n");
-        return ret;
-    }
-
-    ret = scan_with_parser(compile_info, message_context, NULL, parser);
-    vkd3d_shader_parser_destroy(parser);
-
-    return ret;
-}
-
 int vkd3d_shader_scan(const struct vkd3d_shader_compile_info *compile_info, char **messages)
 {
     struct vkd3d_shader_message_context message_context;
@@ -1562,18 +1508,20 @@ int vkd3d_shader_scan(const struct vkd3d_shader_compile_info *compile_info, char
     }
     else
     {
+        struct vkd3d_shader_parser *parser;
+
         switch (compile_info->source_type)
         {
-            case VKD3D_SHADER_SOURCE_DXBC_TPF:
-                ret = scan_dxbc(compile_info, &message_context);
+            case VKD3D_SHADER_SOURCE_D3D_BYTECODE:
+                ret = vkd3d_shader_sm1_parser_create(compile_info, &message_context, &parser);
                 break;
 
-            case VKD3D_SHADER_SOURCE_D3D_BYTECODE:
-                ret = scan_d3dbc(compile_info, &message_context);
+            case VKD3D_SHADER_SOURCE_DXBC_TPF:
+                ret = vkd3d_shader_sm4_parser_create(compile_info, &message_context, &parser);
                 break;
 
             case VKD3D_SHADER_SOURCE_DXBC_DXIL:
-                ret = scan_dxil(compile_info, &message_context);
+                ret = vkd3d_shader_sm6_parser_create(compile_info, &message_context, &parser);
                 break;
 
             default:
@@ -1581,6 +1529,16 @@ int vkd3d_shader_scan(const struct vkd3d_shader_compile_info *compile_info, char
                 ret = VKD3D_ERROR_INVALID_ARGUMENT;
                 break;
         }
+
+        if (ret < 0)
+        {
+            WARN("Failed to create shader parser.\n");
+        }
+        else
+        {
+            ret = scan_with_parser(compile_info, &message_context, NULL, parser);
+            vkd3d_shader_parser_destroy(parser);
+        }
     }
 
     vkd3d_shader_message_context_trace_messages(&message_context);