Zebediah Figura : vkd3d-utils: Introduce D3DPreprocess().

[Alexandre Julliard]

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

Author: Zebediah Figura <zfigura at codeweavers.com>
Date:   Tue Sep 29 16:14:52 2020 -0500

vkd3d-utils: Introduce D3DPreprocess().

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

---

 include/vkd3d_d3dcompiler.h         |  2 ++
 include/vkd3d_utils.h               |  3 ++
 libs/vkd3d-utils/vkd3d_utils.map    |  1 +
 libs/vkd3d-utils/vkd3d_utils_main.c | 66 +++++++++++++++++++++++++++++++++++++
 4 files changed, 72 insertions(+)

diff --git a/include/vkd3d_d3dcompiler.h b/include/vkd3d_d3dcompiler.h
index 7137294..c70a7d7 100644
--- a/include/vkd3d_d3dcompiler.h
+++ b/include/vkd3d_d3dcompiler.h
@@ -67,6 +67,8 @@ HRESULT WINAPI D3DCompile2(const void *data, SIZE_T data_size, const char *filen
         const void *secondary_data, SIZE_T secondary_data_size, ID3DBlob **shader,
         ID3DBlob **error_messages);
 HRESULT WINAPI D3DCreateBlob(SIZE_T size, ID3D10Blob **blob);
+HRESULT WINAPI D3DPreprocess(const void *data, SIZE_T size, const char *filename, const D3D_SHADER_MACRO *macros,
+        ID3DInclude *include, ID3DBlob **shader, ID3DBlob **error_messages);
 
 #endif /* __D3DCOMPILER_H__ */
 #endif /* __VKD3D_D3DCOMPILER_H */
diff --git a/include/vkd3d_utils.h b/include/vkd3d_utils.h
index c005d4e..a694de6 100644
--- a/include/vkd3d_utils.h
+++ b/include/vkd3d_utils.h
@@ -64,6 +64,9 @@ HRESULT WINAPI D3DCompile2(const void *data, SIZE_T data_size, const char *filen
         const void *secondary_data, SIZE_T secondary_data_size, ID3DBlob **shader,
         ID3DBlob **error_messages);
 HRESULT WINAPI D3DCreateBlob(SIZE_T data_size, ID3D10Blob **blob);
+HRESULT WINAPI D3DPreprocess(const void *data, SIZE_T size, const char *filename,
+        const D3D_SHADER_MACRO *defines, ID3DInclude *include,
+        ID3DBlob **shader, ID3DBlob **error_messages);
 
 #ifdef __cplusplus
 }
diff --git a/libs/vkd3d-utils/vkd3d_utils.map b/libs/vkd3d-utils/vkd3d_utils.map
index 337409e..1e46cd8 100644
--- a/libs/vkd3d-utils/vkd3d_utils.map
+++ b/libs/vkd3d-utils/vkd3d_utils.map
@@ -11,6 +11,7 @@ global:
     D3DCompile;
     D3DCompile2;
     D3DCreateBlob;
+    D3DPreprocess;
     vkd3d_create_event;
     vkd3d_destroy_event;
     vkd3d_signal_event;
diff --git a/libs/vkd3d-utils/vkd3d_utils_main.c b/libs/vkd3d-utils/vkd3d_utils_main.c
index 8f54ac8..f5cb5b5 100644
--- a/libs/vkd3d-utils/vkd3d_utils_main.c
+++ b/libs/vkd3d-utils/vkd3d_utils_main.c
@@ -250,6 +250,72 @@ HRESULT WINAPI D3DCompile(const void *data, SIZE_T data_size, const char *filena
             effect_flags, 0, NULL, 0, shader, error_messages);
 }
 
+HRESULT WINAPI D3DPreprocess(const void *data, SIZE_T size, const char *filename,
+        const D3D_SHADER_MACRO *macros, ID3DInclude *include,
+        ID3DBlob **preprocessed_blob, ID3DBlob **messages_blob)
+{
+    struct vkd3d_shader_preprocess_info preprocess_info;
+    struct vkd3d_shader_compile_info compile_info;
+    struct vkd3d_shader_code preprocessed_code;
+    const D3D_SHADER_MACRO *macro;
+    char *messages;
+    HRESULT hr;
+    int ret;
+
+    TRACE("data %p, size %lu, filename %s, macros %p, include %p, preprocessed_blob %p, messages_blob %p.\n",
+            data, size, debugstr_a(filename), macros, include, preprocessed_blob, messages_blob);
+
+    compile_info.type = VKD3D_SHADER_STRUCTURE_TYPE_COMPILE_INFO;
+    compile_info.next = &preprocess_info;
+    compile_info.source.code = data;
+    compile_info.source.size = size;
+    compile_info.source_type = VKD3D_SHADER_SOURCE_HLSL;
+    compile_info.target_type = VKD3D_SHADER_TARGET_NONE;
+    compile_info.options = NULL;
+    compile_info.option_count = 0;
+    compile_info.log_level = VKD3D_SHADER_LOG_INFO;
+    compile_info.source_name = filename;
+
+    preprocess_info.type = VKD3D_SHADER_STRUCTURE_TYPE_PREPROCESS_INFO;
+    preprocess_info.next = NULL;
+    preprocess_info.macros = (const struct vkd3d_shader_macro *)macros;
+    preprocess_info.macro_count = 0;
+    if (macros)
+    {
+        for (macro = macros; macro->Name; ++macro)
+            ++preprocess_info.macro_count;
+    }
+    preprocess_info.pfn_open_include = open_include;
+    preprocess_info.pfn_close_include = close_include;
+    preprocess_info.include_context = include;
+
+    ret = vkd3d_shader_preprocess(&compile_info, &preprocessed_code, &messages);
+    if (messages)
+    {
+        if (messages_blob)
+        {
+            if (FAILED(hr = vkd3d_blob_create(messages, strlen(messages), messages_blob)))
+            {
+                vkd3d_shader_free_shader_code(&preprocessed_code);
+                return hr;
+            }
+        }
+        else
+            vkd3d_shader_free_messages(messages);
+    }
+
+    if (!ret)
+    {
+        if (FAILED(hr = vkd3d_blob_create((void *)preprocessed_code.code, preprocessed_code.size, preprocessed_blob)))
+        {
+            vkd3d_shader_free_shader_code(&preprocessed_code);
+            return hr;
+        }
+    }
+
+    return hresult_from_vkd3d_result(ret);
+}
+
 /* Events */
 HANDLE vkd3d_create_event(void)
 {