Handle shader options of any type

2021-09-03 19:33:41 +02:00
parent 2f9e495739
commit 02a12d9328
38 changed files with 236 additions and 1118 deletions
--- a/src/Nazara/Shader/SpirvConstantCache.cpp
+++ b/src/Nazara/Shader/SpirvConstantCache.cpp
@@ -418,7 +418,9 @@ namespace Nz
 		{
 			using T = std::decay_t<decltype(arg)>;

-			if constexpr (std::is_same_v<T, bool>)
+			if constexpr (std::is_same_v<T, ShaderAst::NoValue>)
+				throw std::runtime_error("invalid type (value expected)");
+			else if constexpr (std::is_same_v<T, bool>)
 				return ConstantBool{ arg };
 			else if constexpr (std::is_same_v<T, float> || std::is_same_v<T, Int32> || std::is_same_v<T, UInt32>)
 				return ConstantScalar{ arg };