Browse Source
Merge pull request #3204 from ReinUsesLisp/vulkan-headers
externals: Update Vulkan-Headers
pull/15/merge
bunnei
6 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with
15 additions and
3 deletions
-
externals/Vulkan-Headers
-
src/video_core/renderer_vulkan/declarations.h
-
src/video_core/renderer_vulkan/vk_device.cpp
|
|
@ -1 +1 @@ |
|
|
Subproject commit fd568d51ed3d9bc6132e1639d7492453a08fe1bc |
|
|
|
|
|
|
|
|
Subproject commit d42d0747ee1b7a6726fb8948444b4993f9dcd2e5 |
|
|
@ -4,6 +4,17 @@ |
|
|
|
|
|
|
|
|
#pragma once |
|
|
#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> |
|
|
#include <vulkan/vulkan.hpp> |
|
|
|
|
|
|
|
|
namespace Vulkan { |
|
|
namespace Vulkan { |
|
|
@ -41,5 +52,7 @@ using UniqueSemaphore = UniqueHandle<vk::Semaphore>; |
|
|
using UniqueShaderModule = UniqueHandle<vk::ShaderModule>; |
|
|
using UniqueShaderModule = UniqueHandle<vk::ShaderModule>; |
|
|
using UniqueSwapchainKHR = UniqueHandle<vk::SwapchainKHR>; |
|
|
using UniqueSwapchainKHR = UniqueHandle<vk::SwapchainKHR>; |
|
|
using UniqueValidationCacheEXT = UniqueHandle<vk::ValidationCacheEXT>; |
|
|
using UniqueValidationCacheEXT = UniqueHandle<vk::ValidationCacheEXT>; |
|
|
|
|
|
using UniqueDebugReportCallbackEXT = UniqueHandle<vk::DebugReportCallbackEXT>; |
|
|
|
|
|
using UniqueDebugUtilsMessengerEXT = UniqueHandle<vk::DebugUtilsMessengerEXT>; |
|
|
|
|
|
|
|
|
} // namespace Vulkan |
|
|
} // namespace Vulkan |
|
|
@ -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) { |
|
|
switch (format_type) { |
|
|
case FormatType::Linear: |
|
|
case FormatType::Linear: |
|
|
return properties.linearTilingFeatures; |
|
|
return properties.linearTilingFeatures; |
|
|
|