zdoom/gzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom.git synced 2024-12-01 16:32:17 +00:00
Code Issues Projects Releases Packages Wiki Activity

- fixed compilation of 32-bit Windows targets and MSVC 2015

Browse source
This commit is contained in:
alexey.lysiuk 2019-03-04 11:35:12 +02:00
parent 0e43979c28
commit 30c6ae5078
2 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/rendering/vulkan/shaders/vk_shader.h
View file

@ -1,6 +1,8 @@
#pragma once #pragma once
#include <memory>
#include "utility/vectors.h" #include "utility/vectors.h"
#include "r_data/matrix.h" #include "r_data/matrix.h"
#include "name.h" #include "name.h"

10
src/rendering/vulkan/system/vk_objects.h
View file

@ -73,7 +73,7 @@ public:
VulkanImage(VulkanDevice *device, VkImage image, VmaAllocation allocation, int width, int height, int mipLevels); VulkanImage(VulkanDevice *device, VkImage image, VmaAllocation allocation, int width, int height, int mipLevels);
~VulkanImage(); ~VulkanImage();
VkImage image = nullptr; VkImage image = VK_NULL_HANDLE;
int width = 0; int width = 0;
int height = 0; int height = 0;
int mipLevels = 1; int mipLevels = 1;
@ -95,7 +95,7 @@ public:
VulkanImageView(VulkanDevice *device, VkImageView view); VulkanImageView(VulkanDevice *device, VkImageView view);
~VulkanImageView(); ~VulkanImageView();
VkImageView view = nullptr; VkImageView view = VK_NULL_HANDLE;
private: private:
VulkanImageView(const VulkanImageView &) = delete; VulkanImageView(const VulkanImageView &) = delete;
@ -110,7 +110,7 @@ public:
VulkanSampler(VulkanDevice *device, VkSampler sampler); VulkanSampler(VulkanDevice *device, VkSampler sampler);
~VulkanSampler(); ~VulkanSampler();
VkSampler sampler = nullptr; VkSampler sampler = VK_NULL_HANDLE;
private: private:
VulkanSampler(const VulkanSampler &) = delete; VulkanSampler(const VulkanSampler &) = delete;
@ -125,7 +125,7 @@ public:
VulkanShader(VulkanDevice *device, VkShaderModule module); VulkanShader(VulkanDevice *device, VkShaderModule module);
~VulkanShader(); ~VulkanShader();
VkShaderModule module = nullptr; VkShaderModule module = VK_NULL_HANDLE;
private: private:
VulkanDevice *device = nullptr; VulkanDevice *device = nullptr;
@ -318,7 +318,7 @@ public:
std::unique_ptr<VulkanCommandBuffer> createBuffer(); std::unique_ptr<VulkanCommandBuffer> createBuffer();
VkCommandPool pool = nullptr; VkCommandPool pool = VK_NULL_HANDLE;
private: private:
VulkanDevice *device = nullptr; VulkanDevice *device = nullptr;