Google Git
Sign in
skia/external/github.com/GPUOpen-LibrariesAndSDKs/VulkanMemoryAllocator/f451b941585cfdc495d1ddb070a5784f4e4f43e1^!/.
commit
f451b941585cfdc495d1ddb070a5784f4e4f43e1
[log]
author
Adam Sawicki <adam.sawicki@amd.com>
Fri Jan 21 12:56:18 2022 +0100
committer
Adam Sawicki <adam.sawicki@amd.com>
Fri Jan 21 12:56:18 2022 +0100
tree
dfc4e495f38f06a062742380231565653d208ee1
parent
2ae5466b2ef5b2759fcd8bca8170d4de505c8302 [diff]
Fixed vmaBuildVirtualBlockStatsString, vmaFreeVirtualBlockStatsString to also be inside #if VMA_STATS_STRING_ENABLED

Updated copyright headers for to year 2022.

Change by @medranSolus

diff --git a/LICENSE.txt b/LICENSE.txt
index 71e824f..fcf8b67 100644
--- a/LICENSE.txt
+++ b/LICENSE.txt

@@ -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

diff --git a/include/vk_mem_alloc.h b/include/vk_mem_alloc.h
index 1e9ab87..1ef0609 100644
--- a/include/vk_mem_alloc.h
+++ b/include/vk_mem_alloc.h

@@ -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 @@
 @{

 */

 

+/** @} */

+

+/**

+\addtogroup group_alloc

+@{

+*/

+

 /**

 \brief Helps to find memoryTypeIndex, given memoryTypeBits and VmaAllocationCreateInfo.

 

@@ -2433,6 +2440,7 @@
 

 /** @} */

 

+#if VMA_STATS_STRING_ENABLED

 /**

 \addtogroup group_stats

 @{

@@ -2455,7 +2463,6 @@
     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 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 @@
 

     return allocator->DefragmentationPassBegin(pInfo, context);

 }

+

 VMA_CALL_PRE VkResult VMA_CALL_POST vmaEndDefragmentationPass(

     VmaAllocator allocator,

     VmaDefragmentationContext context)

@@ -17713,8 +17722,6 @@
     *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 @@
         VmaFreeString(virtualBlock->GetAllocationCallbacks(), pStatsString);

     }

 }

+#endif // VMA_STATS_STRING_ENABLED

 #endif // _VMA_PUBLIC_INTERFACE

 #endif // VMA_IMPLEMENTATION

 


diff --git a/src/Common.cpp b/src/Common.cpp
index b4bf54f..5f0bc50 100644
--- a/src/Common.cpp
+++ b/src/Common.cpp

@@ -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

diff --git a/src/Common.h b/src/Common.h
index 4e2a0dd..114e827 100644
--- a/src/Common.h
+++ b/src/Common.h

@@ -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

diff --git a/src/Shaders/Shader.frag b/src/Shaders/Shader.frag
index daf5888..2dc7cad 100644
--- a/src/Shaders/Shader.frag
+++ b/src/Shaders/Shader.frag

@@ -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

diff --git a/src/Shaders/Shader.vert b/src/Shaders/Shader.vert
index 7652943..b868a65 100644
--- a/src/Shaders/Shader.vert
+++ b/src/Shaders/Shader.vert

@@ -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

diff --git a/src/Shaders/SparseBindingTest.comp b/src/Shaders/SparseBindingTest.comp
index 1e7d63b..5f07316 100644
--- a/src/Shaders/SparseBindingTest.comp
+++ b/src/Shaders/SparseBindingTest.comp

@@ -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

diff --git a/src/SparseBindingTest.cpp b/src/SparseBindingTest.cpp
index 0430a1b..ed7cadf 100644
--- a/src/SparseBindingTest.cpp
+++ b/src/SparseBindingTest.cpp

@@ -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

diff --git a/src/SparseBindingTest.h b/src/SparseBindingTest.h
index 33dbd35..0f80f46 100644
--- a/src/SparseBindingTest.h
+++ b/src/SparseBindingTest.h

@@ -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

diff --git a/src/Tests.cpp b/src/Tests.cpp
index c937c71..fe943f1 100644
--- a/src/Tests.cpp
+++ b/src/Tests.cpp

@@ -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

diff --git a/src/Tests.h b/src/Tests.h
index 4b3cb87..8fe881a 100644
--- a/src/Tests.h
+++ b/src/Tests.h

@@ -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

diff --git a/src/VmaUsage.cpp b/src/VmaUsage.cpp
index b7f5498..d3b5d5d 100644
--- a/src/VmaUsage.cpp
+++ b/src/VmaUsage.cpp

@@ -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

diff --git a/src/VmaUsage.h b/src/VmaUsage.h
index 2e53c75..7a7d770 100644
--- a/src/VmaUsage.h
+++ b/src/VmaUsage.h

@@ -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 @@
 //#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

diff --git a/src/VulkanSample.cpp b/src/VulkanSample.cpp
index 59a63fa..caff8af 100644
--- a/src/VulkanSample.cpp
+++ b/src/VulkanSample.cpp

@@ -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

diff --git a/tools/VmaDumpVis/VmaDumpVis.py b/tools/VmaDumpVis/VmaDumpVis.py
index 1ab8190..03d658c 100644
--- a/tools/VmaDumpVis/VmaDumpVis.py
+++ b/tools/VmaDumpVis/VmaDumpVis.py

@@ -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