diff options
| -rw-r--r-- | layers/swapchain.h | 1 | ||||
| -rw-r--r-- | layers/vk_layer_logging.h | 1 | ||||
| -rw-r--r-- | loader/vk_loader_platform.h | 8 |
3 files changed, 9 insertions, 1 deletions
diff --git a/layers/swapchain.h b/layers/swapchain.h index 8d104e86..8ffae717 100644 --- a/layers/swapchain.h +++ b/layers/swapchain.h @@ -28,7 +28,6 @@ #ifndef SWAPCHAIN_H #define SWAPCHAIN_H -#include "vk_loader_platform.h" #include "vk_layer.h" #include "vk_debug_report_lunarg.h" #include "vk_layer_config.h" diff --git a/layers/vk_layer_logging.h b/layers/vk_layer_logging.h index 70894f76..0f088445 100644 --- a/layers/vk_layer_logging.h +++ b/layers/vk_layer_logging.h @@ -33,6 +33,7 @@ #include <stdbool.h> #include <unordered_map> #include <inttypes.h> +#include "vk_loader_platform.h" #include "vk_layer.h" #include "vk_layer_data.h" #include "vk_layer_table.h" diff --git a/loader/vk_loader_platform.h b/loader/vk_loader_platform.h index 5b94948b..4af76f62 100644 --- a/loader/vk_loader_platform.h +++ b/loader/vk_loader_platform.h @@ -198,6 +198,14 @@ static inline void loader_platform_thread_cond_broadcast(loader_platform_thread_ // Headers: #include <WinSock2.h> #include <windows.h> +// WinBase.h defines CreateSemaphore and synchapi.h defines CreateEvent +// undefine them to avoid conflicts with VkLayerDispatchTable struct members. +#ifdef CreateSemaphore +#undef CreateSemaphore +#endif +#ifdef CreateEvent +#undef CreateEvent +#endif #include <assert.h> #include <stdio.h> #include <io.h> |