[VK] Add support for new functions for querying buffer memory requirements

Author: Ekzuzy

Vulkan/codegen/generator_vulkan_official.py

@@ -3392,14 +3392,14 @@
 arg3=ArgDef(name='pCompatibility', type='VkAccelerationStructureCompatibilityKHR*')
 )
 
-Function(name='vkGetDeviceBufferMemoryRequirements', enabled=False, type=FuncType.PARAM,
+Function(name='vkGetDeviceBufferMemoryRequirements', enabled=False, type=FuncType.PARAM, recExecWrap=True,
 retV=RetDef(type='void'),
 arg1=ArgDef(name='device', type='VkDevice'),
 arg2=ArgDef(name='pInfo', type='const VkDeviceBufferMemoryRequirements*'),
 arg3=ArgDef(name='pMemoryRequirements', type='VkMemoryRequirements2*')
 )
 
-Function(name='vkGetDeviceBufferMemoryRequirementsKHR', enabled=False, type=FuncType.PARAM,
+Function(name='vkGetDeviceBufferMemoryRequirementsKHR', enabled=False, type=FuncType.PARAM, recExecWrap=True, 
 retV=RetDef(type='void'),
 arg1=ArgDef(name='device', type='VkDevice'),
 arg2=ArgDef(name='pInfo', type='const VkDeviceBufferMemoryRequirements*'),

Vulkan/interceptor/include/vulkanExecWrap.h

@@ -1028,10 +1028,9 @@ VkResult recExecWrap_vkCreateImage(VkDevice device,
                                                                       pAllocator, pImage);
 }
 
-VkResult recExecWrap_vkCreateBuffer(VkDevice device,
-                                    const VkBufferCreateInfo* pCreateInfo,
-                                    const VkAllocationCallbacks* pAllocator,
-                                    VkBuffer* pBuffer) {
+namespace {
+
+VkBufferCreateInfo OverwriteBufferCreateInfo(const VkBufferCreateInfo* pCreateInfo) {
   // Global changes - propagate to recorded streams
   if (!CGitsPluginVulkan::RecorderWrapper().IsPaused()) {
     VkBufferCreateInfo* originalCreateInfo = const_cast<VkBufferCreateInfo*>(pCreateInfo);
@@ -1062,11 +1061,22 @@ VkResult recExecWrap_vkCreateBuffer(VkDevice device,
              .vulkan.recorder.crossPlatformStateRestoration.buffers)) {
       localCreateInfo.usage |= VK_BUFFER_USAGE_TRANSFER_SRC_BIT;
     }
-    return CGitsPluginVulkan::RecorderWrapper().Drivers().vkCreateBuffer(device, &localCreateInfo,
-                                                                         pAllocator, pBuffer);
+
+    return localCreateInfo;
   }
 }
 
+} // namespace
+
+VkResult recExecWrap_vkCreateBuffer(VkDevice device,
+                                    const VkBufferCreateInfo* pCreateInfo,
+                                    const VkAllocationCallbacks* pAllocator,
+                                    VkBuffer* pBuffer) {
+  auto localCreateInfo = OverwriteBufferCreateInfo(pCreateInfo);
+  return CGitsPluginVulkan::RecorderWrapper().Drivers().vkCreateBuffer(device, &localCreateInfo,
+                                                                       pAllocator, pBuffer);
+}
+
 VkResult recExecWrap_vkCreateSwapchainKHR(VkDevice device,
                                           const VkSwapchainCreateInfoKHR* pCreateInfo,
                                           const VkAllocationCallbacks* pAllocator,
@@ -1287,6 +1297,31 @@ void recExecWrap_vkGetBufferMemoryRequirements2KHR(VkDevice device,
   ProcessBufferMemoryRequirements(&pMemoryRequirements->memoryRequirements);
 }
 
+void recExecWrap_vkGetDeviceBufferMemoryRequirements(VkDevice device,
+                                                     const VkDeviceBufferMemoryRequirements* pInfo,
+                                                     VkMemoryRequirements2* pMemoryRequirements) {
+  auto memoryReqsInfo = *pInfo;
+  auto createInfo = OverwriteBufferCreateInfo(memoryReqsInfo.pCreateInfo);
+  memoryReqsInfo.pCreateInfo = &createInfo;
+
+  CGitsPluginVulkan::RecorderWrapper().Drivers().vkGetDeviceBufferMemoryRequirements(
+      device, &memoryReqsInfo, pMemoryRequirements);
+  ProcessBufferMemoryRequirements(&pMemoryRequirements->memoryRequirements);
+}
+
+void recExecWrap_vkGetDeviceBufferMemoryRequirementsKHR(
+    VkDevice device,
+    const VkDeviceBufferMemoryRequirements* pInfo,
+    VkMemoryRequirements2* pMemoryRequirements) {
+  auto memoryReqsInfo = *pInfo;
+  auto createInfo = OverwriteBufferCreateInfo(memoryReqsInfo.pCreateInfo);
+  memoryReqsInfo.pCreateInfo = &createInfo;
+
+  CGitsPluginVulkan::RecorderWrapper().Drivers().vkGetDeviceBufferMemoryRequirementsKHR(
+      device, &memoryReqsInfo, pMemoryRequirements);
+  ProcessBufferMemoryRequirements(&pMemoryRequirements->memoryRequirements);
+}
+
 void recExecWrap_vkGetAccelerationStructureBuildSizesKHR(
     VkDevice device,
     VkAccelerationStructureBuildTypeKHR buildType,