Index: ps/trunk/source/renderer/backend/vulkan/VMA.h =================================================================== --- ps/trunk/source/renderer/backend/vulkan/VMA.h (revision 27449) +++ ps/trunk/source/renderer/backend/vulkan/VMA.h (revision 27450) @@ -1,80 +1,83 @@ /* Copyright (C) 2023 Wildfire Games. * This file is part of 0 A.D. * * 0 A.D. is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 2 of the License, or * (at your option) any later version. * * 0 A.D. is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License * along with 0 A.D. If not, see . */ #ifndef INCLUDED_RENDERER_BACKEND_VULKAN_VMA #define INCLUDED_RENDERER_BACKEND_VULKAN_VMA #include "lib/debug.h" #include "lib/sysdep/os.h" #include "ps/CLogger.h" #include #include #define VMA_VULKAN_VERSION 1000000 #define VMA_ASSERT(EXPR) ASSERT(EXPR) #define VMA_HEAVY_ASSERT(EXPR) ENSURE(EXPR) #define VMA_DYNAMIC_VULKAN_FUNCTIONS 0 #define VMA_STATIC_VULKAN_FUNCTIONS 0 #define VMA_BUFFER_DEVICE_ADDRESS 0 #ifndef NDEBUG #define VMA_DEBUG_LOG(...) debug_printf(__VA_ARGS__) #define VMA_STATS_STRING_ENABLED 1 #else #define VMA_DEBUG_LOG(...) #define VMA_STATS_STRING_ENABLED 0 #endif #if OS_WIN // MSVC doesn't enable std::shared_mutex for XP toolkit. #define VMA_USE_STL_SHARED_MUTEX 0 #endif #if GCC_VERSION #pragma GCC diagnostic push #pragma GCC diagnostic ignored "-Wformat" +#pragma GCC diagnostic ignored "-Wimplicit-fallthrough" #pragma GCC diagnostic ignored "-Wundef" #pragma GCC diagnostic ignored "-Wunused-parameter" #pragma GCC diagnostic ignored "-Wunused-variable" #endif #if CLANG_VERSION #pragma clang diagnostic push #pragma clang diagnostic ignored "-Wformat" #pragma clang diagnostic ignored "-Wnullability-completeness" #pragma clang diagnostic ignored "-Wundef" #pragma clang diagnostic ignored "-Wunused-parameter" #pragma clang diagnostic ignored "-Wunused-variable" #endif #if MSC_VERSION #pragma warning(push, 1) -#pragma warning(disable: 4100) +#pragma warning(disable: 4100) // Unreferenced formal parameter. +#pragma warning(disable: 4701) // Potentially uninitialized local variable used. +#pragma warning(disable: 4703) // Potentially uninitialized local pointer variable used. #endif #include "third_party/vma/vk_mem_alloc.h" #if GCC_VERSION #pragma GCC diagnostic pop #endif #if CLANG_VERSION #pragma clang diagnostic pop #endif #if MSC_VERSION #pragma warning(pop) #endif #endif // INCLUDED_RENDERER_BACKEND_VULKAN_VMA