Vulkan: Merge API logic of KHR extensions and Vulkan 1.1

KHR_get_physical_device_properties2 and KHR-get_memory_requirements2 are merged with corresponding vulkan 1.1 core commands
google · Dec 18, 2018 · 462a1fb · 462a1fb
1 parent 704225d
commit 462a1fb
Show file tree

Hide file tree

Showing 8 changed files with 390 additions and 219 deletions.
diff --git a/gapis/api/vulkan/api/buffer.api b/gapis/api/vulkan/api/buffer.api
@@ -59,7 +59,7 @@
   @untracked @unused ref!QueueObject LastBoundQueue
   @unused ref!VulkanDebugMarkerInfo  DebugInfo
   VkMemoryRequirements               MemoryRequirements
-  ref!DedicatedRequirementsKHR       DedicatedRequirementsKHR
+  ref!DedicatedRequirements          DedicatedRequirements
 }
 
 @threadSafety("system")

diff --git a/gapis/api/vulkan/api/image.api b/gapis/api/vulkan/api/image.api
@@ -73,7 +73,7 @@
   @unused ref!VulkanDebugMarkerInfo            DebugInfo
   VkMemoryRequirements                         MemoryRequirements
   map!(u32, VkSparseImageMemoryRequirements)   SparseMemoryRequirements
-  ref!DedicatedRequirementsKHR                 DedicatedRequirementsKHR
+  ref!DedicatedRequirements                    DedicatedRequirements
   // If ever layer/level is set to the same queue, then set it here instead.
   // This can save expensive looping through Aspects/Layers/Levels
   @untracked @unused ref!QueueObject           LastBoundQueue