shader control

apps/RenderCadenceCompositor/render/runtime/RuntimeRenderScene.cpp

@@ -28,7 +28,10 @@ bool RuntimeRenderScene::CommitRenderLayers(const std::vector<RenderCadenceCompo
 	std::vector<RenderCadenceCompositor::RuntimeRenderLayerModel> layersToPrepare;
 	nextOrder.reserve(layers.size());
 	for (const RenderCadenceCompositor::RuntimeRenderLayerModel& layer : layers)
-		nextOrder.push_back(layer.id);
+	{
+		if (!layer.bypass)
+			nextOrder.push_back(layer.id);
+	}
 
 	for (auto layerIt = mLayers.begin(); layerIt != mLayers.end();)
 	{
@@ -50,6 +53,8 @@ bool RuntimeRenderScene::CommitRenderLayers(const std::vector<RenderCadenceCompo
 
 	for (const RenderCadenceCompositor::RuntimeRenderLayerModel& layer : layers)
 	{
+		if (layer.bypass)
+			continue;
 		if (layer.artifact.passes.empty() && layer.artifact.fragmentShaderSource.empty())
 			continue;
 
@@ -73,7 +78,14 @@ bool RuntimeRenderScene::CommitRenderLayers(const std::vector<RenderCadenceCompo
 			}
 		}
 		if (program->shaderId == layer.shaderId && program->sourceFingerprint == fingerprint && hasReadyPass)
+		{
+			for (LayerProgram::PassProgram& pass : program->passes)
+			{
+				if (pass.renderer)
+					pass.renderer->UpdateArtifactState(layer.artifact);
+			}
 			continue;
+		}
 		if (program->pendingFingerprint == fingerprint)
 			continue;
 

apps/RenderCadenceCompositor/render/runtime/RuntimeShaderParams.cpp

@@ -82,7 +82,10 @@ std::vector<unsigned char> BuildRuntimeShaderGlobalParamsStd140(
 
 	for (const ShaderParameterDefinition& definition : artifact.parameterDefinitions)
 	{
-		const ShaderParameterValue value = DefaultValueForDefinition(definition);
+		const auto valueIt = artifact.parameterValues.find(definition.id);
+		const ShaderParameterValue value = valueIt == artifact.parameterValues.end()
+			? DefaultValueForDefinition(definition)
+			: valueIt->second;
 		switch (definition.type)
 		{
 		case ShaderParameterType::Float:

apps/RenderCadenceCompositor/render/runtime/RuntimeShaderRenderer.cpp

@@ -94,6 +94,13 @@ bool RuntimeShaderRenderer::CommitPreparedProgram(RuntimePreparedShaderProgram&
 	return true;
 }
 
+void RuntimeShaderRenderer::UpdateArtifactState(const RuntimeShaderArtifact& artifact)
+{
+	mArtifact.parameterDefinitions = artifact.parameterDefinitions;
+	mArtifact.parameterValues = artifact.parameterValues;
+	mArtifact.message = artifact.message;
+}
+
 bool RuntimeShaderRenderer::BuildPreparedProgram(
 	const std::string& layerId,
 	const std::string& sourceFingerprint,

apps/RenderCadenceCompositor/render/runtime/RuntimeShaderRenderer.h

@@ -20,6 +20,7 @@ public:
 	bool CommitShaderArtifact(const RuntimeShaderArtifact& artifact, std::string& error);
 	bool CommitPreparedProgram(RuntimePreparedShaderProgram& preparedProgram, std::string& error);
 	bool HasProgram() const { return mProgram != 0; }
+	void UpdateArtifactState(const RuntimeShaderArtifact& artifact);
 	void RenderFrame(uint64_t frameIndex, unsigned width, unsigned height, GLuint sourceTexture = 0, GLuint layerInputTexture = 0);
 	void ShutdownGl();