mirror/VulkanMemoryAllocator
1
0
Fork 0
mirror of https://github.com/GPUOpen-LibrariesAndSDKs/VulkanMemoryAllocator.git synced 2024-11-22 07:04:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed vmaBuildVirtualBlockStatsString, vmaFreeVirtualBlockStatsString to also be inside #if VMA_STATS_STRING_ENABLED

Browse Source 
Updated copyright headers for to year 2022.

Change by @medranSolus
This commit is contained in:
Adam Sawicki 2022-01-21 12:56:18 +01:00
parent 2ae5466b2e
commit f451b94158
15 changed files with 29 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
LICENSE.txt
View File

@ -1,4 +1,4 @@
Copyright (c) 2017-2021 Advanced Micro Devices, Inc. All rights reserved.
Copyright (c) 2017-2022 Advanced Micro Devices, Inc. All rights reserved.
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal

20
include/vk_mem_alloc.h
View File

@ -1,5 +1,5 @@
//
// Copyright (c) 2017-2021 Advanced Micro Devices, Inc. All rights reserved.
// Copyright (c) 2017-2022 Advanced Micro Devices, Inc. All rights reserved.
//
// Permission is hereby granted, free of charge, to any person obtaining a copy
// of this software and associated documentation files (the "Software"), to deal
@ -27,7 +27,7 @@
<b>Version 3.0.0-development</b>
Copyright (c) 2017-2021 Advanced Micro Devices, Inc. All rights reserved. \n
Copyright (c) 2017-2022 Advanced Micro Devices, Inc. All rights reserved. \n
License: MIT
<b>API documentation divided into groups:</b> [Modules](modules.html)
@ -1622,6 +1622,13 @@ VMA_CALL_PRE void VMA_CALL_POST vmaGetHeapBudgets(
@{
*/
/** @} */
/**
\addtogroup group_alloc
@{
*/
/**
\brief Helps to find memoryTypeIndex, given memoryTypeBits and VmaAllocationCreateInfo.
@ -2433,6 +2440,7 @@ VMA_CALL_PRE void VMA_CALL_POST vmaCalculateVirtualBlockStats(
/** @} */
#if VMA_STATS_STRING_ENABLED
/**
\addtogroup group_stats
@{
@ -2455,7 +2463,6 @@ VMA_CALL_PRE void VMA_CALL_POST vmaFreeVirtualBlockStatsString(
VmaVirtualBlock VMA_NOT_NULL virtualBlock,
char* VMA_NULLABLE pStatsString);
#if VMA_STATS_STRING_ENABLED
/** \brief Builds and returns statistics as a null-terminated string in JSON format.
\param allocator
\param[out] ppStatsString Must be freed using vmaFreeStatsString() function.
@ -2469,10 +2476,11 @@ VMA_CALL_PRE void VMA_CALL_POST vmaBuildStatsString(
VMA_CALL_PRE void VMA_CALL_POST vmaFreeStatsString(
VmaAllocator VMA_NOT_NULL allocator,
char* VMA_NULLABLE pStatsString);
#endif // VMA_STATS_STRING_ENABLED
/** @} */
#endif // VMA_STATS_STRING_ENABLED
#endif // _VMA_FUNCTION_HEADERS
#ifdef __cplusplus
@ -17197,6 +17205,7 @@ VMA_CALL_PRE VkResult VMA_CALL_POST vmaBeginDefragmentationPass(
return allocator->DefragmentationPassBegin(pInfo, context);
}
VMA_CALL_PRE VkResult VMA_CALL_POST vmaEndDefragmentationPass(
VmaAllocator allocator,
VmaDefragmentationContext context)
@ -17713,8 +17722,6 @@ VMA_CALL_PRE void VMA_CALL_POST vmaBuildVirtualBlockStatsString(VmaVirtualBlock
*ppStatsString = VmaCreateStringCopy(allocationCallbacks, sb.GetData(), sb.GetLength());
}
#endif // VMA_STATS_STRING_ENABLED
VMA_CALL_PRE void VMA_CALL_POST vmaFreeVirtualBlockStatsString(VmaVirtualBlock VMA_NOT_NULL virtualBlock,
char* VMA_NULLABLE pStatsString)
{
@ -17725,6 +17732,7 @@ VMA_CALL_PRE void VMA_CALL_POST vmaFreeVirtualBlockStatsString(VmaVirtualBlock V
VmaFreeString(virtualBlock->GetAllocationCallbacks(), pStatsString);
}
}
#endif // VMA_STATS_STRING_ENABLED
#endif // _VMA_PUBLIC_INTERFACE
#endif // VMA_IMPLEMENTATION

2
src/Common.cpp
View File

@ -1,5 +1,5 @@
//
// Copyright (c) 2017-2021 Advanced Micro Devices, Inc. All rights reserved.
// Copyright (c) 2017-2022 Advanced Micro Devices, Inc. All rights reserved.
//
// Permission is hereby granted, free of charge, to any person obtaining a copy
// of this software and associated documentation files (the "Software"), to deal

2
src/Common.h
View File

@ -1,5 +1,5 @@
//
// Copyright (c) 2017-2021 Advanced Micro Devices, Inc. All rights reserved.
// Copyright (c) 2017-2022 Advanced Micro Devices, Inc. All rights reserved.
//
// Permission is hereby granted, free of charge, to any person obtaining a copy
// of this software and associated documentation files (the "Software"), to deal

2
src/Shaders/Shader.frag
View File

@ -1,5 +1,5 @@
//
// Copyright (c) 2017-2021 Advanced Micro Devices, Inc. All rights reserved.
// Copyright (c) 2017-2022 Advanced Micro Devices, Inc. All rights reserved.
//
// Permission is hereby granted, free of charge, to any person obtaining a copy
// of this software and associated documentation files (the "Software"), to deal

2
src/Shaders/Shader.vert
View File

@ -1,5 +1,5 @@
//
// Copyright (c) 2017-2021 Advanced Micro Devices, Inc. All rights reserved.
// Copyright (c) 2017-2022 Advanced Micro Devices, Inc. All rights reserved.
//
// Permission is hereby granted, free of charge, to any person obtaining a copy
// of this software and associated documentation files (the "Software"), to deal

2
src/Shaders/SparseBindingTest.comp
View File

@ -1,5 +1,5 @@
//
// Copyright (c) 2018-2021 Advanced Micro Devices, Inc. All rights reserved.
// Copyright (c) 2018-2022 Advanced Micro Devices, Inc. All rights reserved.
//
// Permission is hereby granted, free of charge, to any person obtaining a copy
// of this software and associated documentation files (the "Software"), to deal

2
src/SparseBindingTest.cpp
View File

@ -1,5 +1,5 @@
//
// Copyright (c) 2017-2021 Advanced Micro Devices, Inc. All rights reserved.
// Copyright (c) 2017-2022 Advanced Micro Devices, Inc. All rights reserved.
//
// Permission is hereby granted, free of charge, to any person obtaining a copy
// of this software and associated documentation files (the "Software"), to deal

2
src/SparseBindingTest.h
View File

@ -1,5 +1,5 @@
//
// Copyright (c) 2017-2021 Advanced Micro Devices, Inc. All rights reserved.
// Copyright (c) 2017-2022 Advanced Micro Devices, Inc. All rights reserved.
//
// Permission is hereby granted, free of charge, to any person obtaining a copy
// of this software and associated documentation files (the "Software"), to deal

2
src/Tests.cpp
View File

@ -1,5 +1,5 @@
//
// Copyright (c) 2017-2021 Advanced Micro Devices, Inc. All rights reserved.
// Copyright (c) 2017-2022 Advanced Micro Devices, Inc. All rights reserved.
//
// Permission is hereby granted, free of charge, to any person obtaining a copy
// of this software and associated documentation files (the "Software"), to deal

2
src/Tests.h
View File

@ -1,5 +1,5 @@
//
// Copyright (c) 2017-2021 Advanced Micro Devices, Inc. All rights reserved.
// Copyright (c) 2017-2022 Advanced Micro Devices, Inc. All rights reserved.
//
// Permission is hereby granted, free of charge, to any person obtaining a copy
// of this software and associated documentation files (the "Software"), to deal

2
src/VmaUsage.cpp
View File

@ -1,5 +1,5 @@
//
// Copyright (c) 2017-2021 Advanced Micro Devices, Inc. All rights reserved.
// Copyright (c) 2017-2022 Advanced Micro Devices, Inc. All rights reserved.
//
// Permission is hereby granted, free of charge, to any person obtaining a copy
// of this software and associated documentation files (the "Software"), to deal

3
src/VmaUsage.h
View File

@ -1,5 +1,5 @@
//
// Copyright (c) 2017-2021 Advanced Micro Devices, Inc. All rights reserved.
// Copyright (c) 2017-2022 Advanced Micro Devices, Inc. All rights reserved.
//
// Permission is hereby granted, free of charge, to any person obtaining a copy
// of this software and associated documentation files (the "Software"), to deal
@ -56,6 +56,7 @@ include all public interface declarations. Example:
//#define VMA_DEBUG_MIN_BUFFER_IMAGE_GRANULARITY 256
//#define VMA_USE_STL_SHARED_MUTEX 0
//#define VMA_MEMORY_BUDGET 0
//#define VMA_STATS_STRING_ENABLED 0
#define VMA_VULKAN_VERSION 1002000 // Vulkan 1.2
//#define VMA_VULKAN_VERSION 1001000 // Vulkan 1.1

2
src/VulkanSample.cpp
View File

@ -1,5 +1,5 @@
//
// Copyright (c) 2017-2021 Advanced Micro Devices, Inc. All rights reserved.
// Copyright (c) 2017-2022 Advanced Micro Devices, Inc. All rights reserved.
//
// Permission is hereby granted, free of charge, to any person obtaining a copy
// of this software and associated documentation files (the "Software"), to deal

2
tools/VmaDumpVis/VmaDumpVis.py
View File

@ -1,5 +1,5 @@
#
# Copyright (c) 2018-2021 Advanced Micro Devices, Inc. All rights reserved.
# Copyright (c) 2018-2022 Advanced Micro Devices, Inc. All rights reserved.
#
# Permission is hereby granted, free of charge, to any person obtaining a copy
# of this software and associated documentation files (the "Software"), to deal