Texture composition for text no longer on the render thread

src/runtime/RuntimeLayerModel.cpp

@@ -1,6 +1,7 @@
 #include "RuntimeLayerModel.h"
 
 #include "RuntimeParameterUtils.h"
+#include "RuntimeTextTextureComposer.h"
 
 #include <algorithm>
 #include <chrono>
@@ -238,7 +239,11 @@ bool RuntimeLayerModel::UpdateParameter(const std::string& layerId, const std::s
 
 	layer->parameterValues[parameterId] = normalizedValue;
 	if (layer->renderReady)
+	{
 		layer->artifact.parameterValues = layer->parameterValues;
+		if (definition->type == ShaderParameterType::Text && !PrepareRuntimeTextTextures(layer->artifact, error))
+			return false;
+	}
 	error.clear();
 	return true;
 }
@@ -256,7 +261,11 @@ bool RuntimeLayerModel::ResetParameters(const std::string& layerId, std::string&
 	for (const ShaderParameterDefinition& definition : layer->parameterDefinitions)
 		layer->parameterValues[definition.id] = DefaultValueForDefinition(definition);
 	if (layer->renderReady)
+	{
 		layer->artifact.parameterValues = layer->parameterValues;
+		if (!PrepareRuntimeTextTextures(layer->artifact, error))
+			return false;
+	}
 	error.clear();
 	return true;
 }
@@ -394,7 +403,11 @@ bool RuntimeLayerModel::ReloadFromCatalog(const SupportedShaderCatalog& shaderCa
 		layer.parameterDefinitions = shaderPackage->parameters;
 		layer.parameterValues = std::move(nextValues);
 		if (layer.renderReady)
+		{
 			layer.artifact.parameterValues = layer.parameterValues;
+			std::string prepareError;
+			PrepareRuntimeTextTextures(layer.artifact, prepareError);
+		}
 		buildsToStart.push_back({ layer.id, layer.shaderId });
 	}
 
@@ -442,6 +455,14 @@ bool RuntimeLayerModel::MarkBuildReady(const RuntimeShaderArtifact& artifact, st
 	layer->renderReady = true;
 	layer->artifact = artifact;
 	layer->artifact.parameterValues = layer->parameterValues;
+	if (!PrepareRuntimeTextTextures(layer->artifact, error))
+	{
+		layer->buildState = RuntimeLayerBuildState::Failed;
+		layer->message = error;
+		layer->renderReady = false;
+		layer->artifact = RuntimeShaderArtifact();
+		return false;
+	}
 	error.clear();
 	return true;
 }
@@ -498,6 +519,7 @@ RuntimeLayerModelSnapshot RuntimeLayerModel::Snapshot() const
 			renderLayer.bypass = layer.bypass;
 			renderLayer.artifact = layer.artifact;
 			renderLayer.artifact.parameterValues = layer.parameterValues;
+			renderLayer.artifact.fontAtlases.clear();
 			snapshot.renderLayers.push_back(std::move(renderLayer));
 		}
 	}