Skip to content

Commit 0637a74

Browse files
committed
tests: Fix Test ICD regressions
1 parent e700c4e commit 0637a74

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

tests/icd/test_icd.cpp

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -556,11 +556,7 @@ static VKAPI_ATTR void VKAPI_CALL DestroyDevice(VkDevice device, const VkAllocat
556556
// Vulkan SC does not support vkFreeMemory therefore all mapped memory is implicitly unmapped during device destruction
557557
for (auto it : mapped_memory_map) {
558558
for (auto map_addr : it.second) {
559-
#if defined(_WIN32)
560-
_aligned_free(map_addr);
561-
#else
562-
free(map_addr);
563-
#endif
559+
::operator delete(map_addr, std::align_val_t(memory_alignment));
564560
}
565561
}
566562
mapped_memory_map.clear();
@@ -904,6 +900,7 @@ static VKAPI_ATTR void VKAPI_CALL GetImageMemoryRequirements2(VkDevice device, c
904900
GetImageMemoryRequirements(device, pInfo->image, &pMemoryRequirements->memoryRequirements);
905901
}
906902

903+
#ifndef VULKANSC // Vulkan SC does not support VK_ARM_tensors
907904
static VKAPI_ATTR void VKAPI_CALL GetTensorMemoryRequirementsARM(VkDevice device, const VkTensorMemoryRequirementsInfoARM* pInfo,
908905
VkMemoryRequirements2* pMemoryRequirements)
909906
{
@@ -937,6 +934,7 @@ static VKAPI_ATTR void VKAPI_CALL GetDataGraphPipelineSessionMemoryRequirementsA
937934
// 3 is arbitrary, any value in [0,5] is acceptable, see GetPhysicalDeviceMemoryProperties.
938935
memReq.memoryTypeBits = 0xFFFF & ~(0x1 << 3);
939936
}
937+
#endif // VULKANSC
940938

941939
static VKAPI_ATTR void VKAPI_CALL GetBufferMemoryRequirements2(VkDevice device, const VkBufferMemoryRequirementsInfo2* pInfo,
942940
VkMemoryRequirements2* pMemoryRequirements) {
@@ -1513,6 +1511,7 @@ static VKAPI_ATTR void VKAPI_CALL GetPhysicalDeviceFormatProperties2(VkPhysicalD
15131511
}
15141512
}
15151513

1514+
#ifndef VULKANSC // Vulkan SC does not support VK_ARM_tensors
15161515
static VKAPI_ATTR void VKAPI_CALL GetPhysicalDeviceExternalTensorPropertiesARM(
15171516
VkPhysicalDevice physicalDevice, const VkPhysicalDeviceExternalTensorInfoARM* pExternalTensorInfo,
15181517
VkExternalTensorPropertiesARM* pExternalTensorProperties) {
@@ -1534,6 +1533,7 @@ static VKAPI_ATTR void VKAPI_CALL GetPhysicalDeviceExternalTensorPropertiesARM(
15341533
pExternalTensorProperties->externalMemoryProperties.compatibleHandleTypes = 0;
15351534
}
15361535
}
1536+
#endif // VULKANSC
15371537

15381538
static VKAPI_ATTR VkResult VKAPI_CALL
15391539
GetPhysicalDeviceImageFormatProperties2(VkPhysicalDevice physicalDevice, const VkPhysicalDeviceImageFormatInfo2* pImageFormatInfo,

0 commit comments

Comments
 (0)