Time to rewrite the entire shader system....

TF2VulkanUtil/TF2VulkanUtil.vcxproj

@@ -89,6 +89,7 @@
     <ClInclude Include="include\TF2Vulkan\Util\AutoInit.h" />
     <ClInclude Include="include\TF2Vulkan\Util\Buffer.h" />
     <ClInclude Include="include\TF2Vulkan\Util\Checked.h" />
+    <ClInclude Include="include\TF2Vulkan\Util\CollapsingStruct.h" />
     <ClInclude Include="include\TF2Vulkan\Util\color.h" />
     <ClInclude Include="include\TF2Vulkan\Util\ConstexprCRC.h" />
     <ClInclude Include="include\TF2Vulkan\Util\ConstexprRandom.h" />

TF2VulkanUtil/include/TF2Vulkan/Util/CollapsingStruct.h

@@ -0,0 +1,14 @@
+#pragma once
+
+namespace Util
+{
+	template<typename TBase1>
+	struct CollapsingStruct : TBase1
+	{
+	};
+
+	template<typename TBase1, typename... TBaseOthers>
+	struct CollapsingStruct : TBase1, CollapsingStruct<TBaseOthers...>
+	{
+	};
+}

TF2VulkanUtil/include/TF2Vulkan/Util/Macros.h

@@ -8,7 +8,7 @@
 
 #include <tier0/basetypes.h>
 
-#define ENSURE(condition) { if (!(condition)) ::Util::EnsureConditionFailed(_T(#condition), __FUNCSIG__, __FILE__, __LINE__); }
+#define ENSURE(condition) { if (!(condition)) ::Util::EnsureConditionFailed(V_STRINGIFY(#condition), __FUNCSIG__, __FILE__, __LINE__); }
 
 #define ASSERT_MAIN_THREAD() ENSURE(::Util::IsMainThread())
 
@@ -49,7 +49,7 @@ namespace Util
 #define ALL_STATIC_TYPE_INFO(type) \
 	::Util::StaticTypeInfo{ sizeof(type), 0, alignof(type) }
 
-#define TF2VULKAN_ENABLE_FUNCTION_LOGGING 1
+//#define TF2VULKAN_ENABLE_FUNCTION_LOGGING 1
 #define TF2VULKAN_LOCAL_ENABLE_FUNCTION_LOGGING true
 
 #if defined(TF2VULKAN_ENABLE_FUNCTION_LOGGING)

TF2VulkanUtil/include/TF2Vulkan/Util/std_charconv.h

@@ -2,6 +2,7 @@
 
 #include <charconv>
 #include <string_view>
+#include <optional>
 
 namespace Util{ namespace charconv
 {
@@ -37,4 +38,24 @@ namespace Util{ namespace charconv
 	{
 		return from_chars_result(from_chars(sv.data(), sv.data() + sv.size(), value, base), sv);
 	}
+
+	template<typename T, typename = std::enable_if_t<std::is_floating_point_v<T>>>
+	std::optional<T> from_chars_v(const std::string_view & sv, std::chars_format fmt = std::chars_format::general)
+	{
+		T temp{};
+		if (from_chars(sv, temp, fmt))
+			return temp;
+
+		return std::nullopt;
+	}
+
+	template<typename T, typename = std::enable_if_t<std::is_integral_v<T>>>
+	std::optional<T> from_chars_v(const std::string_view & sv, int base = 10)
+	{
+		T temp{};
+		if (from_chars(sv, temp, base))
+			return temp;
+
+		return std::nullopt;
+	}
 } }

stdshader_vulkan/src/shaders/BaseShaderNext.h

@@ -36,11 +36,11 @@ namespace TF2Vulkan{ namespace Shaders
 		void InitShader(IShaderNextFactory& factory);
 
 	protected:
-		void InitIntParam(int param, IMaterialVar** params, int defaultVal) const;
-		void InitFloatParam(int param, IMaterialVar** params, float defaultVal) const;
-		void InitVecParam(int param, IMaterialVar** params, float defaultValX, float defaultValY) const;
-		void InitVecParam(int param, IMaterialVar** params, float defaultValX, float defaultValY, float defaultValZ) const;
-		void InitVecParam(int param, IMaterialVar** params, float defaultValX, float defaultValY, float defaultValZ, float defaultValW) const;
+		[[deprecated]] void InitIntParam(int param, IMaterialVar** params, int defaultVal) const;
+		[[deprecated]] void InitFloatParam(int param, IMaterialVar** params, float defaultVal) const;
+		[[deprecated]] void InitVecParam(int param, IMaterialVar** params, float defaultValX, float defaultValY) const;
+		[[deprecated]] void InitVecParam(int param, IMaterialVar** params, float defaultValX, float defaultValY, float defaultValZ) const;
+		[[deprecated]] void InitVecParam(int param, IMaterialVar** params, float defaultValX, float defaultValY, float defaultValZ, float defaultValW) const;
 		virtual void OnInitShader(IShaderNextFactory& instanceMgr) = 0;
 
 		void LoadLights(TF2Vulkan::Shaders::ShaderDataCommon& data) const;
@@ -80,28 +80,36 @@ namespace TF2Vulkan{ namespace Shaders
 	struct DefaultInstanceRegister
 	{
 		T m_Instance;
-		DefaultInstanceRegister()
+
+		template<typename... TArgs>
+		DefaultInstanceRegister(TArgs&&... args) :
+			m_Instance(std::move(args)...)
 		{
 			GetShaderDLL()->InsertShader(&m_Instance);
 		}
 
 		bool IsRegistered() { return m_Instance.GetNumParams(); }
 	};
 
-	struct EmptyParams {};
-
-	template<typename T, typename TParams = EmptyParams, ShaderFlags_t FLAGS = ShaderFlags_t(0)>
+	template<typename T, typename TParams = ShaderParams<>, ShaderFlags_t FLAGS = ShaderFlags_t(0)>
 	class ShaderNext : public TParams, public BaseShaderNext
 	{
 	protected:
+		static_assert(is_shader_params_v<TParams>);
+
 		using BaseClass = BaseShaderNext;
+		using Params = TParams;
+
 	public:
-		ShaderNext() : BaseShaderNext(GetAsShaderParams(InitParamIndices(GetParamsObj())), GetShaderParamCount<TParams>())
+		ShaderNext() : BaseShaderNext(TParams::ParamsBase(), TParams::ParamsCount)
 		{
 		}
 
-		TParams& GetParamsObj() { return *this; }
-		const TParams& GetParamsObj() const { return *this; }
+		void InitShaderParams(IMaterialVar** ppParams, const char* pMaterialName) override
+		{
+			BaseClass::InitShaderParams(ppParams, pMaterialName);
+			TParams::InitParamGroups(ppParams);
+		}
 
 		using InstanceRegister = DefaultInstanceRegister<T>;