ShaderWriter: Renamed Ubo with UniformBuffer, Ssbo with StorageBuffer…

…, same for Pcb and ArraySsboT.
DragonJoker · Aug 11, 2022 · ec31f19 · ec31f19
1 parent 12119d8
commit ec31f19
Show file tree

Hide file tree

Showing 32 changed files with 316 additions and 316 deletions.
diff --git a/...ShaderWriter/CompositeTypes/ArraySsbo.hpp → ...ter/CompositeTypes/ArrayStorageBuffer.hpp b/...ShaderWriter/CompositeTypes/ArraySsbo.hpp → ...ter/CompositeTypes/ArrayStorageBuffer.hpp
@@ -1,8 +1,8 @@
 /*
 See LICENSE file in root folder
 */
-#ifndef ___SDW_StructuredSsbo_H___
-#define ___SDW_StructuredSsbo_H___
+#ifndef ___SDW_ArrayStorageBuffer_H___
+#define ___SDW_ArrayStorageBuffer_H___
 
 #include "ShaderWriter/BaseTypes/UInt.hpp"
 #include "ShaderWriter/Helpers.hpp"
@@ -13,53 +13,53 @@ See LICENSE file in root folder
 namespace sdw
 {
 	template< typename InstanceT >
-	class ArraySsboT
+	class ArrayStorageBufferT
 	{
 	public:
-		ArraySsboT( ShaderWriter & writer
+		ArrayStorageBufferT( ShaderWriter & writer
 			, std::string instanceName
 			, ast::type::TypePtr dataType
 			, ast::type::MemoryLayout layout
 			, uint32_t bind
 			, uint32_t set
 			, bool enabled );
 
-		ArraySsboT( ShaderWriter & writer
+		ArrayStorageBufferT( ShaderWriter & writer
 			, std::string instanceName
 			, ast::type::BaseStructPtr dataType
 			, uint32_t bind
 			, uint32_t set
 			, bool enabled );
 
 		template< typename ... ParamsT >
-		ArraySsboT( ShaderWriter & writer
+		ArrayStorageBufferT( ShaderWriter & writer
 			, std::string instanceName
 			, uint32_t bind
 			, uint32_t set
 			, bool enabled
 			, ParamsT ... params );
 
 		// From a buffer reference
-		ArraySsboT( ShaderWriter & writer
+		ArrayStorageBufferT( ShaderWriter & writer
 			, std::string instanceName
 			, ast::expr::ExprPtr addressExpr
 			, bool enabled );
 
-		ArraySsboT(ShaderWriter& writer
+		ArrayStorageBufferT(ShaderWriter& writer
 			, std::string instanceName
 			, ast::type::TypePtr dataType
 			, ast::type::MemoryLayout layout
 			, LocationHelper location
 			, bool enabled );
 
-		ArraySsboT(ShaderWriter& writer
+		ArrayStorageBufferT(ShaderWriter& writer
 			, std::string instanceName
 			, ast::type::BaseStructPtr dataType
 			, LocationHelper location
 			, bool enabled );
 
 		template< typename ... ParamsT >
-		ArraySsboT(ShaderWriter& writer
+		ArrayStorageBufferT(ShaderWriter& writer
 			, std::string instanceName
 			, LocationHelper location
 			, bool enabled
@@ -97,6 +97,6 @@ namespace sdw
 		, SsboInfo const & info );
 }
 
-#include "ArraySsbo.inl"
+#include "ArrayStorageBuffer.inl"
 
 #endif
diff --git a/...ShaderWriter/CompositeTypes/ArraySsbo.inl → ...ter/CompositeTypes/ArrayStorageBuffer.inl b/...ShaderWriter/CompositeTypes/ArraySsbo.inl → ...ter/CompositeTypes/ArrayStorageBuffer.inl
@@ -44,7 +44,7 @@ namespace sdw
 	}
 
 	template< typename InstanceT >
-	ArraySsboT< InstanceT >::ArraySsboT( ShaderWriter & writer
+	ArrayStorageBufferT< InstanceT >::ArrayStorageBufferT( ShaderWriter & writer
 		, std::string instanceName
 		, ast::type::TypePtr dataType
 		, ast::type::MemoryLayout layout
@@ -80,7 +80,7 @@ namespace sdw
 	}
 
 	template< typename InstanceT >
-	ArraySsboT< InstanceT >::ArraySsboT( ShaderWriter & writer
+	ArrayStorageBufferT< InstanceT >::ArrayStorageBufferT( ShaderWriter & writer
 		, std::string instanceName
 		, ast::type::BaseStructPtr dataType
 		, uint32_t bind
@@ -116,13 +116,13 @@ namespace sdw
 
 	template< typename InstanceT >
 	template< typename ... ParamsT >
-	ArraySsboT< InstanceT >::ArraySsboT( ShaderWriter & writer
+	ArrayStorageBufferT< InstanceT >::ArrayStorageBufferT( ShaderWriter & writer
 		, std::string instanceName
 		, uint32_t bind
 		, uint32_t set
 		, bool enabled
 		, ParamsT ... params )
-		: ArraySsboT{ writer
+		: ArrayStorageBufferT{ writer
 			, std::move( instanceName )
 			, details::makeSsboType< InstanceT >( writer
 				, enabled
@@ -134,7 +134,7 @@ namespace sdw
 	}
 
 	template< typename InstanceT >
-	ArraySsboT< InstanceT >::ArraySsboT( ShaderWriter & writer
+	ArrayStorageBufferT< InstanceT >::ArrayStorageBufferT( ShaderWriter & writer
 		, std::string instanceName
 		, ast::expr::ExprPtr addressExpr
 		, bool enabled )
@@ -162,13 +162,13 @@ namespace sdw
 	}
 
 	template< typename InstanceT >
-	ArraySsboT< InstanceT >::ArraySsboT( ShaderWriter & writer
+	ArrayStorageBufferT< InstanceT >::ArrayStorageBufferT( ShaderWriter & writer
 		, std::string instanceName
 		, ast::type::TypePtr dataType
 		, ast::type::MemoryLayout layout
 		, LocationHelper location
 		, bool enabled )
-		: ArraySsboT{ writer
+		: ArrayStorageBufferT{ writer
 			, std::move( instanceName )
 			, std::move( dataType )
 			, layout
@@ -179,12 +179,12 @@ namespace sdw
 	}
 
 	template< typename InstanceT >
-	ArraySsboT< InstanceT >::ArraySsboT( ShaderWriter & writer
+	ArrayStorageBufferT< InstanceT >::ArrayStorageBufferT( ShaderWriter & writer
 		, std::string instanceName
 		, ast::type::BaseStructPtr dataType
 		, LocationHelper location
 		, bool enabled )
-		: ArraySsboT{ writer
+		: ArrayStorageBufferT{ writer
 			, std::move( instanceName )
 			, std::move( dataType )
 			, location.binding
@@ -195,12 +195,12 @@ namespace sdw
 
 	template< typename InstanceT >
 	template< typename ... ParamsT >
-	ArraySsboT< InstanceT >::ArraySsboT( ShaderWriter & writer
+	ArrayStorageBufferT< InstanceT >::ArrayStorageBufferT( ShaderWriter & writer
 		, std::string instanceName
 		, LocationHelper location
 		, bool enabled
 		, ParamsT ... params )
-		: ArraySsboT{ writer
+		: ArrayStorageBufferT{ writer
 			, std::move( instanceName )
 			, location.binding
 			, location.set
@@ -210,7 +210,7 @@ namespace sdw
 	}
 
 	template< typename InstanceT >
-	InstanceT ArraySsboT< InstanceT >::operator[]( uint32_t index )const
+	InstanceT ArrayStorageBufferT< InstanceT >::operator[]( uint32_t index )const
 	{
 		return InstanceT{ m_writer
 			, sdw::makeArrayAccess( getNonArrayType( m_dataVar->getType() )
@@ -222,7 +222,7 @@ namespace sdw
 	}
 
 	template< typename InstanceT >
-	InstanceT ArraySsboT< InstanceT >::operator[]( UInt const & index )const
+	InstanceT ArrayStorageBufferT< InstanceT >::operator[]( UInt const & index )const
 	{
 		return InstanceT{ m_writer
 			, sdw::makeArrayAccess( getNonArrayType( m_dataVar->getType() )
@@ -235,7 +235,7 @@ namespace sdw
 
 	template< typename InstanceT >
 	template< typename ... ParamsT >
-	sdw::type::BaseStructPtr ArraySsboT< InstanceT >::makeType( ast::type::TypesCache & cache
+	sdw::type::BaseStructPtr ArrayStorageBufferT< InstanceT >::makeType( ast::type::TypesCache & cache
 		, std::string const & name
 		, ast::type::MemoryLayout layout
 		, bool enabled

diff --git a/include/ShaderWriter/CompositeTypes/BufferReference.hpp b/include/ShaderWriter/CompositeTypes/BufferReference.hpp
@@ -4,8 +4,8 @@ See LICENSE file in root folder
 #ifndef ___SDW_BufferReference_H___
 #define ___SDW_BufferReference_H___
 
-#include "ShaderWriter/CompositeTypes/ArraySsbo.hpp"
-#include "ShaderWriter/CompositeTypes/Ssbo.hpp"
+#include "ShaderWriter/CompositeTypes/ArrayStorageBuffer.hpp"
+#include "ShaderWriter/CompositeTypes/StorageBuffer.hpp"
 
 namespace sdw
 {

diff --git a/include/ShaderWriter/CompositeTypes/Pcb.hpp → ...ter/CompositeTypes/PushConstantBuffer.hpp b/include/ShaderWriter/CompositeTypes/Pcb.hpp → ...ter/CompositeTypes/PushConstantBuffer.hpp
@@ -1,8 +1,8 @@
 /*
 See LICENSE file in root folder
 */
-#ifndef ___SDW_Pcb_H___
-#define ___SDW_Pcb_H___
+#ifndef ___SDW_PushConstantBuffer_H___
+#define ___SDW_PushConstantBuffer_H___
 #pragma once
 
 #include "ShaderWriter/CompositeTypes/StructHelper.hpp"
@@ -12,10 +12,10 @@ See LICENSE file in root folder
 
 namespace sdw
 {
-	class Pcb
+	class PushConstantBuffer
 	{
 	public:
-		SDW_API Pcb( ShaderWriter & writer
+		SDW_API PushConstantBuffer( ShaderWriter & writer
 			, std::string name
 			, ast::type::MemoryLayout layout = ast::type::MemoryLayout::eC
 			, bool enabled = true );
@@ -69,28 +69,28 @@ namespace sdw
 
 	template< ast::type::MemoryLayout LayoutT
 		, typename... FieldsT >
-	class PcbHelperT
-		: public StructHelperT< Pcb, LayoutT, FieldsT... >
+	class PushConstantBufferHelperT
+		: public StructHelperT< PushConstantBuffer, LayoutT, FieldsT... >
 	{
 	public:
-		PcbHelperT( ShaderWriter & writer, const std::string & name )
-			: StructHelperT< Pcb, LayoutT, FieldsT... >{ writer, name, LayoutT }
+		PushConstantBufferHelperT( ShaderWriter & writer, const std::string & name )
+			: StructHelperT< PushConstantBuffer, LayoutT, FieldsT... >{ writer, name, LayoutT }
 		{
 		}
 	};
 
 	template< typename... FieldsT >
-	using PcbHelperStd140T = PcbHelperT< ast::type::MemoryLayout::eStd140, FieldsT... >;
+	using PushConstantBufferHelperStd140T = PushConstantBufferHelperT< ast::type::MemoryLayout::eStd140, FieldsT... >;
 	template< typename... FieldsT >
-	using PcbHelperStd430T = PcbHelperT< ast::type::MemoryLayout::eStd430, FieldsT... >;
+	using PushConstantBufferHelperStd430T = PushConstantBufferHelperT< ast::type::MemoryLayout::eStd430, FieldsT... >;
 	template< typename... FieldsT >
-	using PcbHelperScalarT = PcbHelperT< ast::type::MemoryLayout::eScalar, FieldsT... >;
+	using PushConstantBufferHelperScalarT = PushConstantBufferHelperT< ast::type::MemoryLayout::eScalar, FieldsT... >;
 	template< typename... FieldsT >
-	using PcbHelperCT = PcbHelperT< ast::type::MemoryLayout::eC, FieldsT... >;
+	using PushConstantBufferHelperCT = PushConstantBufferHelperT< ast::type::MemoryLayout::eC, FieldsT... >;
 
 #endif
 }
 
-#include "Pcb.inl"
+#include "PushConstantBuffer.inl"
 
 #endif
diff --git a/include/ShaderWriter/CompositeTypes/Pcb.inl → ...ter/CompositeTypes/PushConstantBuffer.inl b/include/ShaderWriter/CompositeTypes/Pcb.inl → ...ter/CompositeTypes/PushConstantBuffer.inl
@@ -4,7 +4,7 @@ See LICENSE file in root folder
 namespace sdw
 {
 	template< typename ValueT, typename ... ParamsT >
-	inline ValueT Pcb::declMember( std::string name
+	inline ValueT PushConstantBuffer::declMember( std::string name
 		, bool enabled
 		, ParamsT ... params )
 	{
@@ -24,7 +24,7 @@ namespace sdw
 	}
 
 	template< typename ValueT, typename ... ParamsT >
-	inline Array< ValueT > Pcb::declMember( std::string name
+	inline Array< ValueT > PushConstantBuffer::declMember( std::string name
 		, uint32_t dimension
 		, bool enabled
 		, ParamsT ... params )
@@ -46,7 +46,7 @@ namespace sdw
 	}
 
 	template< typename ValueT, typename ... ParamsT >
-	inline Array< ValueT > Pcb::declMemberArray( std::string name
+	inline Array< ValueT > PushConstantBuffer::declMemberArray( std::string name
 		, bool enabled
 		, ParamsT ... params )
 	{
@@ -67,7 +67,7 @@ namespace sdw
 	}
 
 	template< typename ValueT >
-	inline ValueT Pcb::getMember( std::string_view name
+	inline ValueT PushConstantBuffer::getMember( std::string_view name
 		, bool enabled )const
 	{
 		auto var = getMemberVar( m_writer, m_var, name );
@@ -77,7 +77,7 @@ namespace sdw
 	}
 
 	template< typename ValueT >
-	inline Array< ValueT > Pcb::getMemberArray( std::string_view name
+	inline Array< ValueT > PushConstantBuffer::getMemberArray( std::string_view name
 		, bool enabled )const
 	{
 		auto var = getMemberVar( m_writer, m_var, name );

diff --git a/include/ShaderWriter/CompositeTypes/Ssbo.hpp → ...erWriter/CompositeTypes/StorageBuffer.hpp b/include/ShaderWriter/CompositeTypes/Ssbo.hpp → ...erWriter/CompositeTypes/StorageBuffer.hpp
@@ -1,8 +1,8 @@
 /*
 See LICENSE file in root folder
 */
-#ifndef ___SDW_Ssbo_H___
-#define ___SDW_Ssbo_H___
+#ifndef ___SDW_StorageBuffer_H___
+#define ___SDW_StorageBuffer_H___
 #pragma once
 
 #include "ShaderWriter/CompositeTypes/StructHelper.hpp"
@@ -13,16 +13,16 @@ See LICENSE file in root folder
 
 namespace sdw
 {
-	class Ssbo
+	class StorageBuffer
 	{
 	public:
-		SDW_API Ssbo( ShaderWriter & writer
+		SDW_API StorageBuffer( ShaderWriter & writer
 			, std::string name
 			, uint32_t bind
 			, uint32_t set
 			, ast::type::MemoryLayout layout = ast::type::MemoryLayout::eStd430
 			, bool enabled = true );
-		inline Ssbo( ShaderWriter & writer
+		inline StorageBuffer( ShaderWriter & writer
 			, std::string name
 			, LocationHelper location
 			, ast::type::MemoryLayout layout = ast::type::MemoryLayout::eStd430
@@ -78,30 +78,30 @@ namespace sdw
 
 	template< ast::type::MemoryLayout LayoutT
 		, typename ... FieldsT >
-	class SsboHelperT
-		: public StructHelperT< Ssbo, LayoutT, FieldsT... >
+	class StorageBufferHelperT
+		: public StructHelperT< StorageBuffer, LayoutT, FieldsT... >
 	{
 	public:
-		SsboHelperT( ShaderWriter & writer, const std::string & name, uint32_t bind, uint32_t set )
-			: StructHelperT< Ssbo, LayoutT, FieldsT... >{ writer, name, bind, set, LayoutT }
+		StorageBufferHelperT( ShaderWriter & writer, const std::string & name, uint32_t bind, uint32_t set )
+			: StructHelperT< StorageBuffer, LayoutT, FieldsT... >{ writer, name, bind, set, LayoutT }
 		{
 		}
-		SsboHelperT( ShaderWriter & writer, const std::string & name, LocationHelper location )
-			: SsboHelperT{ writer, name, location.binding, location.set }
+		StorageBufferHelperT( ShaderWriter & writer, const std::string & name, LocationHelper location )
+			: StorageBufferHelperT{ writer, name, location.binding, location.set }
 		{
 		}
 	};
 
 	template< typename... FieldsT >
-	using SsboHelperStd140T = SsboHelperT< ast::type::MemoryLayout::eStd140, FieldsT... >;
+	using StorageBufferHelperStd140T = StorageBufferHelperT< ast::type::MemoryLayout::eStd140, FieldsT... >;
 	template< typename... FieldsT >
-	using SsboHelperStd430T = SsboHelperT< ast::type::MemoryLayout::eStd430, FieldsT... >;
+	using StorageBufferHelperStd430T = StorageBufferHelperT< ast::type::MemoryLayout::eStd430, FieldsT... >;
 	template< typename... FieldsT >
-	using SsboHelperScalarT = SsboHelperT< ast::type::MemoryLayout::eScalar, FieldsT... >;
+	using StorageBufferHelperScalarT = StorageBufferHelperT< ast::type::MemoryLayout::eScalar, FieldsT... >;
 
 #endif
 }
 
-#include "Ssbo.inl"
+#include "StorageBuffer.inl"
 
 #endif