From e44a804ec75457457db1b4c439e4e5488e8e2f8e Mon Sep 17 00:00:00 2001
From: Liam <byteslice@airmail.cc>
Date: Fri, 2 Dec 2022 17:04:28 -0500
Subject: vulkan_common: promote descriptor update template usage to core

---
 src/video_core/renderer_vulkan/pipeline_helper.h | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'src/video_core/renderer_vulkan/pipeline_helper.h')

diff --git a/src/video_core/renderer_vulkan/pipeline_helper.h b/src/video_core/renderer_vulkan/pipeline_helper.h
index b7843e995..16c57aef7 100644
--- a/src/video_core/renderer_vulkan/pipeline_helper.h
+++ b/src/video_core/renderer_vulkan/pipeline_helper.h
@@ -44,17 +44,17 @@ public:
         });
     }
 
-    vk::DescriptorUpdateTemplateKHR CreateTemplate(VkDescriptorSetLayout descriptor_set_layout,
-                                                   VkPipelineLayout pipeline_layout,
-                                                   bool use_push_descriptor) const {
+    vk::DescriptorUpdateTemplate CreateTemplate(VkDescriptorSetLayout descriptor_set_layout,
+                                                VkPipelineLayout pipeline_layout,
+                                                bool use_push_descriptor) const {
         if (entries.empty()) {
             return nullptr;
         }
         const VkDescriptorUpdateTemplateType type =
             use_push_descriptor ? VK_DESCRIPTOR_UPDATE_TEMPLATE_TYPE_PUSH_DESCRIPTORS_KHR
-                                : VK_DESCRIPTOR_UPDATE_TEMPLATE_TYPE_DESCRIPTOR_SET_KHR;
-        return device->GetLogical().CreateDescriptorUpdateTemplateKHR({
-            .sType = VK_STRUCTURE_TYPE_DESCRIPTOR_UPDATE_TEMPLATE_CREATE_INFO_KHR,
+                                : VK_DESCRIPTOR_UPDATE_TEMPLATE_TYPE_DESCRIPTOR_SET;
+        return device->GetLogical().CreateDescriptorUpdateTemplate({
+            .sType = VK_STRUCTURE_TYPE_DESCRIPTOR_UPDATE_TEMPLATE_CREATE_INFO,
             .pNext = nullptr,
             .flags = 0,
             .descriptorUpdateEntryCount = static_cast<u32>(entries.size()),
-- 
cgit v1.2.3


From 18831e0933231661a99e713c4a4fc94153ef0c3b Mon Sep 17 00:00:00 2001
From: Liam <byteslice@airmail.cc>
Date: Sat, 3 Dec 2022 10:37:12 -0500
Subject: vulkan_common: clean up extension usage

---
 src/video_core/renderer_vulkan/pipeline_helper.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/video_core/renderer_vulkan/pipeline_helper.h')

diff --git a/src/video_core/renderer_vulkan/pipeline_helper.h b/src/video_core/renderer_vulkan/pipeline_helper.h
index 16c57aef7..28b893e25 100644
--- a/src/video_core/renderer_vulkan/pipeline_helper.h
+++ b/src/video_core/renderer_vulkan/pipeline_helper.h
@@ -129,7 +129,7 @@ private:
     const Device* device{};
     bool is_compute{};
     boost::container::small_vector<VkDescriptorSetLayoutBinding, 32> bindings;
-    boost::container::small_vector<VkDescriptorUpdateTemplateEntryKHR, 32> entries;
+    boost::container::small_vector<VkDescriptorUpdateTemplateEntry, 32> entries;
     u32 binding{};
     u32 num_descriptors{};
     size_t offset{};
-- 
cgit v1.2.3