From fd843a023b9907915881dc7810b5f0d0d8de8ad0 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Mika=20V=C3=A4in=C3=B6l=C3=A4?= Date: Thu, 25 Jun 2020 16:26:19 +0300 Subject: [PATCH] Enable unused AllocationCallbackRecorder computeDeviceMemorySystemMemFootprint used in Vulkan memory mapping and allocation tests creates an AllocationCallbackRecorder but didn't pass the callbacks to allocateMemory, passing zero records to validateAllocationCallbacks. Affects: dEQP-VK.memory.mapping.suballocation.random.* dEQP-VK.memory.allocation.random.* Components: Vulkan VK-GL-CTS issue: 2434 Change-Id: I208ea3e5a449c9a69b2981067ad38ea3e54699c2 --- external/vulkancts/modules/vulkan/memory/vktMemoryAllocationTests.cpp | 2 +- external/vulkancts/modules/vulkan/memory/vktMemoryMappingTests.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/external/vulkancts/modules/vulkan/memory/vktMemoryAllocationTests.cpp b/external/vulkancts/modules/vulkan/memory/vktMemoryAllocationTests.cpp index 5d6bc77..3af0826 100644 --- a/external/vulkancts/modules/vulkan/memory/vktMemoryAllocationTests.cpp +++ b/external/vulkancts/modules/vulkan/memory/vktMemoryAllocationTests.cpp @@ -436,7 +436,7 @@ size_t computeDeviceMemorySystemMemFootprint (const DeviceInterface& vk, VkDevic 1u, 0u, }; - const Unique memory (allocateMemory(vk, device, &allocInfo)); + const Unique memory (allocateMemory(vk, device, &allocInfo, callbackRecorder.getCallbacks())); AllocationCallbackValidationResults validateRes; validateAllocationCallbacks(callbackRecorder, &validateRes); diff --git a/external/vulkancts/modules/vulkan/memory/vktMemoryMappingTests.cpp b/external/vulkancts/modules/vulkan/memory/vktMemoryMappingTests.cpp index dcc91ce..9dc296d 100644 --- a/external/vulkancts/modules/vulkan/memory/vktMemoryMappingTests.cpp +++ b/external/vulkancts/modules/vulkan/memory/vktMemoryMappingTests.cpp @@ -290,7 +290,7 @@ size_t computeDeviceMemorySystemMemFootprint (const DeviceInterface& vk, VkDevic 1u, 0u, }; - const Unique memory (allocateMemory(vk, device, &allocInfo)); + const Unique memory (allocateMemory(vk, device, &allocInfo, callbackRecorder.getCallbacks())); AllocationCallbackValidationResults validateRes; validateAllocationCallbacks(callbackRecorder, &validateRes); -- 2.7.4