From 8d46fc374639348bdc16e33809e98e27a8a629df Mon Sep 17 00:00:00 2001 From: turanszkij Date: Fri, 1 Jun 2018 16:33:14 +0100 Subject: [PATCH] 32-bit build fixup --- WickedEngine/wiGraphicsDevice_Vulkan.cpp | 6 +++--- WickedEngine/wiGraphicsDevice_Vulkan.h | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/WickedEngine/wiGraphicsDevice_Vulkan.cpp b/WickedEngine/wiGraphicsDevice_Vulkan.cpp index 5a0ac95d8..986500349 100644 --- a/WickedEngine/wiGraphicsDevice_Vulkan.cpp +++ b/WickedEngine/wiGraphicsDevice_Vulkan.cpp @@ -1328,8 +1328,8 @@ namespace wiGraphicsTypes activeRTHash = 0; pDesc = nullptr; - overrideRenderPass = nullptr; - overrideFramebuffer = nullptr; + overrideRenderPass = VK_NULL_HANDLE; + overrideFramebuffer = VK_NULL_HANDLE; clearRequests.clear(); } @@ -1370,7 +1370,7 @@ namespace wiGraphicsTypes VkRenderPass renderPass = overrideRenderPass; VkFramebuffer frameBuffer = overrideFramebuffer; - if (renderPass == nullptr || frameBuffer == nullptr) + if (renderPass == VK_NULL_HANDLE || frameBuffer == VK_NULL_HANDLE) { assert(pDesc != nullptr); diff --git a/WickedEngine/wiGraphicsDevice_Vulkan.h b/WickedEngine/wiGraphicsDevice_Vulkan.h index 3bd3a59c2..ced9ce37d 100644 --- a/WickedEngine/wiGraphicsDevice_Vulkan.h +++ b/WickedEngine/wiGraphicsDevice_Vulkan.h @@ -90,8 +90,8 @@ namespace wiGraphicsTypes uint64_t activeRTHash = 0; GraphicsPSODesc* pDesc = nullptr; - VkRenderPass overrideRenderPass = nullptr; - VkFramebuffer overrideFramebuffer = nullptr; + VkRenderPass overrideRenderPass = VK_NULL_HANDLE; + VkFramebuffer overrideFramebuffer = VK_NULL_HANDLE; struct ClearRequest {