GeorgH93/OpenVulkano
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Move Drawable draw call recording logic out of renderer

Browse Source
This commit is contained in:
GeorgH93
2021-08-01 00:37:11 +02:00
parent 8d370c9860
commit 87dad42c79
14 changed files with 251 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
openVulkanoCpp/Vulkan/Renderer.cpp
View File

@@ -5,6 +5,7 @@
*/
#include "Renderer.hpp"
#include "VulkanDrawContext.hpp"
#include "Scene/Shader.hpp"
#include "Scene/Geometry.hpp"
#include "Scene/VulkanGeometry.hpp"
@@ -154,27 +155,11 @@ namespace openVulkanoCpp::Vulkan
shader->Record(cmdHelper->cmdBuffer, currentImageId);
Scene::Drawable** drawablePointer;
VulkanDrawContext drawContext { poolId, currentImageId, cmdHelper->cmdBuffer, this };
while((drawablePointer = jobQueue->Pop()) != nullptr)
{
Scene::Drawable* drawable = *drawablePointer;
Scene::Geometry* mesh = drawable->mesh;
VulkanGeometry* renderGeo = dynamic_cast<VulkanGeometry*>(mesh->renderGeo);
if (mesh != lastGeo)
{
if (!mesh->renderGeo) renderGeo = resourceManager.PrepareGeometry(mesh);
renderGeo->RecordBind(cmdHelper->cmdBuffer);
lastGeo = mesh;
}
for(Scene::Node* node : drawable->nodes)
{
if (node != lastNode)
{
if (!node->renderNode) resourceManager.PrepareNode(node);
dynamic_cast<VulkanNode*>(node->renderNode)->Record(cmdHelper->cmdBuffer, currentImageId);
lastNode = node;
}
renderGeo->RecordDraw(cmdHelper->cmdBuffer);
}
drawable->GetEncoder().vulkan(drawable, &drawContext);
}
cmdHelper->cmdBuffer.end();
}

2
openVulkanoCpp/Vulkan/Renderer.hpp
View File

@@ -74,5 +74,7 @@ namespace openVulkanoCpp::Vulkan
void Render();
void RecordSecondaryBuffer(Data::ReadOnlyAtomicArrayQueue<Scene::Drawable*>* jobQueue, uint32_t poolId);
ResourceManager& GetResourceManager() { return resourceManager; }
};
}

34
openVulkanoCpp/Vulkan/Scene/SimpleDrawableVulkanEncoder.cpp Normal file
View File

@@ -0,0 +1,34 @@
/*
* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at https://mozilla.org/MPL/2.0/.
*/
#include "Scene/SimpleDrawable.hpp"
#include "VulkanGeometry.hpp"
#include "VulkanNode.hpp"
#include "Vulkan/VulkanDrawContext.hpp"
using namespace openVulkanoCpp::Scene;
namespace openVulkanoCpp::Vulkan
{
void EncodeSimpleDrawable(Drawable* instance, Vulkan::VulkanDrawContext* drawContext)
{
Geometry* mesh = dynamic_cast<SimpleDrawable*>(instance)->GetMesh();
VulkanGeometry* renderGeo = dynamic_cast<VulkanGeometry*>(mesh->renderGeo);
if (!mesh->renderGeo) renderGeo = drawContext->renderer->GetResourceManager().PrepareGeometry(mesh);
renderGeo->RecordBind(drawContext->commandBuffer);
for(Node* node : instance->GetNodes())
{
if (!node->renderNode) drawContext->renderer->GetResourceManager().PrepareNode(node);
dynamic_cast<VulkanNode*>(node->renderNode)->Record(drawContext->commandBuffer, drawContext->currentImageId);
renderGeo->RecordDraw(drawContext->commandBuffer);
}
}
}
namespace
{
void* simpleDrawableVulkanEncoderReg = DrawEncoder::RegisterVulkanEncodeFunction<SimpleDrawable>(&openVulkanoCpp::Vulkan::EncodeSimpleDrawable);
}

1
openVulkanoCpp/Vulkan/Scene/VulkanGeometry.hpp
View File

@@ -9,6 +9,7 @@
#include "IRecordable.hpp"
#include "Scene/Scene.hpp"
#include "Scene/Geometry.hpp"
#include "Vulkan/Resources/ManagedResource.hpp"
namespace openVulkanoCpp::Vulkan
{

19
openVulkanoCpp/Vulkan/VulkanDrawContext.hpp Normal file
View File

@@ -0,0 +1,19 @@
/*
* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at https://mozilla.org/MPL/2.0/.
*/
#include "Renderer.hpp"
namespace openVulkanoCpp::Vulkan
{
class VulkanDrawContext
{
public:
size_t encoderThreadId;
size_t currentImageId;
vk::CommandBuffer& commandBuffer;
Renderer* renderer;
};
}