Skip to content

Commit

Permalink
32-bit android buildfix attempt
Browse files Browse the repository at this point in the history
  • Loading branch information
hrydgard committed Oct 25, 2017
1 parent 0c10936 commit e07472f
Showing 1 changed file with 4 additions and 3 deletions.
7 changes: 4 additions & 3 deletions ext/native/thin3d/VulkanRenderManager.cpp
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
#include <cstdint>
#include "base/logging.h"

#include "Common/Vulkan/VulkanContext.h"
Expand Down Expand Up @@ -594,7 +595,7 @@ void VulkanRenderManager::CopyFramebuffer(VKRFramebuffer *src, VkRect2D srcRect,
std::unique_lock<std::mutex> lock(mutex_);
steps_.push_back(step);
curRenderStep_ = nullptr;
curFramebuffer_ = nullptr;
curFramebuffer_ = VK_NULL_HANDLE;
}

void VulkanRenderManager::BlitFramebuffer(VKRFramebuffer *src, VkRect2D srcRect, VKRFramebuffer *dst, VkRect2D dstRect, int aspectMask, VkFilter filter) {
Expand All @@ -620,7 +621,7 @@ void VulkanRenderManager::BlitFramebuffer(VKRFramebuffer *src, VkRect2D srcRect,
std::unique_lock<std::mutex> lock(mutex_);
steps_.push_back(step);
curRenderStep_ = nullptr;
curFramebuffer_ = nullptr;
curFramebuffer_ = VK_NULL_HANDLE;
}

VkImageView VulkanRenderManager::BindFramebufferAsTexture(VKRFramebuffer *fb, int binding, int aspectBit, int attachment) {
Expand All @@ -644,7 +645,7 @@ VkImageView VulkanRenderManager::BindFramebufferAsTexture(VKRFramebuffer *fb, in

void VulkanRenderManager::Flush() {
curRenderStep_ = nullptr;
curFramebuffer_ = nullptr;
curFramebuffer_ = VK_N;
int curFrame = vulkan_->GetCurFrame();
FrameData &frameData = frameData_[curFrame];
if (frameData.hasInitCommands) {
Expand Down

0 comments on commit e07472f

Please sign in to comment.