=?UTF-8?Q?J=C3=B3zef=20Kucia=20?=: winevulkan: Move some autogenerated code to vulkan_private.h.
Alexandre Julliard
julliard at winehq.org
Thu Mar 29 19:13:30 CDT 2018
Module: wine
Branch: master
Commit: fc1b15f9b02841db3aac58ae4250ae97c8fb0ecc
URL: https://source.winehq.org/git/wine.git/?a=commit;h=fc1b15f9b02841db3aac58ae4250ae97c8fb0ecc
Author: Józef Kucia <jkucia at codeweavers.com>
Date: Thu Mar 29 14:53:53 2018 +0200
winevulkan: Move some autogenerated code to vulkan_private.h.
Signed-off-by: Józef Kucia <jkucia at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
dlls/winevulkan/make_vulkan | 12 ------------
dlls/winevulkan/vulkan_private.h | 11 +++++++++++
dlls/winevulkan/vulkan_thunks.h | 12 ------------
3 files changed, 11 insertions(+), 24 deletions(-)
diff --git a/dlls/winevulkan/make_vulkan b/dlls/winevulkan/make_vulkan
index 66a7525..8cd0b49 100755
--- a/dlls/winevulkan/make_vulkan
+++ b/dlls/winevulkan/make_vulkan
@@ -1913,18 +1913,6 @@ class VkGenerator(object):
f.write("#ifndef __WINE_VULKAN_THUNKS_H\n")
f.write("#define __WINE_VULKAN_THUNKS_H\n\n")
- f.write("/* Perform vulkan struct conversion on 32-bit x86 platforms. */\n")
- f.write("#if defined(__i386__)\n")
- f.write("#define USE_STRUCT_CONVERSION\n")
- f.write("#endif\n\n")
-
- f.write("/* For use by vk_icdGetInstanceProcAddr / vkGetInstanceProcAddr */\n")
- f.write("void *wine_vk_get_device_proc_addr(const char *name) DECLSPEC_HIDDEN;\n")
- f.write("void *wine_vk_get_instance_proc_addr(const char *name) DECLSPEC_HIDDEN;\n\n")
-
- f.write("BOOL wine_vk_device_extension_supported(const char *name) DECLSPEC_HIDDEN;\n")
- f.write("BOOL wine_vk_instance_extension_supported(const char *name) DECLSPEC_HIDDEN;\n\n")
-
# Generate prototypes for device and instance functions requiring a custom implementation.
f.write("/* Functions for which we have custom implementations outside of the thunks. */\n")
for vk_func in self.registry.funcs.values():
diff --git a/dlls/winevulkan/vulkan_private.h b/dlls/winevulkan/vulkan_private.h
index 7f2f242..a7239e7 100644
--- a/dlls/winevulkan/vulkan_private.h
+++ b/dlls/winevulkan/vulkan_private.h
@@ -20,6 +20,11 @@
#ifndef __WINE_VULKAN_PRIVATE_H
#define __WINE_VULKAN_PRIVATE_H
+/* Perform vulkan struct conversion on 32-bit x86 platforms. */
+#if defined(__i386__)
+#define USE_STRUCT_CONVERSION
+#endif
+
#include "vulkan_thunks.h"
/* Magic value defined by Vulkan ICD / Loader spec */
@@ -99,4 +104,10 @@ struct VkQueue_T
VkQueue queue; /* native queue */
};
+void *wine_vk_get_device_proc_addr(const char *name) DECLSPEC_HIDDEN;
+void *wine_vk_get_instance_proc_addr(const char *name) DECLSPEC_HIDDEN;
+
+BOOL wine_vk_device_extension_supported(const char *name) DECLSPEC_HIDDEN;
+BOOL wine_vk_instance_extension_supported(const char *name) DECLSPEC_HIDDEN;
+
#endif /* __WINE_VULKAN_PRIVATE_H */
diff --git a/dlls/winevulkan/vulkan_thunks.h b/dlls/winevulkan/vulkan_thunks.h
index 30a53ac..67df71d 100644
--- a/dlls/winevulkan/vulkan_thunks.h
+++ b/dlls/winevulkan/vulkan_thunks.h
@@ -3,18 +3,6 @@
#ifndef __WINE_VULKAN_THUNKS_H
#define __WINE_VULKAN_THUNKS_H
-/* Perform vulkan struct conversion on 32-bit x86 platforms. */
-#if defined(__i386__)
-#define USE_STRUCT_CONVERSION
-#endif
-
-/* For use by vk_icdGetInstanceProcAddr / vkGetInstanceProcAddr */
-void *wine_vk_get_device_proc_addr(const char *name) DECLSPEC_HIDDEN;
-void *wine_vk_get_instance_proc_addr(const char *name) DECLSPEC_HIDDEN;
-
-BOOL wine_vk_device_extension_supported(const char *name) DECLSPEC_HIDDEN;
-BOOL wine_vk_instance_extension_supported(const char *name) DECLSPEC_HIDDEN;
-
/* Functions for which we have custom implementations outside of the thunks. */
VkResult WINAPI wine_vkAllocateCommandBuffers(VkDevice device, const VkCommandBufferAllocateInfo *pAllocateInfo, VkCommandBuffer *pCommandBuffers);
void WINAPI wine_vkCmdExecuteCommands(VkCommandBuffer commandBuffer, uint32_t commandBufferCount, const VkCommandBuffer *pCommandBuffers);
More information about the wine-cvs
mailing list