-added more utility functions for the command buffer and key

Author: tuxalin

CommandBuffer.h

@@ -69,7 +69,7 @@ namespace cb
 		}
 
 		template<typename T>
-		explicit operator T() 
+		explicit operator T()
 		{
 			return(T)key;
 		}
@@ -118,6 +118,8 @@ namespace cb
 		template <class CommandClass, typename AuxilaryData>
 		CommandClass* addCommandData(const key_t& key, const AuxilaryData& data);
 		template <class CommandClass, typename AuxilaryData>
+		CommandClass* addCommandData(const key_t& key, const std::vector<AuxilaryData>& data);
+		template <class CommandClass, typename AuxilaryData>
 		CommandClass* addCommandData(const key_t& key, const AuxilaryData* data, uint32_t count);
 		/// Adds the given command packet with the given key.
 		///@note Only references the original packet's auxiliary data.
@@ -136,6 +138,8 @@ namespace cb
 		template <class CommandClass, class AppendCommandClass, typename AuxilaryData>
 		CommandClass* appendCommandData(AppendCommandClass* cmd, const AuxilaryData& data);
 		template <class CommandClass, class AppendCommandClass, typename AuxilaryData>
+		CommandClass* appendCommandData(AppendCommandClass* prevCmd, const std::vector<AuxilaryData>& data);
+		template <class CommandClass, class AppendCommandClass, typename AuxilaryData>
 		CommandClass* appendCommandData(AppendCommandClass* prevCmd, const AuxilaryData* data, uint32_t count);
 		template <class CommandClass, typename AuxilaryData>
 		CommandClass* appendCommandData(cb::CommandPacket* cmd, const AuxilaryData& data);
@@ -320,10 +324,19 @@ namespace cb
 		return addCommandData<CommandClass>(key, &data, 1);
 	}
 
+	COMMAND_TEMPLATE
+		template <class CommandClass, typename AuxilaryData>
+	CommandClass* COMMAND_QUAL::addCommandData(const key_t& key, const std::vector<AuxilaryData>& data)
+	{
+		return addCommandData<CommandClass>(key, data.data(), data.size());
+	}
+
 	COMMAND_TEMPLATE
 		template <class CommandClass, typename AuxilaryData>
 	CommandClass* COMMAND_QUAL::addCommandData(const key_t& key, const AuxilaryData* data, uint32_t count)
 	{
+		static_assert(cb::detail::is_pod<AuxilaryData>::value, "AUXILARY_DATA_INVALID_TYPE");
+
 		const uint32_t size = sizeof(AuxilaryData) * count;
 		CommandClass*  cmd = addCommand<CommandClass>(key, size);
 
@@ -395,10 +408,19 @@ namespace cb
 		return appendCommandData<CommandClass>(prevCmd, &data, 1);
 	}
 
+	COMMAND_TEMPLATE
+		template <class CommandClass, class AppendCommandClass, typename AuxilaryData>
+	CommandClass* COMMAND_QUAL::appendCommandData(AppendCommandClass* prevCmd, const std::vector<AuxilaryData>& data)
+	{
+		return appendCommandData<CommandClass>(prevCmd, data.data(), data.size());
+	}
+
 	COMMAND_TEMPLATE
 		template <class CommandClass, class AppendCommandClass, typename AuxilaryData>
 	CommandClass* COMMAND_QUAL::appendCommandData(AppendCommandClass* prevCmd, const AuxilaryData* data, uint32_t count)
 	{
+		static_assert(cb::detail::is_pod<AuxilaryData>::value, "AUXILARY_DATA_INVALID_TYPE");
+
 		const uint32_t size = sizeof(AuxilaryData) * count;
 		CommandClass*  cmd = appendCommand<CommandClass>(prevCmd, size);
 
@@ -449,14 +471,14 @@ namespace cb
 		cmd->size = sizeof(AuxilaryData);
 		return packet;
 	}
-	
- 	COMMAND_TEMPLATE
- 		void COMMAND_QUAL::sort(sort_func_t sortFunc /*= std::sort<CommandPair*>*/)
- 	{
+
+	COMMAND_TEMPLATE
+		void COMMAND_QUAL::sort(sort_func_t sortFunc /*= std::sort<CommandPair*>*/)
+	{
 		sortFunc(m_commands.data(), m_commands.data() + (int)m_currentIndex.load(std::memory_order_acquire));
- 
- 		assert(m_commands.size() > m_currentIndex.load(std::memory_order_acquire));
- 	}
+
+		assert(m_commands.size() > m_currentIndex.load(std::memory_order_acquire));
+	}
 
 	COMMAND_TEMPLATE
 		void COMMAND_QUAL::clear()

CommandKeys.h

@@ -137,9 +137,11 @@ namespace cb
 
 		explicit operator uint64_t();
 
-		///@note The priority is inversed, i.e. lower values have highest priority.
+		static DrawKey makeDefault(cb::ViewLayerType viewLayer);
 		static DrawKey makeDefault(uint32_t viewportId, cb::ViewLayerType viewLayer = ViewLayerType::e3D);
+		///@note The priority is inversed, i.e. lower values have highest priority.
 		static DrawKey makeCustom(cb::ViewLayerType viewLayer, uint32_t priority);
+		static DrawKey makeCustom(uint32_t viewportId, cb::ViewLayerType viewLayer, uint32_t priority);
 
 		static void sanityChecks();
 	};  // struct DrawKey
@@ -235,6 +237,13 @@ namespace cb
 		return value > other.value;
 	}
 
+	inline DrawKey DrawKey::makeDefault(cb::ViewLayerType viewLayer)
+	{
+		DrawKey key(0);
+		key.viewLayer = static_cast<uint32_t>(viewLayer);
+		return key;
+	}
+
 	inline DrawKey DrawKey::makeDefault(uint32_t viewportId, cb::ViewLayerType viewLayer)
 	{
 		DrawKey key(0);
@@ -251,6 +260,16 @@ namespace cb
 		return key;
 	}
 
+	inline DrawKey DrawKey::makeCustom(uint32_t viewportId, cb::ViewLayerType viewLayer, uint32_t priority)
+	{
+		DrawKey key(0);
+		key.viewportId = viewportId;
+		key.viewLayer = static_cast<uint32_t>(viewLayer);
+		key.custom.enabled = true;
+		key.custom.priority = (2 << kPriorityBits) - 1 - priority;
+		return key;
+	}
+
 	inline void DrawKey::sanityChecks()
 	{
 		// sanity checks for little-endian platforms