From b701dd497feccb80a8f0f3347d0978719a2cb87f Mon Sep 17 00:00:00 2001
From: Philip Rebohle <philip.rebohle@tu-dortmund.de>
Date: Thu, 14 Jul 2022 20:08:15 +0200
Subject: [PATCH] [dxvk] Drop VK_KHR_create_renderpass2

---
 src/dxvk/dxvk_adapter.cpp  |  3 +--
 src/dxvk/dxvk_extensions.h |  1 -
 src/vulkan/vulkan_loader.h | 11 ++++-------
 3 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/src/dxvk/dxvk_adapter.cpp b/src/dxvk/dxvk_adapter.cpp
index 4707a8052..6ad12f6d4 100644
--- a/src/dxvk/dxvk_adapter.cpp
+++ b/src/dxvk/dxvk_adapter.cpp
@@ -283,7 +283,7 @@ namespace dxvk {
           DxvkDeviceFeatures  enabledFeatures) {
     DxvkDeviceExtensions devExtensions;
 
-    std::array<DxvkExt*, 30> devExtensionList = {{
+    std::array<DxvkExt*, 29> devExtensionList = {{
       &devExtensions.amdMemoryOverallocationBehaviour,
       &devExtensions.amdShaderFragmentMask,
       &devExtensions.ext4444Formats,
@@ -303,7 +303,6 @@ namespace dxvk {
       &devExtensions.extShaderStencilExport,
       &devExtensions.extTransformFeedback,
       &devExtensions.extVertexAttributeDivisor,
-      &devExtensions.khrCreateRenderPass2,
       &devExtensions.khrDepthStencilResolve,
       &devExtensions.khrDriverProperties,
       &devExtensions.khrDynamicRendering,
diff --git a/src/dxvk/dxvk_extensions.h b/src/dxvk/dxvk_extensions.h
index 58419d698..cab5dd48f 100644
--- a/src/dxvk/dxvk_extensions.h
+++ b/src/dxvk/dxvk_extensions.h
@@ -295,7 +295,6 @@ namespace dxvk {
     DxvkExt extShaderStencilExport            = { VK_EXT_SHADER_STENCIL_EXPORT_EXTENSION_NAME,              DxvkExtMode::Optional };
     DxvkExt extTransformFeedback              = { VK_EXT_TRANSFORM_FEEDBACK_EXTENSION_NAME,                 DxvkExtMode::Optional };
     DxvkExt extVertexAttributeDivisor         = { VK_EXT_VERTEX_ATTRIBUTE_DIVISOR_EXTENSION_NAME,           DxvkExtMode::Optional };
-    DxvkExt khrCreateRenderPass2              = { VK_KHR_CREATE_RENDERPASS_2_EXTENSION_NAME,                DxvkExtMode::Required };
     DxvkExt khrDepthStencilResolve            = { VK_KHR_DEPTH_STENCIL_RESOLVE_EXTENSION_NAME,              DxvkExtMode::Required };
     DxvkExt khrDriverProperties               = { VK_KHR_DRIVER_PROPERTIES_EXTENSION_NAME,                  DxvkExtMode::Optional };
     DxvkExt khrDynamicRendering               = { VK_KHR_DYNAMIC_RENDERING_EXTENSION_NAME,                  DxvkExtMode::Required };
diff --git a/src/vulkan/vulkan_loader.h b/src/vulkan/vulkan_loader.h
index c972b48a5..f9c5ccc92 100644
--- a/src/vulkan/vulkan_loader.h
+++ b/src/vulkan/vulkan_loader.h
@@ -231,6 +231,7 @@ namespace dxvk::vk {
     VULKAN_FN(vkCreateFramebuffer);
     VULKAN_FN(vkDestroyFramebuffer);
     VULKAN_FN(vkCreateRenderPass);
+    VULKAN_FN(vkCreateRenderPass2);
     VULKAN_FN(vkDestroyRenderPass);
     VULKAN_FN(vkGetRenderAreaGranularity);
     VULKAN_FN(vkCreateCommandPool);
@@ -289,17 +290,13 @@ namespace dxvk::vk {
     VULKAN_FN(vkCmdCopyQueryPoolResults);
     VULKAN_FN(vkCmdPushConstants);
     VULKAN_FN(vkCmdBeginRenderPass);
+    VULKAN_FN(vkCmdBeginRenderPass2);
     VULKAN_FN(vkCmdNextSubpass);
+    VULKAN_FN(vkCmdNextSubpass2);
     VULKAN_FN(vkCmdEndRenderPass);
+    VULKAN_FN(vkCmdEndRenderPass2);
     VULKAN_FN(vkCmdExecuteCommands);
 
-    #ifdef VK_KHR_create_renderpass2
-    VULKAN_FN(vkCreateRenderPass2KHR);
-    VULKAN_FN(vkCmdBeginRenderPass2KHR);
-    VULKAN_FN(vkCmdNextSubpass2KHR);
-    VULKAN_FN(vkCmdEndRenderPass2KHR);
-    #endif
-    
     #ifdef VK_KHR_swapchain
     VULKAN_FN(vkCreateSwapchainKHR);
     VULKAN_FN(vkDestroySwapchainKHR);