parsing shaders (untested)

Author: malytomas

.github/workflows/tests.yml

@@ -163,6 +163,59 @@ jobs:
         ldd libcage-engine.so
 
 
+  MacOS:
+    name: macos-${{ matrix.os-version }}-${{ matrix.build-config }}
+    runs-on: macos-${{ matrix.os-version }}
+    strategy:
+      fail-fast: false
+      matrix:
+        os-version: [14, 15]
+        build-config: [debug, release]
+
+    steps:
+    - name: Install packages
+      run: |
+        brew install nasm
+
+    - name: Versions
+      run: |
+        cmake --version
+        git --version
+        clang --version
+        clang++ --version
+
+    - uses: actions/checkout@v4
+
+    - name: Configure
+      run: |
+        mkdir build
+        cd build
+        cmake -DCMAKE_BUILD_TYPE=${{ matrix.build-config }} ..
+
+    - name: Build
+      run: |
+        cd build
+        cmake --build . -- -j$(( `sysctl -n hw.ncpu` + 1 ))
+
+    - name: Tests
+      run: |
+        cd build/result/${{ matrix.build-config }}
+        ./cage-test-core
+
+    - name: Assets
+      run: |
+        cd build/result/${{ matrix.build-config }}
+        ./cage-asset-database
+
+    - name: List dependencies
+      run: |
+        cd build/result/${{ matrix.build-config }}
+        echo "cage-core:"
+        otool -L libcage-core.dylib
+        echo "cage-engine:"
+        otool -L libcage-engine.dylib
+
+
   NoProfiler:
     name: no-profiler
     needs: Ubuntu
@@ -257,51 +310,3 @@ jobs:
       run: |
         cd build/result/${{ matrix.build-config }}
         ./cage-test-core
-
-
-  MacOS:
-    name: macos-${{ matrix.os-version }}-${{ matrix.build-config }}
-    runs-on: macos-${{ matrix.os-version }}
-    strategy:
-      fail-fast: false
-      matrix:
-        os-version: [14, 15]
-        build-config: [debug, release]
-
-    steps:
-    - name: Install packages
-      run: |
-        brew install nasm
-
-    - name: Versions
-      run: |
-        cmake --version
-        git --version
-        clang --version
-        clang++ --version
-
-    - uses: actions/checkout@v4
-
-    - name: Configure
-      run: |
-        mkdir build
-        cd build
-        cmake -DCMAKE_BUILD_TYPE=${{ matrix.build-config }} ..
-
-    - name: Build
-      run: |
-        cd build
-        cmake --build . -- -j$(( `sysctl -n hw.ncpu` + 1 ))
-
-    - name: Tests
-      run: |
-        cd build/result/${{ matrix.build-config }}
-        ./cage-test-core
-
-    - name: List dependencies
-      run: |
-        cd build/result/${{ matrix.build-config }}
-        echo "cage-core:"
-        otool -L libcage-core.dylib
-        echo "cage-engine:"
-        otool -L libcage-engine.dylib

data/cage/shaders/effects/effects.assets

@@ -2,19 +2,19 @@
 scheme = pack
 effects.pack
 
-[]
-scheme = shader
-bloomApply.glsl
-bloomGenerate.glsl
-dofApply.glsl
-dofCollect.glsl
-fxaa.glsl
-gaussianBlur.glsl
-luminanceApply.glsl
-luminanceCollection.glsl
-luminanceHistogram.glsl
-sharpening.glsl
-ssaoDownscaleDepth.glsl
-ssaoGenerate.glsl
-ssaoResolve.glsl
-tonemap.glsl
+#[]
+#scheme = shader
+#bloomApply.glsl
+#bloomGenerate.glsl
+#dofApply.glsl
+#dofCollect.glsl
+#fxaa.glsl
+#gaussianBlur.glsl
+#luminanceApply.glsl
+#luminanceCollection.glsl
+#luminanceHistogram.glsl
+#sharpening.glsl
+#ssaoDownscaleDepth.glsl
+#ssaoGenerate.glsl
+#ssaoResolve.glsl
+#tonemap.glsl

data/cage/shaders/engine/engine.assets

@@ -2,13 +2,13 @@
 scheme = pack
 engine.pack
 
-[]
-scheme = shader
-billboard.glsl
-blitPixels.glsl
-blitScaled.glsl
-decal.glsl
-icon.glsl
-skybox.glsl
-standard.glsl
-text.glsl
+#[]
+#scheme = shader
+#billboard.glsl
+#blitPixels.glsl
+#blitScaled.glsl
+#decal.glsl
+#icon.glsl
+#skybox.glsl
+#standard.glsl
+#text.glsl

data/cage/shaders/gui/gui.assets

@@ -3,11 +3,11 @@
 scheme = pack
 gui.pack
 
-[]
-scheme = shader
-font.glsl
-element.glsl
-image.glsl
-colorPicker.glsl?F # Flat
-colorPicker.glsl?H # Hue
-colorPicker.glsl?S # Saturation & Value
+#[]
+#scheme = shader
+#font.glsl
+#element.glsl
+#image.glsl
+#colorPicker.glsl?F # Flat
+#colorPicker.glsl?H # Hue
+#colorPicker.glsl?S # Saturation & Value

sources/asset-processor/shader.cpp

@@ -1,19 +1,28 @@
 #include <map>
 #include <set>
 #include <string>
+#include <unordered_map>
 #include <vector>
 
 #include "processor.h"
 
+#include <cage-core/containerSerialization.h>
 #include <cage-core/hashString.h>
-#include <cage-core/timer.h>
+#include <cage-engine/spirv.h>
 
 namespace
 {
-	std::map<String, std::string> codes;
-	std::map<String, String> defines;
-	std::set<String, StringComparatorFast> onces;
+	struct Variant
+	{
+		Holder<Spirv> spirv;
+		uint32 id = 0;
+	};
+
+	std::unordered_map<uint32, std::string> codes;
+	std::map<String, String, StringComparatorFast> defines;
+	std::set<String> onces;
 	std::set<detail::StringBase<20>> keywords;
+	std::vector<Variant> variants;
 
 	const ConfigBool configShaderPrint("cage-asset-processor/shader/preview", false);
 
@@ -226,28 +235,22 @@ namespace
 		return evalExp(l);
 	}
 
-	void output(const String &s)
-	{
-		if (defines["shader"].empty())
-		{
-			if (!s.empty())
-			{
-				CAGE_LOG_DEBUG(SeverityEnum::Warning, "assetProcessor", Stringizer() + "output to unspecified shader: " + s);
-			}
-			return;
-		}
-		codes[defines["shader"]] += std::string(s.c_str(), s.length()) + "\n";
-	}
-
 	uint32 shaderType(const String &name)
 	{
+		if (name == "")
+			return 0;
 		if (name == "vertex")
 			return 1;
 		if (name == "fragment")
 			return 2;
 		if (name == "compute")
 			return 3;
-		return 0;
+		CAGE_THROW_ERROR(Exception, "unknwon shader stage name");
+	}
+
+	void output(const String &s)
+	{
+		codes[shaderType(defines["shader"])] += std::string(s.c_str(), s.length()) + "\n";
 	}
 
 	bool stackIsOk(const std::vector<sint32> &stack)
@@ -445,6 +448,48 @@ namespace
 			CAGE_THROW_ERROR(Exception, "unexpected end of file; expecting $end");
 		}
 	}
+
+	std::vector<bool> selectedKeys;
+	void generateVariants(uint32 keyIndex)
+	{
+		if (keyIndex == keywords.size())
+		{
+			std::string preamble = "";
+			uint32 id = 0;
+			for (uint32 i = 0; i < keywords.size(); i++)
+			{
+				if (selectedKeys[i])
+				{
+					auto it = keywords.begin();
+					std::advance(it, i);
+					const detail::StringBase<20> k = *it;
+					preamble += std::string("#define ") + k.c_str() + " 1\n";
+					id += hashRawString(k.c_str());
+				}
+			}
+			try
+			{
+				Holder<Spirv> sp = newSpirv();
+				GlslConfig glsl;
+				static const std::string prepend = std::string() + "#version 450 core\n" + "// " + processor->inputName.c_str() + "\n";
+				glsl.vertex = prepend + preamble + "#define varying out\n" + codes[0] + codes[1];
+				glsl.fragment = prepend + preamble + "#define varying in\n" + codes[0] + codes[2];
+				sp->importGlsl(glsl);
+				variants.push_back({ std::move(sp), id });
+			}
+			catch (...)
+			{
+				CAGE_LOG(SeverityEnum::Warning, "assetProcessor", "failed to build shader variant");
+			}
+		}
+		else
+		{
+			selectedKeys[keyIndex] = true;
+			generateVariants(keyIndex + 1);
+			selectedKeys[keyIndex] = false;
+			generateVariants(keyIndex + 1);
+		}
+	}
 }
 
 void processShader()
@@ -456,39 +501,41 @@ void processShader()
 
 	parse(processor->inputFileName);
 
+	for (const auto &it : keywords)
+		CAGE_LOG(SeverityEnum::Info, "assetProcessor", Stringizer() + "keyword: " + it);
+
+	selectedKeys.resize(keywords.size(), false);
+	generateVariants(0);
+	if (variants.empty())
 	{
-		std::string prepend = R"foo(#version 450 core
-)foo";
-		prepend += std::string() + "// " + processor->inputName.c_str() + "\n";
-		for (auto &it : codes)
-			it.second = prepend + it.second;
+		CAGE_THROW_ERROR(Exception, "generated no shader variants");
 	}
+	else
+		CAGE_LOG(SeverityEnum::Info, "assetProcessor", Stringizer() + "generated variants: " + variants.size());
 
 	{
 		MultiShaderHeader header;
-		header.variantsCount = codes.size();
 		if (defines.count("customDataCount"))
 		{
 			const uint32 cdc = toUint32(defines["customDataCount"]);
 			CAGE_LOG(SeverityEnum::Info, "assetProcessor", Stringizer() + "custom data count: " + cdc);
 			header.customDataCount = cdc;
 		}
+		header.variantsCount = variants.size();
+
 		MemoryBuffer buff;
 		Serializer ser(buff);
 		ser << header;
-		/*
-		for (const auto &it : keywords)
 		{
-			CAGE_LOG(SeverityEnum::Info, "assetProcessor", Stringizer() + "keyword: " + it);
-			ser << it;
+			std::vector<detail::StringBase<20>> ks(keywords.begin(), keywords.end());
+			ser << ks;
 		}
-		*/
-		for (const auto &it : codes)
+		for (const Variant &v : variants)
 		{
-			ser << (uint32)shaderType(it.first);
-			ser << numeric_cast<uint32>(it.second.length());
-			ser.write(it.second);
-			CAGE_LOG(SeverityEnum::Info, "assetProcessor", Stringizer() + "stage: " + it.first + ", length: " + it.second.size());
+			const auto b = v.spirv->exportBuffer();
+			ser << v.id;
+			ser << numeric_cast<uint32>(b.size());
+			ser.write(b);
 		}
 
 		CAGE_LOG(SeverityEnum::Info, "assetProcessor", Stringizer() + "buffer size (before compression): " + buff.size());
@@ -508,7 +555,7 @@ void processShader()
 	{
 		for (const auto &it : codes)
 		{
-			String name = pathJoin(configGetString("cage-asset-processor/shader/path", "asset-preview"), pathReplaceInvalidCharacters(processor->inputName) + "_" + it.first + ".glsl");
+			const String name = pathJoin(configGetString("cage-asset-processor/shader/path", "asset-preview"), Stringizer() + pathReplaceInvalidCharacters(processor->inputName) + "_" + it.first + ".glsl");
 			FileMode fm(false, true);
 			fm.textual = true;
 			Holder<File> f = newFile(name, fm);

sources/include/cage-engine/assetsSchemes.h

@@ -7,13 +7,13 @@ namespace cage
 {
 	class GraphicsDevice;
 
-	CAGE_ENGINE_API AssetsScheme genAssetSchemeShader(GraphicsDevice *device, uint32 threadIndex);
+	CAGE_ENGINE_API AssetsScheme genAssetSchemeShader(GraphicsDevice *device);
 	constexpr uint32 AssetSchemeIndexShader = 10;
 
-	CAGE_ENGINE_API AssetsScheme genAssetSchemeTexture(GraphicsDevice *device, uint32 threadIndex);
+	CAGE_ENGINE_API AssetsScheme genAssetSchemeTexture(GraphicsDevice *device);
 	constexpr uint32 AssetSchemeIndexTexture = 11;
 
-	CAGE_ENGINE_API AssetsScheme genAssetSchemeModel(GraphicsDevice *device, uint32 threadIndex);
+	CAGE_ENGINE_API AssetsScheme genAssetSchemeModel(GraphicsDevice *device);
 	constexpr uint32 AssetSchemeIndexModel = 12;
 
 	CAGE_ENGINE_API AssetsScheme genAssetSchemeRenderObject();