Render udpates
This commit is contained in:
@@ -1,5 +1,7 @@
|
||||
#include "RuntimeRenderScene.h"
|
||||
|
||||
#include "../platform/HiddenGlWindow.h"
|
||||
|
||||
#include <algorithm>
|
||||
#include <functional>
|
||||
#include <utility>
|
||||
@@ -9,9 +11,17 @@ RuntimeRenderScene::~RuntimeRenderScene()
|
||||
ShutdownGl();
|
||||
}
|
||||
|
||||
bool RuntimeRenderScene::StartPrepareWorker(std::unique_ptr<HiddenGlWindow> sharedWindow, std::string& error)
|
||||
{
|
||||
return mPrepareWorker.Start(std::move(sharedWindow), error);
|
||||
}
|
||||
|
||||
bool RuntimeRenderScene::CommitRenderLayers(const std::vector<RenderCadenceCompositor::RuntimeRenderLayerModel>& layers, std::string& error)
|
||||
{
|
||||
ConsumePreparedPrograms();
|
||||
|
||||
std::vector<std::string> nextOrder;
|
||||
std::vector<RenderCadenceCompositor::RuntimeRenderLayerModel> layersToPrepare;
|
||||
nextOrder.reserve(layers.size());
|
||||
for (const RenderCadenceCompositor::RuntimeRenderLayerModel& layer : layers)
|
||||
nextOrder.push_back(layer.id);
|
||||
@@ -48,25 +58,38 @@ bool RuntimeRenderScene::CommitRenderLayers(const std::vector<RenderCadenceCompo
|
||||
|
||||
if (program->shaderId == layer.shaderId && program->sourceFingerprint == fingerprint && program->renderer && program->renderer->HasProgram())
|
||||
continue;
|
||||
if (program->pendingFingerprint == fingerprint)
|
||||
continue;
|
||||
|
||||
std::unique_ptr<RuntimeShaderRenderer> nextRenderer = std::make_unique<RuntimeShaderRenderer>();
|
||||
if (!nextRenderer->CommitShaderArtifact(layer.artifact, error))
|
||||
return false;
|
||||
|
||||
if (program->renderer)
|
||||
program->renderer->ShutdownGl();
|
||||
program->shaderId = layer.shaderId;
|
||||
program->sourceFingerprint = fingerprint;
|
||||
program->renderer = std::move(nextRenderer);
|
||||
program->pendingFingerprint = fingerprint;
|
||||
layersToPrepare.push_back(layer);
|
||||
}
|
||||
|
||||
mLayerOrder = std::move(nextOrder);
|
||||
if (!layersToPrepare.empty())
|
||||
mPrepareWorker.Submit(layersToPrepare);
|
||||
error.clear();
|
||||
return true;
|
||||
}
|
||||
|
||||
bool RuntimeRenderScene::HasLayers()
|
||||
{
|
||||
ConsumePreparedPrograms();
|
||||
|
||||
for (const std::string& layerId : mLayerOrder)
|
||||
{
|
||||
const LayerProgram* layer = FindLayer(layerId);
|
||||
if (layer && layer->renderer && layer->renderer->HasProgram())
|
||||
return true;
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
void RuntimeRenderScene::RenderFrame(uint64_t frameIndex, unsigned width, unsigned height)
|
||||
{
|
||||
ConsumePreparedPrograms();
|
||||
|
||||
for (const std::string& layerId : mLayerOrder)
|
||||
{
|
||||
LayerProgram* layer = FindLayer(layerId);
|
||||
@@ -78,6 +101,7 @@ void RuntimeRenderScene::RenderFrame(uint64_t frameIndex, unsigned width, unsign
|
||||
|
||||
void RuntimeRenderScene::ShutdownGl()
|
||||
{
|
||||
mPrepareWorker.Stop();
|
||||
for (LayerProgram& layer : mLayers)
|
||||
{
|
||||
if (layer.renderer)
|
||||
@@ -87,6 +111,41 @@ void RuntimeRenderScene::ShutdownGl()
|
||||
mLayerOrder.clear();
|
||||
}
|
||||
|
||||
void RuntimeRenderScene::ConsumePreparedPrograms()
|
||||
{
|
||||
RuntimePreparedShaderProgram preparedProgram;
|
||||
while (mPrepareWorker.TryConsume(preparedProgram))
|
||||
{
|
||||
if (!preparedProgram.succeeded)
|
||||
{
|
||||
preparedProgram.ReleaseGl();
|
||||
continue;
|
||||
}
|
||||
|
||||
LayerProgram* layer = FindLayer(preparedProgram.layerId);
|
||||
if (!layer || layer->pendingFingerprint != preparedProgram.sourceFingerprint)
|
||||
{
|
||||
preparedProgram.ReleaseGl();
|
||||
continue;
|
||||
}
|
||||
|
||||
std::unique_ptr<RuntimeShaderRenderer> nextRenderer = std::make_unique<RuntimeShaderRenderer>();
|
||||
std::string error;
|
||||
if (!nextRenderer->CommitPreparedProgram(preparedProgram, error))
|
||||
{
|
||||
preparedProgram.ReleaseGl();
|
||||
continue;
|
||||
}
|
||||
|
||||
if (layer->renderer)
|
||||
layer->renderer->ShutdownGl();
|
||||
layer->renderer = std::move(nextRenderer);
|
||||
layer->shaderId = preparedProgram.shaderId;
|
||||
layer->sourceFingerprint = preparedProgram.sourceFingerprint;
|
||||
layer->pendingFingerprint.clear();
|
||||
}
|
||||
}
|
||||
|
||||
RuntimeRenderScene::LayerProgram* RuntimeRenderScene::FindLayer(const std::string& layerId)
|
||||
{
|
||||
for (LayerProgram& layer : mLayers)
|
||||
|
||||
Reference in New Issue
Block a user