Add manifest support for pass declarations

apps/LoopThroughWithOpenGLCompositing/runtime/RuntimeHost.cpp

@@ -1301,6 +1301,20 @@ bool RuntimeHost::TryAdvanceFrame()
 }
 
 bool RuntimeHost::BuildLayerFragmentShaderSource(const std::string& layerId, std::string& fragmentShaderSource, std::string& error)
+{
+	std::vector<std::pair<std::string, std::string>> passSources;
+	if (!BuildLayerPassFragmentShaderSources(layerId, passSources, error))
+		return false;
+	if (passSources.empty())
+	{
+		error = "Shader layer produced no compiled passes: " + layerId;
+		return false;
+	}
+	fragmentShaderSource = passSources.front().second;
+	return true;
+}
+
+bool RuntimeHost::BuildLayerPassFragmentShaderSources(const std::string& layerId, std::vector<std::pair<std::string, std::string>>& passSources, std::string& error)
 {
 	try
 	{
@@ -1324,16 +1338,25 @@ bool RuntimeHost::BuildLayerFragmentShaderSource(const std::string& layerId, std
 		}
 
 		ShaderCompiler compiler(mRepoRoot, mWrapperPath, mGeneratedGlslPath, mPatchedGlslPath, mConfig.maxTemporalHistoryFrames);
-		return compiler.BuildLayerFragmentShaderSource(shaderPackage, fragmentShaderSource, error);
+		passSources.clear();
+		passSources.reserve(shaderPackage.passes.size());
+		for (const ShaderPassDefinition& pass : shaderPackage.passes)
+		{
+			std::string fragmentShaderSource;
+			if (!compiler.BuildPassFragmentShaderSource(shaderPackage, pass, fragmentShaderSource, error))
+				return false;
+			passSources.push_back(std::make_pair(pass.id, std::move(fragmentShaderSource)));
+		}
+		return true;
 	}
 	catch (const std::exception& exception)
 	{
-		error = std::string("RuntimeHost::BuildLayerFragmentShaderSource exception: ") + exception.what();
+		error = std::string("RuntimeHost::BuildLayerPassFragmentShaderSources exception: ") + exception.what();
 		return false;
 	}
 	catch (...)
 	{
-		error = "RuntimeHost::BuildLayerFragmentShaderSource threw a non-standard exception.";
+		error = "RuntimeHost::BuildLayerPassFragmentShaderSources threw a non-standard exception.";
 		return false;
 	}
 }
@@ -1673,35 +1696,8 @@ bool RuntimeHost::ScanShaderPackages(std::string& error)
 
 bool RuntimeHost::ParseShaderManifest(const std::filesystem::path& manifestPath, ShaderPackage& shaderPackage, std::string& error) const
 {
-	const std::string manifestText = ReadTextFile(manifestPath, error);
-	if (manifestText.empty())
-		return false;
-
-	JsonValue manifestJson;
-	if (!ParseJson(manifestText, manifestJson, error))
-		return false;
-	if (!manifestJson.isObject())
-	{
-		error = "Shader manifest root must be an object: " + manifestPath.string();
-		return false;
-	}
-
-	if (!ParseShaderMetadata(manifestJson, shaderPackage, manifestPath, error))
-		return false;
-
-	if (!std::filesystem::exists(shaderPackage.shaderPath))
-	{
-		error = "Shader source not found for package " + shaderPackage.id + ": " + shaderPackage.shaderPath.string();
-		return false;
-	}
-
-	shaderPackage.shaderWriteTime = std::filesystem::last_write_time(shaderPackage.shaderPath);
-	shaderPackage.manifestWriteTime = std::filesystem::last_write_time(shaderPackage.manifestPath);
-
-	return ParseTextureAssets(manifestJson, shaderPackage, manifestPath, error) &&
-		ParseFontAssets(manifestJson, shaderPackage, manifestPath, error) &&
-		ParseTemporalSettings(manifestJson, shaderPackage, mConfig.maxTemporalHistoryFrames, manifestPath, error) &&
-		ParseParameterDefinitions(manifestJson, shaderPackage, manifestPath, error);
+	ShaderPackageRegistry registry(mConfig.maxTemporalHistoryFrames);
+	return registry.ParseManifest(manifestPath, shaderPackage, error);
 }
 
 bool RuntimeHost::NormalizeAndValidateValue(const ShaderParameterDefinition& definition, const JsonValue& value, ShaderParameterValue& normalizedValue, std::string& error) const

apps/LoopThroughWithOpenGLCompositing/runtime/RuntimeHost.h

@@ -9,6 +9,7 @@
 #include <map>
 #include <mutex>
 #include <string>
+#include <utility>
 #include <vector>
 
 class RuntimeHost
@@ -51,6 +52,7 @@ public:
 	bool TryAdvanceFrame();
 
 	bool BuildLayerFragmentShaderSource(const std::string& layerId, std::string& fragmentShaderSource, std::string& error);
+	bool BuildLayerPassFragmentShaderSources(const std::string& layerId, std::vector<std::pair<std::string, std::string>>& passSources, std::string& error);
 	std::vector<RuntimeRenderState> GetLayerRenderStates(unsigned outputWidth, unsigned outputHeight) const;
 	bool TryGetLayerRenderStates(unsigned outputWidth, unsigned outputHeight, std::vector<RuntimeRenderState>& states) const;
 	void RefreshDynamicRenderStateFields(std::vector<RuntimeRenderState>& states) const;