Remap the allocator during replay.

gapis/api/vulkan/android/vulkan_android.api

@@ -47,12 +47,11 @@ class VkAndroidSurfaceCreateInfoKHR {
 cmd VkResult vkCreateAndroidSurfaceKHR(
         VkInstance                              instance,
         const VkAndroidSurfaceCreateInfoKHR*    pCreateInfo,
-        const VkAllocationCallbacks*            pAllocator,
+        AllocationCallbacks                     pAllocator,
         VkSurfaceKHR*                           pSurface) {
     surface := createAndroidSurfaceObject(pCreateInfo)
     surface.Instance = instance
     surface.Type = SURFACE_TYPE_ANDROID
-    // TODO: pAllocator
 
     handle := ?
     pSurface[0] = handle

gapis/api/vulkan/api/buffer.api

@@ -67,7 +67,7 @@
 cmd VkResult vkCreateBuffer(
     VkDevice                     device,
     const VkBufferCreateInfo*    pCreateInfo,
-    const VkAllocationCallbacks* pAllocator,
+    AllocationCallbacks          pAllocator,
     VkBuffer*                    pBuffer) {
   if !(device in Devices) { vkErrorInvalidDevice(device) }
   if pCreateInfo == null { vkErrorNullPointer("VkBufferCreateInfo") }
@@ -122,7 +122,7 @@ cmd VkResult vkCreateBuffer(
 cmd void vkDestroyBuffer(
     VkDevice                     device,
     VkBuffer                     buffer,
-    const VkAllocationCallbacks* pAllocator) {
+    AllocationCallbacks          pAllocator) {
   if !(device in Devices) { vkErrorInvalidDevice(device) }
   if (buffer != as!VkBuffer(0)) {
     bufferObject := Buffers[buffer]
@@ -155,12 +155,11 @@ cmd void vkDestroyBuffer(
 cmd VkResult vkCreateBufferView(
     VkDevice                      device,
     const VkBufferViewCreateInfo* pCreateInfo,
-    const VkAllocationCallbacks*  pAllocator,
+    AllocationCallbacks           pAllocator,
     VkBufferView*                 pView) {
   if !(device in Devices) { vkErrorInvalidDevice(device) }
   if pCreateInfo == null { vkErrorNullPointer("VkBufferViewCreateInfo") }
   buffer_view_create_info := pCreateInfo[0]
-  // TODO: pAllocator
 
   handle := ?
   bufferViewObject := new!BufferViewObject(
@@ -182,8 +181,7 @@ cmd VkResult vkCreateBufferView(
 cmd void vkDestroyBufferView(
     VkDevice                     device,
     VkBufferView                 bufferView,
-    const VkAllocationCallbacks* pAllocator) {
-  // TODO: pAllocator
+    AllocationCallbacks          pAllocator) {
   if !(device in Devices) { vkErrorInvalidDevice(device) }
   delete(BufferViews, bufferView)
 }

gapis/api/vulkan/api/command_buffer_control.api

@@ -53,12 +53,11 @@
 cmd VkResult vkCreateCommandPool(
     VkDevice                       device,
     const VkCommandPoolCreateInfo* pCreateInfo,
-    const VkAllocationCallbacks*   pAllocator,
+    AllocationCallbacks            pAllocator,
     VkCommandPool*                 pCommandPool) {
   if !(device in Devices) { vkErrorInvalidDevice(device) }
   if pCreateInfo == null { vkErrorNullPointer("VkCommandPoolCreateInfo") }
   create_info := pCreateInfo[0]
-  // TODO: pAllocator
 
   handle := ?
   if pCommandPool == null { vkErrorNullPointer("VkCommandPool") }
@@ -76,7 +75,7 @@ cmd VkResult vkCreateCommandPool(
 cmd void vkDestroyCommandPool(
     VkDevice                     device,
     VkCommandPool                commandPool,
-    const VkAllocationCallbacks* pAllocator) {
+    AllocationCallbacks          pAllocator) {
   if !(device in Devices) { vkErrorInvalidDevice(device) }
   if (commandPool != as!VkCommandPool(0)) {
     if !(commandPool in CommandPools) { vkErrorInvalidCommandPool(commandPool) }

gapis/api/vulkan/api/descriptor.api

@@ -61,7 +61,7 @@
 cmd VkResult vkCreateDescriptorSetLayout(
     VkDevice                               device,
     const VkDescriptorSetLayoutCreateInfo* pCreateInfo,
-    const VkAllocationCallbacks*           pAllocator,
+    AllocationCallbacks                    pAllocator,
     VkDescriptorSetLayout*                 pSetLayout) {
   if !(device in Devices) { vkErrorInvalidDevice(device) }
   if pCreateInfo == null { vkErrorNullPointer("VkDescriptorSetLayoutCreateInfo") }
@@ -94,8 +94,6 @@ cmd VkResult vkCreateDescriptorSetLayout(
   }
   descriptorSetLayout.MaximumBinding = largestBinding.Val
 
-  // TODO: pAllocator
-
   handle := ?
   if pSetLayout == null { vkErrorNullPointer("VkDescriptorSetLayout") }
   pSetLayout[0] = handle
@@ -110,8 +108,7 @@ cmd VkResult vkCreateDescriptorSetLayout(
 cmd void vkDestroyDescriptorSetLayout(
     VkDevice                     device,
     VkDescriptorSetLayout        descriptorSetLayout,
-    const VkAllocationCallbacks* pAllocator) {
-  // TODO: pAllocator
+    AllocationCallbacks          pAllocator) {
   if !(device in Devices) { vkErrorInvalidDevice(device) }
   delete(DescriptorSetLayouts, descriptorSetLayout)
 }
@@ -135,7 +132,7 @@ cmd void vkDestroyDescriptorSetLayout(
 cmd VkResult vkCreateDescriptorPool(
     VkDevice                          device,
     const VkDescriptorPoolCreateInfo* pCreateInfo,
-    const VkAllocationCallbacks*      pAllocator,
+    AllocationCallbacks               pAllocator,
     VkDescriptorPool*                 pDescriptorPool) {
   if !(device in Devices) { vkErrorInvalidDevice(device) }
   if pCreateInfo == null { vkErrorNullPointer("VkDescriptorPoolCreateInfo") }
@@ -151,8 +148,6 @@ cmd VkResult vkCreateDescriptorPool(
   }
   // TODO: info.pNext
 
-  // TODO: pAllocator
-
   handle := ?
   if pDescriptorPool == null { vkErrorNullPointer("VkDescriptorPool") }
   pDescriptorPool[0] = handle
@@ -167,7 +162,7 @@ cmd VkResult vkCreateDescriptorPool(
 cmd void vkDestroyDescriptorPool(
     VkDevice                     device,
     VkDescriptorPool             descriptorPool,
-    const VkAllocationCallbacks* pAllocator) {
+    AllocationCallbacks          pAllocator) {
   if !(device in Devices) { vkErrorInvalidDevice(device) }
   if (descriptorPool != as!VkDescriptorPool(0)) {
     if !(descriptorPool in DescriptorPools) { vkErrorInvalidDescriptorPool(descriptorPool) }

gapis/api/vulkan/api/device.api

@@ -70,14 +70,13 @@ cmd PFN_vkVoidFunction vkGetDeviceProcAddr(
 cmd VkResult vkCreateDevice(
     VkPhysicalDevice             physicalDevice,
     const VkDeviceCreateInfo*    pCreateInfo,
-    const VkAllocationCallbacks* pAllocator,
+    AllocationCallbacks          pAllocator,
     VkDevice*                    pDevice) {
   // NOTE: The logic for this function should be identical to the one of
   // replayCreateVkDevice() in synthetic.api. Change both together.
   device := createDeviceObject(pCreateInfo)
   if !(physicalDevice in PhysicalDevices) { vkErrorInvalidPhysicalDevice(physicalDevice) }
   device.PhysicalDevice = physicalDevice
-  // TODO: pAllocator
 
   handle := ?
   if pDevice == null { vkErrorNullPointer("VkDevice*") }
@@ -94,7 +93,7 @@ cmd VkResult vkCreateDevice(
 @custom
 cmd void vkDestroyDevice(
     VkDevice                     device,
-    const VkAllocationCallbacks* pAllocator) {
+    AllocationCallbacks          pAllocator) {
   if (device in Devices) {
     dev := Devices[device]
     for _ , _ , v in dev.QueueObjects {
@@ -112,7 +111,6 @@ cmd void vkDestroyDevice(
     }
   }
 
-  // TODO: pAllocator
   delete(Devices, device)
 }
 

gapis/api/vulkan/api/image.api

@@ -121,11 +121,10 @@
 cmd VkResult vkCreateImage(
     VkDevice                     device,
     const VkImageCreateInfo*     pCreateInfo,
-    const VkAllocationCallbacks* pAllocator,
+    AllocationCallbacks          pAllocator,
     VkImage*                     pImage) {
   if !(device in Devices) { vkErrorInvalidDevice(device) }
   if pCreateInfo == null { vkErrorNullPointer("VkImageCreateInfo") }
-  // TODO: pAllocator
   info := pCreateInfo[0]
   queueFamilyIndices := info.pQueueFamilyIndices[0:info.queueFamilyIndexCount]
 
@@ -238,8 +237,7 @@ cmd VkResult vkCreateImage(
 cmd void vkDestroyImage(
     VkDevice                     device,
     VkImage                      image,
-    const VkAllocationCallbacks* pAllocator) {
-  // TODO: pAllocator
+    AllocationCallbacks          pAllocator) {
   if !(device in Devices) { vkErrorInvalidDevice(device) }
   if (image != as!VkImage(0)) {
     imageObject := Images[image]
@@ -319,12 +317,11 @@ cmd VkResult vkBindImageMemory(
 cmd VkResult vkCreateImageView(
     VkDevice                     device,
     const VkImageViewCreateInfo* pCreateInfo,
-    const VkAllocationCallbacks* pAllocator,
+    AllocationCallbacks          pAllocator,
     VkImageView*                 pView) {
   if !(device in Devices) { vkErrorInvalidDevice(device) }
   if pCreateInfo == null { vkErrorNullPointer("VkImageViewCreateInfo") }
   image_view_create_info := pCreateInfo[0]
-  // TODO: pAllocator
 
   handle := ?
   if !(image_view_create_info.image in Images) { vkErrorInvalidImage(image_view_create_info.image) }
@@ -348,8 +345,7 @@ cmd VkResult vkCreateImageView(
 cmd void vkDestroyImageView(
     VkDevice                     device,
     VkImageView                  imageView,
-    const VkAllocationCallbacks* pAllocator) {
-  // TODO: pAllocator
+    AllocationCallbacks          pAllocator) {
   if !(device in Devices) { vkErrorInvalidDevice(device) }
   delete(ImageViews, imageView)
   for _ , _ , drawInfo in LastDrawInfos {
@@ -402,7 +398,7 @@ cmd void vkDestroyImageView(
 cmd VkResult vkCreateSampler(
     VkDevice                     device,
     const VkSamplerCreateInfo*   pCreateInfo,
-    const VkAllocationCallbacks* pAllocator,
+    AllocationCallbacks          pAllocator,
     VkSampler*                   pSampler) {
   if !(device in Devices) { vkErrorInvalidDevice(device) }
   if pCreateInfo == null { vkErrorNullPointer("VkSamplerCreateInfo") }
@@ -438,9 +434,8 @@ cmd VkResult vkCreateSampler(
 cmd void vkDestroySampler(
     VkDevice                     device,
     VkSampler                    sampler,
-    const VkAllocationCallbacks* pAllocator) {
+    AllocationCallbacks          pAllocator) {
   if !(device in Devices) { vkErrorInvalidDevice(device) }
-  // TODO: pAllocator
   delete(Samplers, sampler)
 }
 

gapis/api/vulkan/api/instance.api

@@ -50,13 +50,12 @@
 @override
 cmd VkResult vkCreateInstance(
     const VkInstanceCreateInfo*  pCreateInfo,
-    const VkAllocationCallbacks* pAllocator,
+    AllocationCallbacks          pAllocator,
     VkInstance*                  pInstance) {
   // NOTE: The logic for this function should be identical to the one of
   // replayCreateVkInstance() in synthetic.api. Change both together.
 
   instance := createInstanceObject(pCreateInfo)
-  // TODO: pAllocator
   handle := ?
   if pInstance == null { vkErrorNullPointer("VkInstance") }
   pInstance[0] = handle
@@ -71,8 +70,7 @@ cmd VkResult vkCreateInstance(
 @custom
 cmd void vkDestroyInstance(
     VkInstance                   instance,
-    const VkAllocationCallbacks* pAllocator) {
-  // TODO: pAllocator
+    AllocationCallbacks          pAllocator) {
   delete(Instances, instance)
 }
 

gapis/api/vulkan/api/memory.api

@@ -67,7 +67,7 @@
 cmd VkResult vkAllocateMemory(
     VkDevice                     device,
     const VkMemoryAllocateInfo*  pAllocateInfo,
-    const VkAllocationCallbacks* pAllocator,
+    AllocationCallbacks          pAllocator,
     VkDeviceMemory*              pMemory) {
   if !(device in Devices) { vkErrorInvalidDevice(device) }
   if pAllocateInfo == null { vkErrorNullPointer("VkMemoryAllocateInfo") }
@@ -124,7 +124,7 @@ cmd VkResult vkAllocateMemory(
 cmd void vkFreeMemory(
     VkDevice                     device,
     VkDeviceMemory               memory,
-    const VkAllocationCallbacks* pAllocator) {
+    AllocationCallbacks          pAllocator) {
   if !(device in Devices) { vkErrorInvalidDevice(device) }
   if (memory != as!VkDeviceMemory(0)) {
     memoryObject := DeviceMemories[memory]

gapis/api/vulkan/api/pipeline.api

@@ -53,14 +53,13 @@
 cmd VkResult vkCreatePipelineLayout(
     VkDevice                          device,
     const VkPipelineLayoutCreateInfo* pCreateInfo,
-    const VkAllocationCallbacks*      pAllocator,
+    AllocationCallbacks               pAllocator,
     VkPipelineLayout*                 pPipelineLayout) {
   if !(device in Devices) { vkErrorInvalidDevice(device) }
   if pCreateInfo == null { vkErrorNullPointer("VkPipelineLayoutCreateInfo") }
   info := pCreateInfo[0]
   pipelineLayout := new!PipelineLayoutObject(Device: device)
   // TODO: info.pNext
-  // TODO: pAllocator
 
   layoutCount := info.setLayoutCount
   layouts := info.pSetLayouts[0:layoutCount]
@@ -86,10 +85,9 @@ cmd VkResult vkCreatePipelineLayout(
 cmd void vkDestroyPipelineLayout(
     VkDevice                     device,
     VkPipelineLayout             pipelineLayout,
-    const VkAllocationCallbacks* pAllocator) {
+    AllocationCallbacks          pAllocator) {
 
   if !(device in Devices) { vkErrorInvalidDevice(device) }
-  // TODO: pAllocator
   delete(PipelineLayouts, pipelineLayout)
 }
 
@@ -225,7 +223,7 @@ cmd VkResult vkCreateGraphicsPipelines(
     VkPipelineCache                     pipelineCache,
     u32                                 createInfoCount,
     const VkGraphicsPipelineCreateInfo* pCreateInfos,
-    const VkAllocationCallbacks*        pAllocator,
+    AllocationCallbacks                 pAllocator,
     VkPipeline*                         pPipelines) {
 
   if !(device in Devices) { vkErrorInvalidDevice(device) }
@@ -450,7 +448,7 @@ cmd VkResult vkCreateComputePipelines(
     VkPipelineCache                    pipelineCache,
     u32                                createInfoCount,
     const VkComputePipelineCreateInfo* pCreateInfos,
-    const VkAllocationCallbacks*       pAllocator,
+    AllocationCallbacks                pAllocator,
     VkPipeline*                        pPipelines) {
   if !(device in Devices) { vkErrorInvalidDevice(device) }
   if pipelineCache != as!VkPipelineCache(0) {
@@ -495,7 +493,6 @@ cmd VkResult vkCreateComputePipelines(
     }
     created_pipelines.Objects[i] = obj
   }
-  // TODO: pAllocator
 
   pipelines := pPipelines[0:createInfoCount]
   for i in (0 .. createInfoCount) {
@@ -516,7 +513,7 @@ cmd VkResult vkCreateComputePipelines(
 cmd void vkDestroyPipeline(
     VkDevice                     device,
     VkPipeline                   pipeline,
-    const VkAllocationCallbacks* pAllocator) {
+    AllocationCallbacks          pAllocator) {
   if !(device in Devices) { vkErrorInvalidDevice(device) }
   if pipeline in GraphicsPipelines {
     delete(GraphicsPipelines, pipeline)
@@ -542,7 +539,7 @@ cmd void vkDestroyPipeline(
 cmd VkResult vkCreateShaderModule(
     VkDevice                        device,
     const VkShaderModuleCreateInfo* pCreateInfo,
-    const VkAllocationCallbacks*    pAllocator,
+    AllocationCallbacks             pAllocator,
     VkShaderModule*                 pShaderModule) {
   if !(device in Devices) { vkErrorInvalidDevice(device) }
   if pCreateInfo == null { vkErrorNullPointer("VkShaderModuleCreateInfo") }
@@ -564,7 +561,7 @@ cmd VkResult vkCreateShaderModule(
 cmd void vkDestroyShaderModule(
     VkDevice                     device,
     VkShaderModule               shaderModule,
-    const VkAllocationCallbacks* pAllocator) {
+    AllocationCallbacks          pAllocator) {
   if !(device in Devices) { vkErrorInvalidDevice(device) }
   delete(ShaderModules, shaderModule)
 }
@@ -583,7 +580,7 @@ cmd void vkDestroyShaderModule(
 cmd VkResult vkCreatePipelineCache(
     VkDevice                         device,
     const VkPipelineCacheCreateInfo* pCreateInfo,
-    const VkAllocationCallbacks*     pAllocator,
+    AllocationCallbacks              pAllocator,
     VkPipelineCache*                 pPipelineCache) {
   //TODO(awoloszyn): Add Allocator support
   if !(device in Devices) { vkErrorInvalidDevice(device) }
@@ -601,7 +598,7 @@ cmd VkResult vkCreatePipelineCache(
 cmd void vkDestroyPipelineCache(
     VkDevice                     device,
     VkPipelineCache              pipelineCache,
-    const VkAllocationCallbacks* pAllocator) {
+    AllocationCallbacks          pAllocator) {
   if !(device in Devices) { vkErrorInvalidDevice(device) }
   delete(PipelineCaches, pipelineCache)
 }

gapis/api/vulkan/api/query_pool.api

@@ -61,7 +61,7 @@ enum QueryStatus {
 cmd VkResult vkCreateQueryPool(
     VkDevice                     device,
     const VkQueryPoolCreateInfo* pCreateInfo,
-    const VkAllocationCallbacks* pAllocator,
+    AllocationCallbacks          pAllocator,
     VkQueryPool*                 pQueryPool) {
   if !(device in Devices) { vkErrorInvalidDevice(device) }
   if pCreateInfo == null { vkErrorNullPointer("VkQueuePoolCreateInfo") }
@@ -90,7 +90,7 @@ cmd VkResult vkCreateQueryPool(
 cmd void vkDestroyQueryPool(
     VkDevice                     device,
     VkQueryPool                  queryPool,
-    const VkAllocationCallbacks* pAllocator) {
+    AllocationCallbacks          pAllocator) {
   if !(device in Devices) { vkErrorInvalidDevice(device) }
   delete(QueryPools, queryPool)
 }