commit 86ccd63a98e24fc1ed96bfcda45e81154a3c0bcc
author Adam Sawicki <adam.sawicki@amd.com> Tue Jul 04 14:57:53 2017 +0200
committer Adam Sawicki <adam.sawicki@amd.com> Tue Jul 04 14:57:53 2017 +0200
tree c1ab3af5987dfc19c642d9c1f33af570a91e3cf2
parent b2c2d3bd0b8390ca41800ad1a166e0ebe8531b0a

Enabled warning level 4 in Visual Studio for compilation of vk_mem_alloc.h.

src/VulkanSample.cpp

diff --git a/src/VulkanSample.cpp b/src/VulkanSample.cpp
index 7c7fb22..4687943 100644
--- a/src/VulkanSample.cpp
+++ b/src/VulkanSample.cpp
@@ -27,8 +27,11 @@
 #define VK_USE_PLATFORM_WIN32_KHR

 #include <vulkan/vulkan.h>

 

+#pragma warning(push, 4)

+#pragma warning(disable: 4127) // warning C4127: conditional expression is constant

 #define VMA_IMPLEMENTATION

 #include "vk_mem_alloc.h"

+#pragma warning(pop)

 

 #define MATHFU_COMPILE_WITHOUT_SIMD_SUPPORT

 #include <mathfu/glsl_mappings.h>

@@ -1707,7 +1710,7 @@
     RECT rect = { 0, 0, g_SizeX, g_SizeY };

     AdjustWindowRectEx(&rect, style, FALSE, exStyle);

 

-    HWND hWnd = CreateWindowEx(

+    CreateWindowEx(

         exStyle, WINDOW_CLASS_NAME, APP_TITLE_W, style,

         CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT,

         NULL, NULL, g_hAppInstance, NULL);