Dynamitos/Seele
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Hopefully fixing models

Browse Source
This commit is contained in:
Dynamitos
2020-10-31 00:04:23 +01:00
parent 41710220ec
commit 799ba20d49
3 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Engine/Graphics/GraphicsEnums.h
+1 -1
View File
@@ -150,7 +150,7 @@ typedef uint32 KeyModifierFlags;
namespace Gfx namespace Gfx
{ {
static constexpr bool useAsyncCompute = true; static constexpr bool useAsyncCompute = true;
static constexpr bool waitIdleOnSubmit = true; static constexpr bool waitIdleOnSubmit = false;
static constexpr uint32 numFramesBuffered = 3; static constexpr uint32 numFramesBuffered = 3;
static uint32 currentFrameIndex = 0; static uint32 currentFrameIndex = 0;
src/Engine/Graphics/Vulkan/VulkanAllocator.cpp
+2 -2
View File
@@ -292,13 +292,13 @@ PStagingBuffer StagingManager::allocateStagingBuffer(uint32 size, VkBufferUsageF
auto freeBuffer = *it; auto freeBuffer = *it;
if (freeBuffer->getSize() == size && freeBuffer->isReadable() == bCPURead && freeBuffer->usage == usage) if (freeBuffer->getSize() == size && freeBuffer->isReadable() == bCPURead && freeBuffer->usage == usage)
{ {
std::cout << "Reusing staging buffer" << std::endl; //std::cout << "Reusing staging buffer" << std::endl;
activeBuffers.add(freeBuffer.getHandle()); activeBuffers.add(freeBuffer.getHandle());
freeBuffers.remove(it, false); freeBuffers.remove(it, false);
return freeBuffer; return freeBuffer;
} }
} }
std::cout << "Creating new stagingbuffer" << std::endl; //std::cout << "Creating new stagingbuffer" << std::endl;
PStagingBuffer stagingBuffer = new StagingBuffer(); PStagingBuffer stagingBuffer = new StagingBuffer();
VkBufferCreateInfo stagingBufferCreateInfo = init::BufferCreateInfo(usage, size); VkBufferCreateInfo stagingBufferCreateInfo = init::BufferCreateInfo(usage, size);
stagingBufferCreateInfo.sharingMode = VK_SHARING_MODE_EXCLUSIVE; stagingBufferCreateInfo.sharingMode = VK_SHARING_MODE_EXCLUSIVE;
src/Engine/Graphics/Vulkan/VulkanBuffer.cpp
+1
View File
@@ -234,6 +234,7 @@ void ShaderBuffer::unlock()
std::memset(&region, 0, sizeof(VkBufferCopy)); std::memset(&region, 0, sizeof(VkBufferCopy));
region.size = size; region.size = size;
vkCmdCopyBuffer(cmdHandle, stagingBuffer->getHandle(), buffers[currentBuffer].buffer, 1, &region); vkCmdCopyBuffer(cmdHandle, stagingBuffer->getHandle(), buffers[currentBuffer].buffer, 1, &region);
graphics->getQueueCommands(currentOwner)->submitCommands();
} }
//requestOwnershipTransfer(pending.prevQueue); //requestOwnershipTransfer(pending.prevQueue);
graphics->getStagingManager()->releaseStagingBuffer(pending.stagingBuffer); graphics->getStagingManager()->releaseStagingBuffer(pending.stagingBuffer);