From 30c6ae50782f86d32bf6a76f94c607c4bb959d9e Mon Sep 17 00:00:00 2001
From: "alexey.lysiuk" <alexey.lysiuk@gmail.com>
Date: Mon, 4 Mar 2019 11:35:12 +0200
Subject: [PATCH] - fixed compilation of 32-bit Windows targets and MSVC 2015

---
 src/rendering/vulkan/shaders/vk_shader.h |  2 ++
 src/rendering/vulkan/system/vk_objects.h | 10 +++++-----
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/rendering/vulkan/shaders/vk_shader.h b/src/rendering/vulkan/shaders/vk_shader.h
index 7e1ef8333..174e6d115 100644
--- a/src/rendering/vulkan/shaders/vk_shader.h
+++ b/src/rendering/vulkan/shaders/vk_shader.h
@@ -1,6 +1,8 @@
 
 #pragma once
 
+#include <memory>
+
 #include "utility/vectors.h"
 #include "r_data/matrix.h"
 #include "name.h"
diff --git a/src/rendering/vulkan/system/vk_objects.h b/src/rendering/vulkan/system/vk_objects.h
index 095b04aee..b5de0c748 100644
--- a/src/rendering/vulkan/system/vk_objects.h
+++ b/src/rendering/vulkan/system/vk_objects.h
@@ -73,7 +73,7 @@ public:
 	VulkanImage(VulkanDevice *device, VkImage image, VmaAllocation allocation, int width, int height, int mipLevels);
 	~VulkanImage();
 
-	VkImage image = nullptr;
+	VkImage image = VK_NULL_HANDLE;
 	int width = 0;
 	int height = 0;
 	int mipLevels = 1;
@@ -95,7 +95,7 @@ public:
 	VulkanImageView(VulkanDevice *device, VkImageView view);
 	~VulkanImageView();
 
-	VkImageView view = nullptr;
+	VkImageView view = VK_NULL_HANDLE;
 
 private:
 	VulkanImageView(const VulkanImageView &) = delete;
@@ -110,7 +110,7 @@ public:
 	VulkanSampler(VulkanDevice *device, VkSampler sampler);
 	~VulkanSampler();
 
-	VkSampler sampler = nullptr;
+	VkSampler sampler = VK_NULL_HANDLE;
 
 private:
 	VulkanSampler(const VulkanSampler &) = delete;
@@ -125,7 +125,7 @@ public:
 	VulkanShader(VulkanDevice *device, VkShaderModule module);
 	~VulkanShader();
 
-	VkShaderModule module = nullptr;
+	VkShaderModule module = VK_NULL_HANDLE;
 
 private:
 	VulkanDevice *device = nullptr;
@@ -318,7 +318,7 @@ public:
 
 	std::unique_ptr<VulkanCommandBuffer> createBuffer();
 
-	VkCommandPool pool = nullptr;
+	VkCommandPool pool = VK_NULL_HANDLE;
 
 private:
 	VulkanDevice *device = nullptr;