Merge pull request #37492 from akien-mga/warnings-clang-displayserverwindows

Fix Clang warnings on Windows
This commit is contained in:
Rémi Verschelde
2020-04-01 17:12:58 +02:00
committed by GitHub
7 changed files with 19 additions and 10 deletions
+2
View File
@@ -574,6 +574,8 @@ Files extracted from upstream source:
`vk_enum_string_helper.h` is taken from the matching `Vulkan-ValidationLayers`
SDK release: https://github.com/KhronosGroup/Vulkan-ValidationLayers/blob/master/layers/generated/vk_enum_string_helper.h
Includes custom change to disable MSVC pragma, might be upstreamed via:
https://github.com/KhronosGroup/Vulkan-ValidationLayers/pull/1666
`vk_mem_alloc.h` is taken from https://github.com/GPUOpen-LibrariesAndSDKs/VulkanMemoryAllocator
Version: 2.3.0
+1 -1
View File
@@ -31,7 +31,7 @@
#pragma once
#ifdef _WIN32
#ifdef _MSC_VER
#pragma warning( disable : 4065 )
#endif