Permalink
Browse files

32-bit android buildfix attempt

  • Loading branch information...
hrydgard committed Oct 25, 2017
1 parent 07e8b4f commit ecad09d18f060102666483eede7854db52d9af18
Showing with 4 additions and 3 deletions.
  1. +4 −3 ext/native/thin3d/VulkanRenderManager.cpp
@@ -1,3 +1,4 @@
#include <cstdint>
#include "base/logging.h"
#include "Common/Vulkan/VulkanContext.h"
@@ -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) {
@@ -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) {
@@ -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) {

0 comments on commit ecad09d

Please sign in to comment.