diff options
author | bunnei <bunneidev@gmail.com> | 2019-12-09 04:28:02 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-12-09 04:28:02 +0100 |
commit | 116a940dbbab7f34a3fffe34c3ae6519bad0e9ab (patch) | |
tree | e728de74265864cd7e13cd8de3a098360574c71b | |
parent | Merge pull request #3199 from ReinUsesLisp/vk-swapchain (diff) | |
parent | externals: Update Vulkan-Headers (diff) | |
download | yuzu-116a940dbbab7f34a3fffe34c3ae6519bad0e9ab.tar yuzu-116a940dbbab7f34a3fffe34c3ae6519bad0e9ab.tar.gz yuzu-116a940dbbab7f34a3fffe34c3ae6519bad0e9ab.tar.bz2 yuzu-116a940dbbab7f34a3fffe34c3ae6519bad0e9ab.tar.lz yuzu-116a940dbbab7f34a3fffe34c3ae6519bad0e9ab.tar.xz yuzu-116a940dbbab7f34a3fffe34c3ae6519bad0e9ab.tar.zst yuzu-116a940dbbab7f34a3fffe34c3ae6519bad0e9ab.zip |
m--------- | externals/Vulkan-Headers | 0 | ||||
-rw-r--r-- | src/video_core/renderer_vulkan/declarations.h | 13 | ||||
-rw-r--r-- | src/video_core/renderer_vulkan/vk_device.cpp | 3 |
3 files changed, 14 insertions, 2 deletions
diff --git a/externals/Vulkan-Headers b/externals/Vulkan-Headers -Subproject fd568d51ed3d9bc6132e1639d7492453a08fe1b +Subproject d42d0747ee1b7a6726fb8948444b4993f9dcd2e diff --git a/src/video_core/renderer_vulkan/declarations.h b/src/video_core/renderer_vulkan/declarations.h index ba25b5bc7..323bf6b39 100644 --- a/src/video_core/renderer_vulkan/declarations.h +++ b/src/video_core/renderer_vulkan/declarations.h @@ -4,6 +4,17 @@ #pragma once +namespace vk { +class DispatchLoaderDynamic; +} + +namespace Vulkan { +constexpr vk::DispatchLoaderDynamic* dont_use_me_dld = nullptr; +} + +#define VULKAN_HPP_DEFAULT_DISPATCHER (*::Vulkan::dont_use_me_dld) +#define VULKAN_HPP_ENABLE_DYNAMIC_LOADER_TOOL 0 +#define VULKAN_HPP_DISPATCH_LOADER_DYNAMIC 1 #include <vulkan/vulkan.hpp> namespace Vulkan { @@ -41,5 +52,7 @@ using UniqueSemaphore = UniqueHandle<vk::Semaphore>; using UniqueShaderModule = UniqueHandle<vk::ShaderModule>; using UniqueSwapchainKHR = UniqueHandle<vk::SwapchainKHR>; using UniqueValidationCacheEXT = UniqueHandle<vk::ValidationCacheEXT>; +using UniqueDebugReportCallbackEXT = UniqueHandle<vk::DebugReportCallbackEXT>; +using UniqueDebugUtilsMessengerEXT = UniqueHandle<vk::DebugUtilsMessengerEXT>; } // namespace Vulkan diff --git a/src/video_core/renderer_vulkan/vk_device.cpp b/src/video_core/renderer_vulkan/vk_device.cpp index 897cbb4e8..6e58736a3 100644 --- a/src/video_core/renderer_vulkan/vk_device.cpp +++ b/src/video_core/renderer_vulkan/vk_device.cpp @@ -53,8 +53,7 @@ constexpr const vk::Format* GetFormatAlternatives(vk::Format format) { } } -constexpr vk::FormatFeatureFlags GetFormatFeatures(vk::FormatProperties properties, - FormatType format_type) { +vk::FormatFeatureFlags GetFormatFeatures(vk::FormatProperties properties, FormatType format_type) { switch (format_type) { case FormatType::Linear: return properties.linearTilingFeatures; |