commit 390319b2b37dc768de14054e4041b78f11d4a006
author Tony-LunarG <tony@lunarg.com> Mon Mar 18 15:54:16 2019 -0600
committer Tony Barbour <tony@lunarg.com> Thu Mar 28 15:49:08 2019 -0600
tree 674f35665160cb4396bc9c8a32b690d968658bcb
parent 7b7e4e636a542d5b5de82d2308bc87eae97c52d6

gpu: Suppress warnings in VMA

Change-Id: I3996ca4f0b71a8706f3f2d80af0907e6355d0d9a

layers/vk_mem_alloc.h

diff --git a/layers/vk_mem_alloc.h b/layers/vk_mem_alloc.h
index a2f7a1b..adda3a8 100644
--- a/layers/vk_mem_alloc.h
+++ b/layers/vk_mem_alloc.h
@@ -20,6 +20,15 @@
 // THE SOFTWARE.
 //
 
+
+//
+// Source: https://github.com/GPUOpen-LibrariesAndSDKs/VulkanMemoryAllocator
+// THIS FILE HAS BEEN CHANGED FROM THE ORIGINAL VERSION
+//
+// Change Log:
+//    3/27/19 - Make changes to suppress warnings from GCC
+//
+
 #ifndef AMD_VULKAN_MEMORY_ALLOCATOR_H
 #define AMD_VULKAN_MEMORY_ALLOCATOR_H
 
@@ -3426,6 +3435,14 @@
 END OF CONFIGURATION
 */
 
+#if defined(__GNUC__)
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wtype-limits"
+#pragma GCC diagnostic ignored "-Wunused-variable"
+#if defined(ANDROID)
+#pragma GCC diagnostic ignored "-Wunused-private-field"
+#endif
+#endif
 static const uint32_t VMA_ALLOCATION_INTERNAL_STRATEGY_MIN_OFFSET = 0x10000000u;
 
 static VkAllocationCallbacks VmaEmptyAllocationCallbacks = {
@@ -12437,8 +12454,8 @@
     uint32_t currentFrameIndex,
     bool overlappingMoveSupported) :
     VmaDefragmentationAlgorithm(hAllocator, pBlockVector, currentFrameIndex),
-    m_AllAllocations(false),
     m_AllocationCount(0),
+    m_AllAllocations(false),
     m_BytesMoved(0),
     m_AllocationsMoved(0),
     m_Blocks(VmaStlAllocator<BlockInfo*>(hAllocator->GetAllocationCallbacks()))
@@ -14341,7 +14358,7 @@
 #endif // #if VMA_DEDICATED_ALLOCATION
 
     size_t allocIndex;
-    VkResult res;
+    VkResult res = VK_SUCCESS;
     for(allocIndex = 0; allocIndex < allocationCount; ++allocIndex)
     {
         res = AllocateDedicatedMemoryPage(
@@ -16759,5 +16776,7 @@
             &allocation);
     }
 }
-
+#if defined(__GNUC__)
+#pragma GCC diagnostic pop
+#endif
 #endif // #ifdef VMA_IMPLEMENTATION