Merge branch 'master' into automatic-file-fix

2021-10-28 09:57:59 +02:00
parent a02b1952c0 7d279dce4b
commit a3d9aaf1fb
55 changed files with 780 additions and 517 deletions
--- a/include/Nazara/Graphics/Enums.hpp
+++ b/include/Nazara/Graphics/Enums.hpp
@@ -50,6 +50,17 @@ namespace Nz
 		Orthographic,
 		Perspective
 	};
+
+	enum class PredefinedShaderBinding
+	{
+		InstanceDataUbo,
+		OverlayTexture,
+		ViewerDataUbo,
+
+		Max = ViewerDataUbo
+	};
+
+	constexpr std::size_t PredefinedShaderBindingCount = static_cast<std::size_t>(PredefinedShaderBinding::Max) + 1;
 }

 #endif // NAZARA_GRAPHICS_ENUMS_HPP