More threadpool bs

src/Engine/Graphics/RenderPass/BasePass.cpp

@@ -67,16 +67,6 @@ Job BasePassMeshProcessor::processMeshBatch(
     co_return;
 }
 
-Array<Gfx::PRenderCommand> BasePassMeshProcessor::getRenderCommands() 
-{
-    return renderCommands;
-}
-
-void BasePassMeshProcessor::clearCommands()
-{
-    renderCommands.clear();
-}
-
 BasePass::BasePass(Gfx::PGraphics graphics, Gfx::PViewport viewport, PCameraActor source) 
     : RenderPass(graphics, viewport)
     , processor(new BasePassMeshProcessor(viewport, graphics, false))
@@ -122,7 +112,7 @@ BasePass::~BasePass()
 {   
 }
 
-Job BasePass::beginFrame() 
+void BasePass::beginFrame() 
 {
     processor->clearCommands();
     primitiveLayout->reset();
@@ -142,10 +132,9 @@ Job BasePass::beginFrame()
     descriptorSets[INDEX_VIEW_PARAMS] = viewLayout->allocateDescriptorSet();
     descriptorSets[INDEX_VIEW_PARAMS]->updateBuffer(0, viewParamBuffer);
     descriptorSets[INDEX_VIEW_PARAMS]->writeChanges();
-    co_return;
 }
 
-Job BasePass::render() 
+MainJob BasePass::render() 
 {
     oLightIndexList->pipelineBarrier( 
 		Gfx::SE_ACCESS_SHADER_WRITE_BIT, Gfx::SE_PIPELINE_STAGE_COMPUTE_SHADER_BIT,
@@ -167,18 +156,13 @@ Job BasePass::render()
     {
         jobs.add(processor->processMeshBatch(meshBatch, renderPass, basePassLayout, primitiveLayout, descriptorSets));
     }
-    for(auto& job : jobs)
-    {
-        co_await job;
-    }
+    co_await Job::all(jobs);
     graphics->executeCommands(processor->getRenderCommands());
     graphics->endRenderPass();
-    co_return;
 }
 
-Job BasePass::endFrame() 
+void BasePass::endFrame() 
 {
-    co_return;
 }
 
 void BasePass::publishOutputs() 

src/Engine/Graphics/RenderPass/BasePass.h

@@ -19,10 +19,7 @@ public:
         Gfx::PDescriptorLayout primitiveLayout,
         Array<Gfx::PDescriptorSet> descriptorSets,
         int32 staticMeshId = -1) override;
-    Array<Gfx::PRenderCommand> getRenderCommands();
-    void clearCommands();
 private:
-    Array<Gfx::PRenderCommand> renderCommands;
     //Array<Gfx::PDescriptorSet> cachedPrimitiveSets;
     Gfx::PViewport target;
     uint8 translucentBasePass;
@@ -40,9 +37,9 @@ class BasePass : public RenderPass<BasePassData>
 public:
     BasePass(Gfx::PGraphics graphics, Gfx::PViewport viewport, PCameraActor source);
     virtual ~BasePass();
-    virtual Job beginFrame() override;
-    virtual Job render() override;
-    virtual Job endFrame() override;
+    virtual void beginFrame() override;
+    virtual MainJob render() override;
+    virtual void endFrame() override;
     virtual void publishOutputs() override;
     virtual void createRenderPass() override;
     static void modifyRenderPassMacros(Map<const char*, const char*>& defines);

src/Engine/Graphics/RenderPass/DepthPrepass.cpp

@@ -64,18 +64,6 @@ Job DepthPrepassMeshProcessor::processMeshBatch(
     co_return;
 }
 
-Array<Gfx::PRenderCommand> DepthPrepassMeshProcessor::getRenderCommands() 
-{
-    return renderCommands;
-}
-
-void DepthPrepassMeshProcessor::clearCommands()
-{
-    renderCommands.clear();
-    //cachedPrimitiveSets.clear();
-    //cachedPrimitiveIndex = 0;
-}
-
 DepthPrepass::DepthPrepass(Gfx::PGraphics graphics, Gfx::PViewport viewport, PCameraActor source) 
     : RenderPass(graphics, viewport)
     , processor(new DepthPrepassMeshProcessor(viewport, graphics))
@@ -105,7 +93,7 @@ DepthPrepass::~DepthPrepass()
 {   
 }
 
-Job DepthPrepass::beginFrame() 
+void DepthPrepass::beginFrame() 
 {
     processor->clearCommands();
     primitiveLayout->reset();
@@ -123,10 +111,9 @@ Job DepthPrepass::beginFrame()
     descriptorSets[INDEX_VIEW_PARAMS] = viewLayout->allocateDescriptorSet();
     descriptorSets[INDEX_VIEW_PARAMS]->updateBuffer(0, viewParamBuffer);
     descriptorSets[INDEX_VIEW_PARAMS]->writeChanges();
-    co_return;
 }
 
-Job DepthPrepass::render() 
+MainJob DepthPrepass::render() 
 {
     depthAttachment->getTexture()->pipelineBarrier(
         Gfx::SE_ACCESS_SHADER_READ_BIT, Gfx::SE_PIPELINE_STAGE_COMPUTE_SHADER_BIT,
@@ -138,18 +125,13 @@ Job DepthPrepass::render()
     {
         jobs.add(processor->processMeshBatch(meshBatch, renderPass, depthPrepassLayout, primitiveLayout, descriptorSets));
     }
-    for(auto& job : jobs)
-    {
-        co_await job;
-    }
+    co_await Job::all(jobs);
     graphics->executeCommands(processor->getRenderCommands());
     graphics->endRenderPass();
-    co_return;
 }
 
-Job DepthPrepass::endFrame() 
+void DepthPrepass::endFrame() 
 {
-    co_return;
 }
 
 void DepthPrepass::publishOutputs() 

src/Engine/Graphics/RenderPass/DepthPrepass.h

@@ -19,10 +19,7 @@ public:
         Array<Gfx::PDescriptorSet> descriptorSets,
         int32 staticMeshId = -1) override;
 
-    Array<Gfx::PRenderCommand> getRenderCommands();
-    void clearCommands();
 private:
-    Array<Gfx::PRenderCommand> renderCommands;
     //Array<Gfx::PDescriptorSet> cachedPrimitiveSets;
     Gfx::PViewport target;
     //uint32 cachedPrimitiveIndex;
@@ -39,9 +36,9 @@ class DepthPrepass : public RenderPass<DepthPrepassData>
 public:
     DepthPrepass(Gfx::PGraphics graphics, Gfx::PViewport viewport, PCameraActor source);
     ~DepthPrepass();
-    virtual Job beginFrame() override;
-    virtual Job render() override;
-    virtual Job endFrame() override;
+    virtual void beginFrame() override;
+    virtual MainJob render() override;
+    virtual void endFrame() override;
     virtual void publishOutputs() override;
     virtual void createRenderPass() override;
     static void modifyRenderPassMacros(Map<const char*, const char*>& defines);

src/Engine/Graphics/RenderPass/LightCullingPass.cpp

@@ -18,10 +18,10 @@ LightCullingPass::~LightCullingPass()
     
 }
 
-Job LightCullingPass::beginFrame() 
+void LightCullingPass::beginFrame() 
 {
     uint32_t viewportWidth = viewport->getSizeX();
-	uint32_t viewportHeight = viewport->getSizeY();
+    uint32_t viewportHeight = viewport->getSizeY();
 
     BulkResourceData uniformUpdate;
     viewParams.viewMatrix = source->getViewMatrix();
@@ -32,211 +32,209 @@ Job LightCullingPass::beginFrame()
     uniformUpdate.size = sizeof(ViewParameter);
     uniformUpdate.data = (uint8*)&viewParams;
     viewParamsBuffer->updateContents(uniformUpdate);
-	
-	const LightEnv& lightEnv = passData.lightEnv;
-	uniformUpdate.size = sizeof(DirectionalLight) * MAX_DIRECTIONAL_LIGHTS;
-	uniformUpdate.data = (uint8*)&lightEnv.directionalLights;
-	directLightBuffer->updateContents(uniformUpdate);
-	uniformUpdate.size = sizeof(PointLight) * MAX_POINT_LIGHTS;
-	uniformUpdate.data = (uint8*)&lightEnv.pointLights;
-	pointLightBuffer->updateContents(uniformUpdate);
-	
-	uniformUpdate.size = sizeof(uint32);
-	uniformUpdate.data = (uint8*)&lightEnv.numDirectionalLights;
-	numDirLightBuffer->updateContents(uniformUpdate);
-	uniformUpdate.data = (uint8*)&lightEnv.numPointLights;
-	numPointLightBuffer->updateContents(uniformUpdate);
+    
+    const LightEnv& lightEnv = passData.lightEnv;
+    uniformUpdate.size = sizeof(DirectionalLight) * MAX_DIRECTIONAL_LIGHTS;
+    uniformUpdate.data = (uint8*)&lightEnv.directionalLights;
+    directLightBuffer->updateContents(uniformUpdate);
+    uniformUpdate.size = sizeof(PointLight) * MAX_POINT_LIGHTS;
+    uniformUpdate.data = (uint8*)&lightEnv.pointLights;
+    pointLightBuffer->updateContents(uniformUpdate);
+    
+    uniformUpdate.size = sizeof(uint32);
+    uniformUpdate.data = (uint8*)&lightEnv.numDirectionalLights;
+    numDirLightBuffer->updateContents(uniformUpdate);
+    uniformUpdate.data = (uint8*)&lightEnv.numPointLights;
+    numPointLightBuffer->updateContents(uniformUpdate);
 
-	BulkResourceData counterReset;
-	uint32 reset = 0;
-	counterReset.data = (uint8*)&reset;
-	counterReset.size = sizeof(uint32);
-	oLightIndexCounter->updateContents(counterReset);
-	tLightIndexCounter->updateContents(counterReset);
+    BulkResourceData counterReset;
+    uint32 reset = 0;
+    counterReset.data = (uint8*)&reset;
+    counterReset.size = sizeof(uint32);
+    oLightIndexCounter->updateContents(counterReset);
+    tLightIndexCounter->updateContents(counterReset);
 
-	cullingDescriptorLayout->reset();
-	lightEnvDescriptorLayout->reset();
-	cullingDescriptorSet = cullingDescriptorLayout->allocateDescriptorSet();
-	lightEnvDescriptorSet = lightEnvDescriptorLayout->allocateDescriptorSet();
+    cullingDescriptorLayout->reset();
+    lightEnvDescriptorLayout->reset();
+    cullingDescriptorSet = cullingDescriptorLayout->allocateDescriptorSet();
+    lightEnvDescriptorSet = lightEnvDescriptorLayout->allocateDescriptorSet();
 
-	cullingDescriptorSet->updateBuffer(0, viewParamsBuffer);
-	cullingDescriptorSet->updateBuffer(1, dispatchParamsBuffer);
-	cullingDescriptorSet->updateBuffer(3, frustumBuffer);
-	cullingDescriptorSet->updateBuffer(4, oLightIndexCounter);
-	cullingDescriptorSet->updateBuffer(5, tLightIndexCounter);
-	cullingDescriptorSet->updateBuffer(6, oLightIndexList);
-	cullingDescriptorSet->updateBuffer(7, tLightIndexList);
-	cullingDescriptorSet->updateTexture(8, oLightGrid);
-	cullingDescriptorSet->updateTexture(9, tLightGrid);
+    cullingDescriptorSet->updateBuffer(0, viewParamsBuffer);
+    cullingDescriptorSet->updateBuffer(1, dispatchParamsBuffer);
+    cullingDescriptorSet->updateBuffer(3, frustumBuffer);
+    cullingDescriptorSet->updateBuffer(4, oLightIndexCounter);
+    cullingDescriptorSet->updateBuffer(5, tLightIndexCounter);
+    cullingDescriptorSet->updateBuffer(6, oLightIndexList);
+    cullingDescriptorSet->updateBuffer(7, tLightIndexList);
+    cullingDescriptorSet->updateTexture(8, oLightGrid);
+    cullingDescriptorSet->updateTexture(9, tLightGrid);
 
 
-	lightEnvDescriptorSet->updateBuffer(0, directLightBuffer);
-	lightEnvDescriptorSet->updateBuffer(1, numDirLightBuffer);
-	lightEnvDescriptorSet->updateBuffer(2, pointLightBuffer);
-	lightEnvDescriptorSet->updateBuffer(3, numPointLightBuffer);
-	lightEnvDescriptorSet->writeChanges();
-	co_return;
+    lightEnvDescriptorSet->updateBuffer(0, directLightBuffer);
+    lightEnvDescriptorSet->updateBuffer(1, numDirLightBuffer);
+    lightEnvDescriptorSet->updateBuffer(2, pointLightBuffer);
+    lightEnvDescriptorSet->updateBuffer(3, numPointLightBuffer);
+    lightEnvDescriptorSet->writeChanges();
 }
 
-Job LightCullingPass::render() 
+MainJob LightCullingPass::render() 
 {
-	oLightIndexList->pipelineBarrier( 
-		Gfx::SE_ACCESS_SHADER_READ_BIT, Gfx::SE_PIPELINE_STAGE_FRAGMENT_SHADER_BIT,
-		Gfx::SE_ACCESS_SHADER_WRITE_BIT, Gfx::SE_PIPELINE_STAGE_COMPUTE_SHADER_BIT);
-	oLightGrid->pipelineBarrier( 
-		Gfx::SE_ACCESS_SHADER_READ_BIT, Gfx::SE_PIPELINE_STAGE_FRAGMENT_SHADER_BIT,
-		Gfx::SE_ACCESS_SHADER_WRITE_BIT, Gfx::SE_PIPELINE_STAGE_COMPUTE_SHADER_BIT);
-	depthAttachment->pipelineBarrier(
-		Gfx::SE_ACCESS_DEPTH_STENCIL_ATTACHMENT_WRITE_BIT, Gfx::SE_PIPELINE_STAGE_LATE_FRAGMENT_TESTS_BIT,
-		Gfx::SE_ACCESS_SHADER_READ_BIT, Gfx::SE_PIPELINE_STAGE_COMPUTE_SHADER_BIT);
-	depthAttachment->changeLayout(Gfx::SE_IMAGE_LAYOUT_GENERAL);
-	depthAttachment->transferOwnership(Gfx::QueueType::COMPUTE);
-	cullingDescriptorSet->updateTexture(2, depthAttachment);
-	cullingDescriptorSet->writeChanges();
-	Gfx::PComputeCommand computeCommand = graphics->createComputeCommand("CullingCommand");
-	computeCommand->bindPipeline(cullingPipeline);
-	Array<Gfx::PDescriptorSet> descriptorSets = {cullingDescriptorSet, lightEnvDescriptorSet};
-	computeCommand->bindDescriptor(descriptorSets);
-	computeCommand->dispatch(dispatchParams.numThreadGroups.x, dispatchParams.numThreadGroups.y, dispatchParams.numThreadGroups.z);
-	Array<Gfx::PComputeCommand> commands = {computeCommand};
-	graphics->executeCommands(commands);
+    oLightIndexList->pipelineBarrier( 
+        Gfx::SE_ACCESS_SHADER_READ_BIT, Gfx::SE_PIPELINE_STAGE_FRAGMENT_SHADER_BIT,
+        Gfx::SE_ACCESS_SHADER_WRITE_BIT, Gfx::SE_PIPELINE_STAGE_COMPUTE_SHADER_BIT);
+    oLightGrid->pipelineBarrier( 
+        Gfx::SE_ACCESS_SHADER_READ_BIT, Gfx::SE_PIPELINE_STAGE_FRAGMENT_SHADER_BIT,
+        Gfx::SE_ACCESS_SHADER_WRITE_BIT, Gfx::SE_PIPELINE_STAGE_COMPUTE_SHADER_BIT);
+    depthAttachment->pipelineBarrier(
+        Gfx::SE_ACCESS_DEPTH_STENCIL_ATTACHMENT_WRITE_BIT, Gfx::SE_PIPELINE_STAGE_LATE_FRAGMENT_TESTS_BIT,
+        Gfx::SE_ACCESS_SHADER_READ_BIT, Gfx::SE_PIPELINE_STAGE_COMPUTE_SHADER_BIT);
+    depthAttachment->changeLayout(Gfx::SE_IMAGE_LAYOUT_GENERAL);
+    depthAttachment->transferOwnership(Gfx::QueueType::COMPUTE);
+    cullingDescriptorSet->updateTexture(2, depthAttachment);
+    cullingDescriptorSet->writeChanges();
+    Gfx::PComputeCommand computeCommand = graphics->createComputeCommand("CullingCommand");
+    computeCommand->bindPipeline(cullingPipeline);
+    Array<Gfx::PDescriptorSet> descriptorSets = {cullingDescriptorSet, lightEnvDescriptorSet};
+    computeCommand->bindDescriptor(descriptorSets);
+    computeCommand->dispatch(dispatchParams.numThreadGroups.x, dispatchParams.numThreadGroups.y, dispatchParams.numThreadGroups.z);
+    Array<Gfx::PComputeCommand> commands = {computeCommand};
+    graphics->executeCommands(commands);
     depthAttachment->changeLayout(Gfx::SE_IMAGE_LAYOUT_DEPTH_STENCIL_ATTACHMENT_OPTIMAL);
-	depthAttachment->transferOwnership(Gfx::QueueType::GRAPHICS);
-	co_return;
+    depthAttachment->transferOwnership(Gfx::QueueType::GRAPHICS);
+    co_return;
 }
 
-Job LightCullingPass::endFrame() 
+void LightCullingPass::endFrame() 
 {
-    co_return;
 }
 
 void LightCullingPass::publishOutputs() 
 {
-	setupFrustums();
+    setupFrustums();
     uint32_t viewportWidth = viewport->getSizeX();
-	uint32_t viewportHeight = viewport->getSizeY();
-	glm::uvec3 numThreadGroups = glm::ceil(glm::vec3(viewportWidth / (float)BLOCK_SIZE, viewportHeight / (float)BLOCK_SIZE, 1));
-	dispatchParams.numThreadGroups = numThreadGroups;
-	dispatchParams.numThreads = numThreadGroups * glm::uvec3(BLOCK_SIZE, BLOCK_SIZE, 1);
+    uint32_t viewportHeight = viewport->getSizeY();
+    glm::uvec3 numThreadGroups = glm::ceil(glm::vec3(viewportWidth / (float)BLOCK_SIZE, viewportHeight / (float)BLOCK_SIZE, 1));
+    dispatchParams.numThreadGroups = numThreadGroups;
+    dispatchParams.numThreads = numThreadGroups * glm::uvec3(BLOCK_SIZE, BLOCK_SIZE, 1);
 
-	BulkResourceData resourceData;
-	StructuredBufferCreateInfo structInfo;
-	uint32 counterReset = 0;
-	resourceData.size = sizeof(uint32);
-	resourceData.data = (uint8*)&counterReset;
-	resourceData.owner = Gfx::QueueType::COMPUTE;
-	structInfo.bDynamic = true;
-	structInfo.resourceData = resourceData;
-	oLightIndexCounter = graphics->createStructuredBuffer(structInfo);
-	tLightIndexCounter = graphics->createStructuredBuffer(structInfo);
-	resourceData.data = nullptr;
-	resourceData.size = sizeof(uint32_t) 
-		* dispatchParams.numThreadGroups.x 
-		* dispatchParams.numThreadGroups.y 
-		* dispatchParams.numThreadGroups.z * 200;
-	structInfo.resourceData = resourceData;
-	structInfo.bDynamic = false;
-	oLightIndexList = graphics->createStructuredBuffer(structInfo);
-	tLightIndexList = graphics->createStructuredBuffer(structInfo);
-	resources->registerBufferOutput("LIGHTCULLING_OLIGHTLIST", oLightIndexList);
-	resources->registerBufferOutput("LIGHTCULLING_TLIGHTLIST", tLightIndexList);
-	
-	resourceData.size = sizeof(DirectionalLight) * MAX_DIRECTIONAL_LIGHTS;
-	structInfo.resourceData = resourceData;
-	structInfo.bDynamic = true;
-	directLightBuffer = graphics->createStructuredBuffer(structInfo);
-	resourceData.size = sizeof(PointLight) * MAX_POINT_LIGHTS;
-	structInfo.resourceData = resourceData;
-	pointLightBuffer = graphics->createStructuredBuffer(structInfo);
-	
-	UniformBufferCreateInfo uniformInfo;
-	resourceData.size = sizeof(uint32);
-	uniformInfo.resourceData = resourceData;
-	uniformInfo.bDynamic = true;
-	numDirLightBuffer = graphics->createUniformBuffer(uniformInfo);
-	uniformInfo.resourceData = resourceData;
-	uniformInfo.bDynamic = true;
-	numPointLightBuffer = graphics->createUniformBuffer(uniformInfo);
-	
-	resources->registerBufferOutput("DIRECTIONAL_LIGHTS", directLightBuffer);
-	resources->registerUniformOutput("NUM_DIRECTIONAL_LIGHTS", numDirLightBuffer);
-	resources->registerBufferOutput("POINT_LIGHTS", pointLightBuffer);
-	resources->registerUniformOutput("NUM_POINT_LIGHTS", numPointLightBuffer);
-	
-	TextureCreateInfo textureInfo;
-	textureInfo.width = dispatchParams.numThreadGroups.x;
-	textureInfo.height = dispatchParams.numThreadGroups.y;
-	textureInfo.format = Gfx::SE_FORMAT_R32G32_UINT;
-	textureInfo.usage = Gfx::SE_IMAGE_USAGE_STORAGE_BIT;
-	oLightGrid = graphics->createTexture2D(textureInfo);
-	tLightGrid = graphics->createTexture2D(textureInfo);
-	
-	resources->registerTextureOutput("LIGHTCULLING_OLIGHTGRID", oLightGrid);
-	resources->registerTextureOutput("LIGHTCULLING_TLIGHTGRID", tLightGrid);
+    BulkResourceData resourceData;
+    StructuredBufferCreateInfo structInfo;
+    uint32 counterReset = 0;
+    resourceData.size = sizeof(uint32);
+    resourceData.data = (uint8*)&counterReset;
+    resourceData.owner = Gfx::QueueType::COMPUTE;
+    structInfo.bDynamic = true;
+    structInfo.resourceData = resourceData;
+    oLightIndexCounter = graphics->createStructuredBuffer(structInfo);
+    tLightIndexCounter = graphics->createStructuredBuffer(structInfo);
+    resourceData.data = nullptr;
+    resourceData.size = sizeof(uint32_t) 
+        * dispatchParams.numThreadGroups.x 
+        * dispatchParams.numThreadGroups.y 
+        * dispatchParams.numThreadGroups.z * 200;
+    structInfo.resourceData = resourceData;
+    structInfo.bDynamic = false;
+    oLightIndexList = graphics->createStructuredBuffer(structInfo);
+    tLightIndexList = graphics->createStructuredBuffer(structInfo);
+    resources->registerBufferOutput("LIGHTCULLING_OLIGHTLIST", oLightIndexList);
+    resources->registerBufferOutput("LIGHTCULLING_TLIGHTLIST", tLightIndexList);
+    
+    resourceData.size = sizeof(DirectionalLight) * MAX_DIRECTIONAL_LIGHTS;
+    structInfo.resourceData = resourceData;
+    structInfo.bDynamic = true;
+    directLightBuffer = graphics->createStructuredBuffer(structInfo);
+    resourceData.size = sizeof(PointLight) * MAX_POINT_LIGHTS;
+    structInfo.resourceData = resourceData;
+    pointLightBuffer = graphics->createStructuredBuffer(structInfo);
+    
+    UniformBufferCreateInfo uniformInfo;
+    resourceData.size = sizeof(uint32);
+    uniformInfo.resourceData = resourceData;
+    uniformInfo.bDynamic = true;
+    numDirLightBuffer = graphics->createUniformBuffer(uniformInfo);
+    uniformInfo.resourceData = resourceData;
+    uniformInfo.bDynamic = true;
+    numPointLightBuffer = graphics->createUniformBuffer(uniformInfo);
+    
+    resources->registerBufferOutput("DIRECTIONAL_LIGHTS", directLightBuffer);
+    resources->registerUniformOutput("NUM_DIRECTIONAL_LIGHTS", numDirLightBuffer);
+    resources->registerBufferOutput("POINT_LIGHTS", pointLightBuffer);
+    resources->registerUniformOutput("NUM_POINT_LIGHTS", numPointLightBuffer);
+    
+    TextureCreateInfo textureInfo;
+    textureInfo.width = dispatchParams.numThreadGroups.x;
+    textureInfo.height = dispatchParams.numThreadGroups.y;
+    textureInfo.format = Gfx::SE_FORMAT_R32G32_UINT;
+    textureInfo.usage = Gfx::SE_IMAGE_USAGE_STORAGE_BIT;
+    oLightGrid = graphics->createTexture2D(textureInfo);
+    tLightGrid = graphics->createTexture2D(textureInfo);
+    
+    resources->registerTextureOutput("LIGHTCULLING_OLIGHTGRID", oLightGrid);
+    resources->registerTextureOutput("LIGHTCULLING_TLIGHTGRID", tLightGrid);
 }
 
 
 void LightCullingPass::createRenderPass()
 {
-	cullingDescriptorLayout = graphics->createDescriptorLayout("CullingLayout");
-	
-	//ViewParams
-	cullingDescriptorLayout->addDescriptorBinding(0, Gfx::SE_DESCRIPTOR_TYPE_UNIFORM_BUFFER);
-	//Dispatchparams
-	cullingDescriptorLayout->addDescriptorBinding(1, Gfx::SE_DESCRIPTOR_TYPE_UNIFORM_BUFFER);
-	//DepthTexture
-	cullingDescriptorLayout->addDescriptorBinding(2, Gfx::SE_DESCRIPTOR_TYPE_SAMPLED_IMAGE);
-	//Frustums
-	cullingDescriptorLayout->addDescriptorBinding(3, Gfx::SE_DESCRIPTOR_TYPE_STORAGE_BUFFER);
-	//o_lightIndexCounter
-	cullingDescriptorLayout->addDescriptorBinding(4, Gfx::SE_DESCRIPTOR_TYPE_STORAGE_BUFFER);
-	//t_lightIndexCounter
-	cullingDescriptorLayout->addDescriptorBinding(5, Gfx::SE_DESCRIPTOR_TYPE_STORAGE_BUFFER);
-	//o_lightIndexList
-	cullingDescriptorLayout->addDescriptorBinding(6, Gfx::SE_DESCRIPTOR_TYPE_STORAGE_BUFFER);
-	//t_lightIndexList
-	cullingDescriptorLayout->addDescriptorBinding(7, Gfx::SE_DESCRIPTOR_TYPE_STORAGE_BUFFER);
-	//o_lightGrid
-	cullingDescriptorLayout->addDescriptorBinding(8, Gfx::SE_DESCRIPTOR_TYPE_STORAGE_IMAGE);
-	//t_lightGrid
-	cullingDescriptorLayout->addDescriptorBinding(9, Gfx::SE_DESCRIPTOR_TYPE_STORAGE_IMAGE);
+    cullingDescriptorLayout = graphics->createDescriptorLayout("CullingLayout");
+    
+    //ViewParams
+    cullingDescriptorLayout->addDescriptorBinding(0, Gfx::SE_DESCRIPTOR_TYPE_UNIFORM_BUFFER);
+    //Dispatchparams
+    cullingDescriptorLayout->addDescriptorBinding(1, Gfx::SE_DESCRIPTOR_TYPE_UNIFORM_BUFFER);
+    //DepthTexture
+    cullingDescriptorLayout->addDescriptorBinding(2, Gfx::SE_DESCRIPTOR_TYPE_SAMPLED_IMAGE);
+    //Frustums
+    cullingDescriptorLayout->addDescriptorBinding(3, Gfx::SE_DESCRIPTOR_TYPE_STORAGE_BUFFER);
+    //o_lightIndexCounter
+    cullingDescriptorLayout->addDescriptorBinding(4, Gfx::SE_DESCRIPTOR_TYPE_STORAGE_BUFFER);
+    //t_lightIndexCounter
+    cullingDescriptorLayout->addDescriptorBinding(5, Gfx::SE_DESCRIPTOR_TYPE_STORAGE_BUFFER);
+    //o_lightIndexList
+    cullingDescriptorLayout->addDescriptorBinding(6, Gfx::SE_DESCRIPTOR_TYPE_STORAGE_BUFFER);
+    //t_lightIndexList
+    cullingDescriptorLayout->addDescriptorBinding(7, Gfx::SE_DESCRIPTOR_TYPE_STORAGE_BUFFER);
+    //o_lightGrid
+    cullingDescriptorLayout->addDescriptorBinding(8, Gfx::SE_DESCRIPTOR_TYPE_STORAGE_IMAGE);
+    //t_lightGrid
+    cullingDescriptorLayout->addDescriptorBinding(9, Gfx::SE_DESCRIPTOR_TYPE_STORAGE_IMAGE);
 
 
-	lightEnvDescriptorLayout = graphics->createDescriptorLayout("LightEnv");
-	// Directional Lights
-	lightEnvDescriptorLayout->addDescriptorBinding(0, Gfx::SE_DESCRIPTOR_TYPE_STORAGE_BUFFER);
-	lightEnvDescriptorLayout->addDescriptorBinding(1, Gfx::SE_DESCRIPTOR_TYPE_UNIFORM_BUFFER);
-	// Point Lights
-	lightEnvDescriptorLayout->addDescriptorBinding(2, Gfx::SE_DESCRIPTOR_TYPE_STORAGE_BUFFER);
-	lightEnvDescriptorLayout->addDescriptorBinding(3, Gfx::SE_DESCRIPTOR_TYPE_UNIFORM_BUFFER);
+    lightEnvDescriptorLayout = graphics->createDescriptorLayout("LightEnv");
+    // Directional Lights
+    lightEnvDescriptorLayout->addDescriptorBinding(0, Gfx::SE_DESCRIPTOR_TYPE_STORAGE_BUFFER);
+    lightEnvDescriptorLayout->addDescriptorBinding(1, Gfx::SE_DESCRIPTOR_TYPE_UNIFORM_BUFFER);
+    // Point Lights
+    lightEnvDescriptorLayout->addDescriptorBinding(2, Gfx::SE_DESCRIPTOR_TYPE_STORAGE_BUFFER);
+    lightEnvDescriptorLayout->addDescriptorBinding(3, Gfx::SE_DESCRIPTOR_TYPE_UNIFORM_BUFFER);
 
-	cullingLayout = graphics->createPipelineLayout();
-	cullingLayout->addDescriptorLayout(0, cullingDescriptorLayout);
-	cullingLayout->addDescriptorLayout(1, lightEnvDescriptorLayout);
-	cullingLayout->create();
-	
-	ShaderCreateInfo createInfo;
-	createInfo.name = "Culling";
-	
+    cullingLayout = graphics->createPipelineLayout();
+    cullingLayout->addDescriptorLayout(0, cullingDescriptorLayout);
+    cullingLayout->addDescriptorLayout(1, lightEnvDescriptorLayout);
+    cullingLayout->create();
+    
+    ShaderCreateInfo createInfo;
+    createInfo.name = "Culling";
+    
     std::ifstream codeStream("./shaders/LightCulling.slang", std::ios::ate);
     auto fileSize = codeStream.tellg();
     codeStream.seekg(0);
     Array<char> buffer(static_cast<uint32>(fileSize));
     codeStream.read(buffer.data(), fileSize);
 
-	createInfo.shaderCode.add(std::string(buffer.data()));
-	createInfo.entryPoint = "cullLights";
-	createInfo.defines["INDEX_VIEW_PARAMS"] = "0";
-	createInfo.defines["INDEX_LIGHT_ENV"] = "1";
-	createInfo.defines["NUM_MATERIAL_TEXCOORDS"] = "0";
-	cullingShader = graphics->createComputeShader(createInfo);
+    createInfo.shaderCode.add(std::string(buffer.data()));
+    createInfo.entryPoint = "cullLights";
+    createInfo.defines["INDEX_VIEW_PARAMS"] = "0";
+    createInfo.defines["INDEX_LIGHT_ENV"] = "1";
+    createInfo.defines["NUM_MATERIAL_TEXCOORDS"] = "0";
+    cullingShader = graphics->createComputeShader(createInfo);
 
-	ComputePipelineCreateInfo pipelineInfo;
-	pipelineInfo.computeShader = cullingShader;
-	pipelineInfo.pipelineLayout = cullingLayout;
-	cullingPipeline = graphics->createComputePipeline(pipelineInfo);
-	
-	depthAttachment = resources->requestRenderTarget("DEPTHPREPASS_DEPTH")->getTexture();
+    ComputePipelineCreateInfo pipelineInfo;
+    pipelineInfo.computeShader = cullingShader;
+    pipelineInfo.pipelineLayout = cullingLayout;
+    cullingPipeline = graphics->createComputePipeline(pipelineInfo);
+    
+    depthAttachment = resources->requestRenderTarget("DEPTHPREPASS_DEPTH")->getTexture();
 }
 
 void LightCullingPass::modifyRenderPassMacros(Map<const char*, const char*>&) 
@@ -246,80 +244,80 @@ void LightCullingPass::modifyRenderPassMacros(Map<const char*, const char*>&)
 void LightCullingPass::setupFrustums()
 {
     uint32_t viewportWidth = viewport->getSizeX();
-	uint32_t viewportHeight = viewport->getSizeY();
+    uint32_t viewportHeight = viewport->getSizeY();
 
-	glm::uvec3 numThreads = glm::ceil(glm::vec3(viewportWidth / (float)BLOCK_SIZE, viewportHeight / (float)BLOCK_SIZE, 1));
-	glm::uvec3 numThreadGroups = glm::ceil(glm::vec3(numThreads.x / (float)BLOCK_SIZE, numThreads.y / (float)BLOCK_SIZE, 1));
-	
+    glm::uvec3 numThreads = glm::ceil(glm::vec3(viewportWidth / (float)BLOCK_SIZE, viewportHeight / (float)BLOCK_SIZE, 1));
+    glm::uvec3 numThreadGroups = glm::ceil(glm::vec3(numThreads.x / (float)BLOCK_SIZE, numThreads.y / (float)BLOCK_SIZE, 1));
+    
     viewParams.viewMatrix = source->getViewMatrix();
     viewParams.projectionMatrix = source->getProjectionMatrix();
-	viewParams.inverseProjectionMatrix = glm::inverse(source->getProjectionMatrix());
-	viewParams.screenDimensions = glm::vec2(viewportWidth, viewportHeight);
+    viewParams.inverseProjectionMatrix = glm::inverse(source->getProjectionMatrix());
+    viewParams.screenDimensions = glm::vec2(viewportWidth, viewportHeight);
     viewParams.cameraPosition = Vector4(source->getCameraPosition(), 0);
-	dispatchParams.numThreads = numThreads;
-	dispatchParams.numThreadGroups = numThreadGroups;
+    dispatchParams.numThreads = numThreads;
+    dispatchParams.numThreadGroups = numThreadGroups;
 
-	Gfx::PDescriptorLayout frustumDescriptorLayout = graphics->createDescriptorLayout("FrustumLayout");
-	frustumDescriptorLayout->addDescriptorBinding(0, Gfx::SE_DESCRIPTOR_TYPE_UNIFORM_BUFFER);
-	frustumDescriptorLayout->addDescriptorBinding(1, Gfx::SE_DESCRIPTOR_TYPE_UNIFORM_BUFFER);
-	frustumDescriptorLayout->addDescriptorBinding(2, Gfx::SE_DESCRIPTOR_TYPE_STORAGE_BUFFER);
-	frustumLayout = graphics->createPipelineLayout();
-	frustumLayout->addDescriptorLayout(0, frustumDescriptorLayout);
-	frustumLayout->create();
-	ShaderCreateInfo createInfo;
-	createInfo.name = "Frustum";
-	
+    Gfx::PDescriptorLayout frustumDescriptorLayout = graphics->createDescriptorLayout("FrustumLayout");
+    frustumDescriptorLayout->addDescriptorBinding(0, Gfx::SE_DESCRIPTOR_TYPE_UNIFORM_BUFFER);
+    frustumDescriptorLayout->addDescriptorBinding(1, Gfx::SE_DESCRIPTOR_TYPE_UNIFORM_BUFFER);
+    frustumDescriptorLayout->addDescriptorBinding(2, Gfx::SE_DESCRIPTOR_TYPE_STORAGE_BUFFER);
+    frustumLayout = graphics->createPipelineLayout();
+    frustumLayout->addDescriptorLayout(0, frustumDescriptorLayout);
+    frustumLayout->create();
+    ShaderCreateInfo createInfo;
+    createInfo.name = "Frustum";
+    
     std::ifstream codeStream("./shaders/ComputeFrustums.slang", std::ios::ate);
     auto fileSize = codeStream.tellg();
     codeStream.seekg(0);
     Array<char> buffer(static_cast<uint32>(fileSize));
     codeStream.read(buffer.data(), fileSize);
 
-	createInfo.shaderCode.add(std::string(buffer.data()));
-	createInfo.entryPoint = "computeFrustums";
-	createInfo.defines["INDEX_VIEW_PARAMS"] = "0";
-	frustumShader = graphics->createComputeShader(createInfo);
+    createInfo.shaderCode.add(std::string(buffer.data()));
+    createInfo.entryPoint = "computeFrustums";
+    createInfo.defines["INDEX_VIEW_PARAMS"] = "0";
+    frustumShader = graphics->createComputeShader(createInfo);
 
-	
-	ComputePipelineCreateInfo pipelineInfo;
-	pipelineInfo.computeShader = frustumShader;
-	pipelineInfo.pipelineLayout = frustumLayout;
-	frustumPipeline = graphics->createComputePipeline(pipelineInfo);
-	
-	BulkResourceData resourceInfo;
-	UniformBufferCreateInfo uniformInfo;
-	resourceInfo.size = sizeof(ViewParameter);
-	resourceInfo.data = (uint8*)&viewParams;
-	resourceInfo.owner = Gfx::QueueType::COMPUTE;
-	uniformInfo.resourceData = resourceInfo;
-	uniformInfo.bDynamic = false;
-	viewParamsBuffer = graphics->createUniformBuffer(uniformInfo);
+    
+    ComputePipelineCreateInfo pipelineInfo;
+    pipelineInfo.computeShader = frustumShader;
+    pipelineInfo.pipelineLayout = frustumLayout;
+    frustumPipeline = graphics->createComputePipeline(pipelineInfo);
+    
+    BulkResourceData resourceInfo;
+    UniformBufferCreateInfo uniformInfo;
+    resourceInfo.size = sizeof(ViewParameter);
+    resourceInfo.data = (uint8*)&viewParams;
+    resourceInfo.owner = Gfx::QueueType::COMPUTE;
+    uniformInfo.resourceData = resourceInfo;
+    uniformInfo.bDynamic = false;
+    viewParamsBuffer = graphics->createUniformBuffer(uniformInfo);
 
-	resourceInfo.size = sizeof(DispatchParams);
-	resourceInfo.data = (uint8*)&dispatchParams;
-	uniformInfo.resourceData = resourceInfo;
-	uniformInfo.bDynamic = false;
-	dispatchParamsBuffer = graphics->createUniformBuffer(uniformInfo);
+    resourceInfo.size = sizeof(DispatchParams);
+    resourceInfo.data = (uint8*)&dispatchParams;
+    uniformInfo.resourceData = resourceInfo;
+    uniformInfo.bDynamic = false;
+    dispatchParamsBuffer = graphics->createUniformBuffer(uniformInfo);
 
-	StructuredBufferCreateInfo structuredInfo;
-	resourceInfo.size = sizeof(Frustum) * numThreads.x * numThreads.y * numThreads.z;
-	resourceInfo.data = nullptr;
-	structuredInfo.resourceData = resourceInfo;
-	structuredInfo.bDynamic = false;
-	frustumBuffer = graphics->createStructuredBuffer(structuredInfo);
-	
-	frustumDescriptorSet = frustumDescriptorLayout->allocateDescriptorSet();
-	frustumDescriptorSet->updateBuffer(0, viewParamsBuffer);
-	frustumDescriptorSet->updateBuffer(1, dispatchParamsBuffer);
-	frustumDescriptorSet->updateBuffer(2, frustumBuffer);
-	frustumDescriptorSet->writeChanges();
-	
-	Gfx::PComputeCommand command = graphics->createComputeCommand("FrustumCommand");
-	command->bindPipeline(frustumPipeline);
-	command->bindDescriptor(frustumDescriptorSet);
-	command->dispatch(numThreadGroups.x, numThreadGroups.y, numThreadGroups.z);
-	Array<Gfx::PComputeCommand> commands = {command};
-	graphics->executeCommands(commands);
-	frustumBuffer->pipelineBarrier(Gfx::SE_ACCESS_SHADER_WRITE_BIT, Gfx::SE_PIPELINE_STAGE_COMPUTE_SHADER_BIT, 
-		Gfx::SE_ACCESS_SHADER_READ_BIT, Gfx::SE_PIPELINE_STAGE_COMPUTE_SHADER_BIT);
+    StructuredBufferCreateInfo structuredInfo;
+    resourceInfo.size = sizeof(Frustum) * numThreads.x * numThreads.y * numThreads.z;
+    resourceInfo.data = nullptr;
+    structuredInfo.resourceData = resourceInfo;
+    structuredInfo.bDynamic = false;
+    frustumBuffer = graphics->createStructuredBuffer(structuredInfo);
+    
+    frustumDescriptorSet = frustumDescriptorLayout->allocateDescriptorSet();
+    frustumDescriptorSet->updateBuffer(0, viewParamsBuffer);
+    frustumDescriptorSet->updateBuffer(1, dispatchParamsBuffer);
+    frustumDescriptorSet->updateBuffer(2, frustumBuffer);
+    frustumDescriptorSet->writeChanges();
+    
+    Gfx::PComputeCommand command = graphics->createComputeCommand("FrustumCommand");
+    command->bindPipeline(frustumPipeline);
+    command->bindDescriptor(frustumDescriptorSet);
+    command->dispatch(numThreadGroups.x, numThreadGroups.y, numThreadGroups.z);
+    Array<Gfx::PComputeCommand> commands = {command};
+    graphics->executeCommands(commands);
+    frustumBuffer->pipelineBarrier(Gfx::SE_ACCESS_SHADER_WRITE_BIT, Gfx::SE_PIPELINE_STAGE_COMPUTE_SHADER_BIT, 
+        Gfx::SE_ACCESS_SHADER_READ_BIT, Gfx::SE_PIPELINE_STAGE_COMPUTE_SHADER_BIT);
 }

src/Engine/Graphics/RenderPass/LightCullingPass.h

@@ -18,9 +18,9 @@ class LightCullingPass : public RenderPass<LightCullingPassData>
 public:
     LightCullingPass(Gfx::PGraphics graphics, Gfx::PViewport viewport, PCameraActor camera);
     virtual ~LightCullingPass();
-    virtual Job beginFrame() override;
-    virtual Job render() override;
-    virtual Job endFrame() override;
+    virtual void beginFrame() override;
+    virtual MainJob render() override;
+    virtual void endFrame() override;
     virtual void publishOutputs() override;
     virtual void createRenderPass() override;
     static void modifyRenderPassMacros(Map<const char*, const char*>& defines);

src/Engine/Graphics/RenderPass/MeshProcessor.cpp

@@ -60,4 +60,14 @@ void MeshProcessor::buildMeshDrawCommand(
         drawCommand->bindIndexBuffer(element.indexBuffer);
         drawCommand->draw(element);
     }
-}
+}
+
+Array<Gfx::PRenderCommand> MeshProcessor::getRenderCommands() 
+{
+    return renderCommands;
+}
+
+void MeshProcessor::clearCommands()
+{
+    renderCommands.clear();
+}

src/Engine/Graphics/RenderPass/MeshProcessor.h

@@ -12,6 +12,8 @@ class MeshProcessor
 public:
     MeshProcessor(Gfx::PGraphics graphics);
     virtual ~MeshProcessor();
+    Array<Gfx::PRenderCommand> getRenderCommands();
+    void clearCommands();
 protected:
     PScene scene;
     Gfx::PGraphics graphics;
@@ -36,5 +38,6 @@ protected:
         Gfx::PGeometryShader geometryShader,
         Gfx::PFragmentShader fragmentShader,
         bool positionOnly);
+    Array<Gfx::PRenderCommand> renderCommands;
 };
 } // namespace Seele

src/Engine/Graphics/RenderPass/RenderPass.h

@@ -22,9 +22,9 @@ public:
     void updateViewFrame(RenderPassDataType viewFrame) {
         passData = std::move(viewFrame);
     }
-    virtual Job beginFrame() = 0;
-    virtual Job render() = 0;
-    virtual Job endFrame() = 0;
+    virtual void beginFrame() = 0;
+    virtual MainJob render() = 0;
+    virtual void endFrame() = 0;
     virtual void publishOutputs() = 0;
     virtual void createRenderPass() = 0;
     void setResources(PRenderGraphResources resources) { this->resources = resources; }

src/Engine/Graphics/RenderPass/UIPass.cpp

@@ -15,12 +15,11 @@ UIPass::~UIPass()
     
 }
 
-Job UIPass::beginFrame() 
+void UIPass::beginFrame() 
 {
-   co_return; 
 }
 
-Job UIPass::render() 
+MainJob UIPass::render() 
 {
     graphics->beginRenderPass(renderPass);
     Gfx::PRenderCommand command = graphics->createRenderCommand("UIPassCommand");
@@ -32,9 +31,8 @@ Job UIPass::render()
     co_return;
 }
 
-Job UIPass::endFrame() 
+void UIPass::endFrame() 
 {
-    co_return;
 }
 
 void UIPass::publishOutputs() 

src/Engine/Graphics/RenderPass/UIPass.h

@@ -16,9 +16,9 @@ class UIPass : public RenderPass<UIPassData>
 public:
     UIPass(Gfx::PGraphics graphics, Gfx::PViewport viewport, Gfx::PRenderTargetAttachment renderTarget);
     virtual ~UIPass();
-    virtual Job beginFrame() override;
-    virtual Job render() override;
-    virtual Job endFrame() override;
+    virtual void beginFrame() override;
+    virtual MainJob render() override;
+    virtual void endFrame() override;
     virtual void publishOutputs() override;
     virtual void createRenderPass() override;
 private:

src/Engine/Graphics/Vulkan/VulkanBuffer.cpp

@@ -65,15 +65,15 @@ ShaderBuffer::~ShaderBuffer()
 {
 	PCmdBuffer cmdBuffer = graphics->getQueueCommands(owner)->getCommands();
 	VkDevice device = graphics->getDevice();
-	auto deletionLambda = [](PCmdBuffer cmdBuffer, VkDevice device, VkBuffer buffer) -> Job 
+	auto deletionLambda = [cmdBuffer, device](VkBuffer buffer) -> Job 
 	{
-		co_await cmdBuffer->asyncWait();
-		vkDestroyBuffer(device, buffer, nullptr);
-		co_return;
-	};
+		//co_await cmdBuffer->asyncWait();
+		//vkDestroyBuffer(device, buffer, nullptr);
+        co_return;
+    };
 	for (uint32 i = 0; i < numBuffers; ++i)
 	{
-		deletionLambda(cmdBuffer, device, buffers[i].buffer);
+		deletionLambda(buffers[i].buffer);
 		buffers[i].allocation = nullptr;
 	}
 	graphics = nullptr;

src/Engine/Graphics/Vulkan/VulkanCommandBuffer.cpp

@@ -85,6 +85,10 @@ void CmdBuffer::endRenderPass()
 void CmdBuffer::executeCommands(const Array<Gfx::PRenderCommand>& commands)
 {
     assert(state == State::RenderPassActive);
+    if(commands.size() == 0)
+    {
+        return;
+    }
     std::unique_lock lock(handleLock);
     Array<VkCommandBuffer> cmdBuffers(commands.size());
     for (uint32 i = 0; i < commands.size(); ++i)
@@ -105,6 +109,10 @@ void CmdBuffer::executeCommands(const Array<Gfx::PRenderCommand>& commands)
 void CmdBuffer::executeCommands(const Array<Gfx::PComputeCommand>& commands) 
 {
     std::unique_lock lock(handleLock);
+    if(commands.size() == 0)
+    {
+        return;
+    }
     Array<VkCommandBuffer> cmdBuffers(commands.size());
     for (uint32 i = 0; i < commands.size(); ++i)
     {

src/Engine/Graphics/Vulkan/VulkanTexture.cpp

@@ -168,8 +168,8 @@ TextureHandle::~TextureHandle()
     VkImage img = image;
     auto deletionLambda = [cmdBuffer, device, view, img]() -> Job
     {
-        vkDestroyImageView(device, view, nullptr);
-        vkDestroyImage(device, img, nullptr);
+        //vkDestroyImageView(device, view, nullptr);
+        //vkDestroyImage(device, img, nullptr);
         co_return;
     };
     deletionLambda();