diff options
| author | 2019-12-08 22:08:19 -0300 | |
|---|---|---|
| committer | 2019-12-08 22:08:19 -0300 | |
| commit | 7ea362e134dec271ea09c34956710a028314e205 (patch) | |
| tree | e728de74265864cd7e13cd8de3a098360574c71b | |
| parent | Merge pull request #3199 from ReinUsesLisp/vk-swapchain (diff) | |
| download | yuzu-7ea362e134dec271ea09c34956710a028314e205.tar.gz yuzu-7ea362e134dec271ea09c34956710a028314e205.tar.xz yuzu-7ea362e134dec271ea09c34956710a028314e205.zip | |
externals: Update Vulkan-Headers
| 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 @@ | |||
| 4 | 4 | ||
| 5 | #pragma once | 5 | #pragma once |
| 6 | 6 | ||
| 7 | namespace vk { | ||
| 8 | class DispatchLoaderDynamic; | ||
| 9 | } | ||
| 10 | |||
| 11 | namespace Vulkan { | ||
| 12 | constexpr vk::DispatchLoaderDynamic* dont_use_me_dld = nullptr; | ||
| 13 | } | ||
| 14 | |||
| 15 | #define VULKAN_HPP_DEFAULT_DISPATCHER (*::Vulkan::dont_use_me_dld) | ||
| 16 | #define VULKAN_HPP_ENABLE_DYNAMIC_LOADER_TOOL 0 | ||
| 17 | #define VULKAN_HPP_DISPATCH_LOADER_DYNAMIC 1 | ||
| 7 | #include <vulkan/vulkan.hpp> | 18 | #include <vulkan/vulkan.hpp> |
| 8 | 19 | ||
| 9 | namespace Vulkan { | 20 | namespace Vulkan { |
| @@ -41,5 +52,7 @@ using UniqueSemaphore = UniqueHandle<vk::Semaphore>; | |||
| 41 | using UniqueShaderModule = UniqueHandle<vk::ShaderModule>; | 52 | using UniqueShaderModule = UniqueHandle<vk::ShaderModule>; |
| 42 | using UniqueSwapchainKHR = UniqueHandle<vk::SwapchainKHR>; | 53 | using UniqueSwapchainKHR = UniqueHandle<vk::SwapchainKHR>; |
| 43 | using UniqueValidationCacheEXT = UniqueHandle<vk::ValidationCacheEXT>; | 54 | using UniqueValidationCacheEXT = UniqueHandle<vk::ValidationCacheEXT>; |
| 55 | using UniqueDebugReportCallbackEXT = UniqueHandle<vk::DebugReportCallbackEXT>; | ||
| 56 | using UniqueDebugUtilsMessengerEXT = UniqueHandle<vk::DebugUtilsMessengerEXT>; | ||
| 44 | 57 | ||
| 45 | } // namespace Vulkan | 58 | } // 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) { | |||
| 53 | } | 53 | } |
| 54 | } | 54 | } |
| 55 | 55 | ||
| 56 | constexpr vk::FormatFeatureFlags GetFormatFeatures(vk::FormatProperties properties, | 56 | vk::FormatFeatureFlags GetFormatFeatures(vk::FormatProperties properties, FormatType format_type) { |
| 57 | FormatType format_type) { | ||
| 58 | switch (format_type) { | 57 | switch (format_type) { |
| 59 | case FormatType::Linear: | 58 | case FormatType::Linear: |
| 60 | return properties.linearTilingFeatures; | 59 | return properties.linearTilingFeatures; |