From 7ea362e134dec271ea09c34956710a028314e205 Mon Sep 17 00:00:00 2001
From: ReinUsesLisp <reinuseslisp@airmail.cc>
Date: Sun, 8 Dec 2019 22:08:19 -0300
Subject: [PATCH] externals: Update Vulkan-Headers
---
externals/Vulkan-Headers | 2 +-
src/video_core/renderer_vulkan/declarations.h | 13 +++++++++++++
src/video_core/renderer_vulkan/vk_device.cpp | 3 +--
3 files changed, 15 insertions(+), 3 deletions(-)
diff --git a/externals/Vulkan-Headers b/externals/Vulkan-Headers
index fd568d51ed..d42d0747ee 160000
--- a/externals/Vulkan-Headers
+++ b/externals/Vulkan-Headers
@@ -1 +1 @@
-Subproject commit fd568d51ed3d9bc6132e1639d7492453a08fe1bc
+Subproject commit d42d0747ee1b7a6726fb8948444b4993f9dcd2e5
diff --git a/src/video_core/renderer_vulkan/declarations.h b/src/video_core/renderer_vulkan/declarations.h
index ba25b5bc70..323bf6b39f 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 897cbb4e88..6e58736a3c 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;