diff --git a/include/ShaderWriter/CompositeTypes/ArraySsbo.hpp b/include/ShaderWriter/CompositeTypes/ArrayStorageBuffer.hpp similarity index 81% rename from include/ShaderWriter/CompositeTypes/ArraySsbo.hpp rename to include/ShaderWriter/CompositeTypes/ArrayStorageBuffer.hpp index 9089f645..4692fe76 100644 --- a/include/ShaderWriter/CompositeTypes/ArraySsbo.hpp +++ b/include/ShaderWriter/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,10 +13,10 @@ 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 @@ -24,7 +24,7 @@ namespace sdw , uint32_t set , bool enabled ); - ArraySsboT( ShaderWriter & writer + ArrayStorageBufferT( ShaderWriter & writer , std::string instanceName , ast::type::BaseStructPtr dataType , uint32_t bind @@ -32,7 +32,7 @@ namespace sdw , bool enabled ); template< typename ... ParamsT > - ArraySsboT( ShaderWriter & writer + ArrayStorageBufferT( ShaderWriter & writer , std::string instanceName , uint32_t bind , uint32_t set @@ -40,26 +40,26 @@ namespace sdw , 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/include/ShaderWriter/CompositeTypes/ArraySsbo.inl b/include/ShaderWriter/CompositeTypes/ArrayStorageBuffer.inl similarity index 87% rename from include/ShaderWriter/CompositeTypes/ArraySsbo.inl rename to include/ShaderWriter/CompositeTypes/ArrayStorageBuffer.inl index 4b559be6..60558ad1 100644 --- a/include/ShaderWriter/CompositeTypes/ArraySsbo.inl +++ b/include/ShaderWriter/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 index 9be2032a..b6d8aedc 100644 --- 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 b/include/ShaderWriter/CompositeTypes/PushConstantBuffer.hpp similarity index 67% rename from include/ShaderWriter/CompositeTypes/Pcb.hpp rename to include/ShaderWriter/CompositeTypes/PushConstantBuffer.hpp index 2d8b945a..1f487d6b 100644 --- a/include/ShaderWriter/CompositeTypes/Pcb.hpp +++ b/include/ShaderWriter/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 b/include/ShaderWriter/CompositeTypes/PushConstantBuffer.inl similarity index 84% rename from include/ShaderWriter/CompositeTypes/Pcb.inl rename to include/ShaderWriter/CompositeTypes/PushConstantBuffer.inl index ecf7b9c8..25b4e949 100644 --- a/include/ShaderWriter/CompositeTypes/Pcb.inl +++ b/include/ShaderWriter/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 b/include/ShaderWriter/CompositeTypes/StorageBuffer.hpp similarity index 68% rename from include/ShaderWriter/CompositeTypes/Ssbo.hpp rename to include/ShaderWriter/CompositeTypes/StorageBuffer.hpp index a70186c7..2109f03e 100644 --- a/include/ShaderWriter/CompositeTypes/Ssbo.hpp +++ b/include/ShaderWriter/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 diff --git a/include/ShaderWriter/CompositeTypes/Ssbo.inl b/include/ShaderWriter/CompositeTypes/StorageBuffer.inl similarity index 80% rename from include/ShaderWriter/CompositeTypes/Ssbo.inl rename to include/ShaderWriter/CompositeTypes/StorageBuffer.inl index e32a9aeb..08c662db 100644 --- a/include/ShaderWriter/CompositeTypes/Ssbo.inl +++ b/include/ShaderWriter/CompositeTypes/StorageBuffer.inl @@ -3,22 +3,22 @@ See LICENSE file in root folder */ namespace sdw { - inline Ssbo::Ssbo( ShaderWriter & writer + inline StorageBuffer::StorageBuffer( ShaderWriter & writer , std::string name , LocationHelper location , ast::type::MemoryLayout layout , bool enabled ) - : Ssbo( writer - , std::move( name ) - , location.binding - , location.set - , layout - , enabled ) + : StorageBuffer( writer + , std::move( name ) + , location.binding + , location.set + , layout + , enabled ) { } template< typename ValueT, typename ... ParamsT > - inline ValueT Ssbo::declMember( std::string name + inline ValueT StorageBuffer::declMember( std::string name , bool enabled , ParamsT ... params ) { @@ -37,7 +37,7 @@ namespace sdw } template< typename ValueT, typename ... ParamsT > - inline Array< ValueT > Ssbo::declMember( std::string name + inline Array< ValueT > StorageBuffer::declMember( std::string name , uint32_t dimension , bool enabled , ParamsT ... params ) @@ -58,7 +58,7 @@ namespace sdw } template< typename ValueT, typename ... ParamsT > - inline Array< ValueT > Ssbo::declMemberArray( std::string name + inline Array< ValueT > StorageBuffer::declMemberArray( std::string name , bool enabled , ParamsT ... params ) { @@ -78,7 +78,7 @@ namespace sdw } template< typename ValueT > - inline ValueT Ssbo::getMember( std::string_view name + inline ValueT StorageBuffer::getMember( std::string_view name , bool enabled )const { auto var = getMemberVar( m_writer, m_var, name ); @@ -88,7 +88,7 @@ namespace sdw } template< typename ValueT > - inline Array< ValueT > Ssbo::getMemberArray( std::string_view name + inline Array< ValueT > StorageBuffer::getMemberArray( std::string_view name , bool enabled )const { auto var = getMemberVar( m_writer, m_var, name ); diff --git a/include/ShaderWriter/CompositeTypes/Ubo.hpp b/include/ShaderWriter/CompositeTypes/UniformBuffer.hpp similarity index 73% rename from include/ShaderWriter/CompositeTypes/Ubo.hpp rename to include/ShaderWriter/CompositeTypes/UniformBuffer.hpp index 91c904c0..f0802349 100644 --- a/include/ShaderWriter/CompositeTypes/Ubo.hpp +++ b/include/ShaderWriter/CompositeTypes/UniformBuffer.hpp @@ -1,8 +1,8 @@ /* See LICENSE file in root folder */ -#ifndef ___SDW_Ubo_H___ -#define ___SDW_Ubo_H___ +#ifndef ___SDW_UniformBuffer_H___ +#define ___SDW_UniformBuffer_H___ #pragma once #include "ShaderWriter/CompositeTypes/StructHelper.hpp" @@ -13,16 +13,16 @@ See LICENSE file in root folder namespace sdw { - class Ubo + class UniformBuffer { public: - SDW_API Ubo( ShaderWriter & writer + SDW_API UniformBuffer( ShaderWriter & writer , std::string name , uint32_t bind , uint32_t set , ast::type::MemoryLayout layout = ast::type::MemoryLayout::eStd140 , bool enabled = true ); - inline Ubo( ShaderWriter & writer + inline UniformBuffer( ShaderWriter & writer , std::string name , LocationHelper location , ast::type::MemoryLayout layout = ast::type::MemoryLayout::eStd140 @@ -78,33 +78,33 @@ namespace sdw template< ast::type::MemoryLayout LayoutT , typename... FieldsT > - class UboHelperT - : public StructHelperT< Ubo, LayoutT, FieldsT... > + class UniformBufferHelperT + : public StructHelperT< UniformBuffer, LayoutT, FieldsT... > { public: - UboHelperT( ShaderWriter & writer + UniformBufferHelperT( ShaderWriter & writer , std::string name , uint32_t bind , uint32_t set ) - : StructHelperT< Ubo, LayoutT, FieldsT... >{ writer, std::move( name ), bind, set, LayoutT } + : StructHelperT< UniformBuffer, LayoutT, FieldsT... >{ writer, std::move( name ), bind, set, LayoutT } { } - UboHelperT( ShaderWriter & writer + UniformBufferHelperT( ShaderWriter & writer , std::string name , LocationHelper location ) - : UboHelperT{ writer, std::move( name ), location.binding, location.set } + : UniformBufferHelperT{ writer, std::move( name ), location.binding, location.set } { } }; template< typename... FieldsT > - using UboHelperStd140T = UboHelperT< ast::type::MemoryLayout::eStd140, FieldsT... >; + using UniformBufferHelperStd140T = UniformBufferHelperT< ast::type::MemoryLayout::eStd140, FieldsT... >; template< typename... FieldsT > - using UboHelperStd430T = UboHelperT< ast::type::MemoryLayout::eStd430, FieldsT... >; + using UniformBufferHelperStd430T = UniformBufferHelperT< ast::type::MemoryLayout::eStd430, FieldsT... >; #endif } -#include "Ubo.inl" +#include "UniformBuffer.inl" #endif diff --git a/include/ShaderWriter/CompositeTypes/Ubo.inl b/include/ShaderWriter/CompositeTypes/UniformBuffer.inl similarity index 80% rename from include/ShaderWriter/CompositeTypes/Ubo.inl rename to include/ShaderWriter/CompositeTypes/UniformBuffer.inl index 8cd652f5..082aef45 100644 --- a/include/ShaderWriter/CompositeTypes/Ubo.inl +++ b/include/ShaderWriter/CompositeTypes/UniformBuffer.inl @@ -3,22 +3,22 @@ See LICENSE file in root folder */ namespace sdw { - inline Ubo::Ubo( ShaderWriter & writer + inline UniformBuffer::UniformBuffer( ShaderWriter & writer , std::string name , LocationHelper location , ast::type::MemoryLayout layout , bool enabled ) - : Ubo{ writer - , std::move( name ) - , location.binding - , location.set - , layout - , enabled } + : UniformBuffer{ writer + , std::move( name ) + , location.binding + , location.set + , layout + , enabled } { } template< typename ValueT, typename ... ParamsT > - inline ValueT Ubo::declMember( std::string name + inline ValueT UniformBuffer::declMember( std::string name , bool enabled , ParamsT ... params ) { @@ -38,7 +38,7 @@ namespace sdw } template< typename ValueT, typename ... ParamsT > - inline Array< ValueT > Ubo::declMember( std::string name + inline Array< ValueT > UniformBuffer::declMember( std::string name , uint32_t dimension , bool enabled , ParamsT ... params ) @@ -60,7 +60,7 @@ namespace sdw } template< typename ValueT, typename ... ParamsT > - inline Array< ValueT > Ubo::declMemberArray( std::string name + inline Array< ValueT > UniformBuffer::declMemberArray( std::string name , bool enabled , ParamsT ... params ) { @@ -81,7 +81,7 @@ namespace sdw } template< typename T > - inline T Ubo::getMember( std::string_view name + inline T UniformBuffer::getMember( std::string_view name , bool enabled )const { auto var = getMemberVar( m_writer, m_var, name ); @@ -91,7 +91,7 @@ namespace sdw } template< typename T > - inline Array< T > Ubo::getMemberArray( std::string_view name + inline Array< T > UniformBuffer::getMemberArray( std::string_view name , bool enabled )const { auto var = getMemberVar( m_writer, m_var, name ); diff --git a/include/ShaderWriter/ShaderWriterPrerequisites.hpp b/include/ShaderWriter/ShaderWriterPrerequisites.hpp index ca44445d..bebf70ce 100644 --- a/include/ShaderWriter/ShaderWriterPrerequisites.hpp +++ b/include/ShaderWriter/ShaderWriterPrerequisites.hpp @@ -160,12 +160,12 @@ namespace sdw class Struct; class StructInstance; - class Pcb; - class Ssbo; - class Ubo; + class PushConstantBuffer; + class StorageBuffer; + class UniformBuffer; template< typename InstanceT > - class ArraySsboT; + class ArrayStorageBufferT; /**@}*/ #pragma endregion #pragma region Shader I/O diff --git a/include/ShaderWriter/Source.hpp b/include/ShaderWriter/Source.hpp index ac9f0688..169b3d42 100644 --- a/include/ShaderWriter/Source.hpp +++ b/include/ShaderWriter/Source.hpp @@ -4,12 +4,12 @@ See LICENSE file in root folder #include "ShaderWriter/BaseTypes/AccelerationStructure.hpp" #include "ShaderWriter/CompositeTypes/Function.hpp" -#include "ShaderWriter/CompositeTypes/Pcb.hpp" -#include "ShaderWriter/CompositeTypes/Ssbo.hpp" +#include "ShaderWriter/CompositeTypes/PushConstantBuffer.hpp" +#include "ShaderWriter/CompositeTypes/StorageBuffer.hpp" #include "ShaderWriter/CompositeTypes/Struct.hpp" #include "ShaderWriter/CompositeTypes/StructInstance.hpp" -#include "ShaderWriter/CompositeTypes/ArraySsbo.hpp" -#include "ShaderWriter/CompositeTypes/Ubo.hpp" +#include "ShaderWriter/CompositeTypes/ArrayStorageBuffer.hpp" +#include "ShaderWriter/CompositeTypes/UniformBuffer.hpp" #include "ShaderWriter/MatTypes/Mat2.hpp" #include "ShaderWriter/MatTypes/Mat2x3.hpp" diff --git a/include/ShaderWriter/Writer.hpp b/include/ShaderWriter/Writer.hpp index af6c09da..94ff8996 100644 --- a/include/ShaderWriter/Writer.hpp +++ b/include/ShaderWriter/Writer.hpp @@ -8,14 +8,14 @@ See LICENSE file in root folder #include "ShaderWriter/BaseTypes/RayPayload.hpp" #include "ShaderWriter/BaseTypes/SampledImage.hpp" #include "ShaderWriter/BaseTypes/TaskPayload.hpp" -#include "ShaderWriter/CompositeTypes/ArraySsbo.hpp" +#include "ShaderWriter/CompositeTypes/ArrayStorageBuffer.hpp" #include "ShaderWriter/CompositeTypes/BufferReference.hpp" #include "ShaderWriter/CompositeTypes/Builtins.hpp" #include "ShaderWriter/CompositeTypes/Function.hpp" -#include "ShaderWriter/CompositeTypes/Pcb.hpp" -#include "ShaderWriter/CompositeTypes/Ssbo.hpp" +#include "ShaderWriter/CompositeTypes/PushConstantBuffer.hpp" +#include "ShaderWriter/CompositeTypes/StorageBuffer.hpp" #include "ShaderWriter/CompositeTypes/Struct.hpp" -#include "ShaderWriter/CompositeTypes/Ubo.hpp" +#include "ShaderWriter/CompositeTypes/UniformBuffer.hpp" #include "ShaderWriter/Helpers.hpp" #include @@ -712,14 +712,14 @@ namespace sdw * Uniform buffer declaration. */ /**@{*/ - template< typename T = Ubo, typename ... ParamsT > + template< typename T = UniformBuffer, typename ... ParamsT > inline T declUniformBuffer( std::string name , uint32_t binding , uint32_t set , ast::type::MemoryLayout layout = ast::type::MemoryLayout::eStd140 , bool enabled = true , ParamsT ... params ); - template< typename T = Ubo, typename ... ParamsT > + template< typename T = UniformBuffer, typename ... ParamsT > inline T declUniformBuffer( std::string name , LocationHelper location , ast::type::MemoryLayout layout = ast::type::MemoryLayout::eStd140 @@ -733,7 +733,7 @@ namespace sdw * Shader storage buffer declaration. */ /**@{*/ - template< typename T = Ssbo, typename ... ParamsT > + template< typename T = StorageBuffer, typename ... ParamsT > inline T declStorageBuffer( std::string name , uint32_t binding , uint32_t set @@ -741,19 +741,19 @@ namespace sdw , bool enabled = true , ParamsT ... params ); template< typename T, typename ... ParamsT > - inline ArraySsboT< T > declArrayStorageBuffer( std::string name + inline ArrayStorageBufferT< T > declArrayStorageBuffer( std::string name , uint32_t binding , uint32_t set , bool enabled = true , ParamsT ... params ); - template< typename T = Ssbo, typename ... ParamsT > + template< typename T = StorageBuffer, typename ... ParamsT > inline T declStorageBuffer( std::string name , LocationHelper location , ast::type::MemoryLayout layout = ast::type::MemoryLayout::eStd430 , bool enabled = true , ParamsT ... params ); template< typename T, typename ... ParamsT > - inline ArraySsboT< T > declArrayStorageBuffer( std::string name + inline ArrayStorageBufferT< T > declArrayStorageBuffer( std::string name , LocationHelper location , bool enabled = true , ParamsT ... params ); @@ -779,7 +779,7 @@ namespace sdw * Push constants buffer declaration. */ /**@{*/ - template< typename T = Pcb, typename ... ParamsT > + template< typename T = PushConstantBuffer, typename ... ParamsT > inline T declPushConstantsBuffer( std::string name , ast::type::MemoryLayout layout = ast::type::MemoryLayout::eC , bool enabled = true diff --git a/include/ShaderWriter/Writer.inl b/include/ShaderWriter/Writer.inl index f16dd669..72343896 100644 --- a/include/ShaderWriter/Writer.inl +++ b/include/ShaderWriter/Writer.inl @@ -627,9 +627,9 @@ namespace sdw , ast::type::ImageDim DimT , bool ArrayedT , bool MsT > - inline SampledImageT< FormatT, DimT, ArrayedT, MsT > ShaderWriter::declSampledImg(std::string name - , LocationHelper location - , bool enabled) + inline SampledImageT< FormatT, DimT, ArrayedT, MsT > ShaderWriter::declSampledImg( std::string name + , LocationHelper location + , bool enabled ) { return declSampledImg< FormatT, DimT, ArrayedT, MsT >( std::move( name ) , location.binding @@ -638,9 +638,9 @@ namespace sdw } template< typename T > - inline T ShaderWriter::declSampledImg(std::string name + inline T ShaderWriter::declSampledImg( std::string name , LocationHelper location - , bool enabled) + , bool enabled ) { return declSampledImg< T >( std::move( name ) , location.binding @@ -652,10 +652,10 @@ namespace sdw , ast::type::ImageDim DimT , bool ArrayedT , bool MsT > - inline Array< SampledImageT< FormatT, DimT, ArrayedT, MsT > > ShaderWriter::declSampledImgArray(std::string name - , LocationHelper location - , uint32_t dimension - , bool enabled) + inline Array< SampledImageT< FormatT, DimT, ArrayedT, MsT > > ShaderWriter::declSampledImgArray( std::string name + , LocationHelper location + , uint32_t dimension + , bool enabled ) { return declSampledImgArray< FormatT, DimT, ArrayedT, MsT >( std::move( name ) , location.binding @@ -665,10 +665,10 @@ namespace sdw } template< typename T > - inline Array< T > ShaderWriter::declSampledImgArray(std::string name + inline Array< T > ShaderWriter::declSampledImgArray( std::string name , LocationHelper location , uint32_t dimension - , bool enabled) + , bool enabled ) { return declSampledImgArray< T >( std::move( name ) , location.binding @@ -681,9 +681,9 @@ namespace sdw , ast::type::ImageDim DimT , bool ArrayedT , bool MsT > - inline Array< SampledImageT< FormatT, DimT, ArrayedT, MsT > > ShaderWriter::declSampledImgArray(std::string name - , LocationHelper location - , bool enabled) + inline Array< SampledImageT< FormatT, DimT, ArrayedT, MsT > > ShaderWriter::declSampledImgArray( std::string name + , LocationHelper location + , bool enabled ) { return declSampledImgArray< FormatT, DimT, ArrayedT, MsT >( std::move( name ) , location.binding @@ -692,9 +692,9 @@ namespace sdw } template< typename T > - inline Array< T > ShaderWriter::declSampledImgArray(std::string name + inline Array< T > ShaderWriter::declSampledImgArray( std::string name , LocationHelper location - , bool enabled) + , bool enabled ) { return declSampledImgArray< T >( std::move( name ) , location.binding @@ -848,9 +848,9 @@ namespace sdw , bool ArrayedT , bool MsT , bool DepthT > - inline CombinedImageT< FormatT, DimT, ArrayedT, MsT, DepthT > ShaderWriter::declCombinedImg(std::string name - , LocationHelper location - , bool enabled) + inline CombinedImageT< FormatT, DimT, ArrayedT, MsT, DepthT > ShaderWriter::declCombinedImg( std::string name + , LocationHelper location + , bool enabled ) { return declCombinedImg< FormatT, DimT, ArrayedT, MsT, DepthT >( std::move( name ) , location.binding @@ -859,9 +859,9 @@ namespace sdw } template< typename T > - inline T ShaderWriter::declCombinedImg(std::string name + inline T ShaderWriter::declCombinedImg( std::string name , LocationHelper location - , bool enabled) + , bool enabled ) { return declCombinedImg< T >( std::move( name ) , location.binding @@ -874,10 +874,10 @@ namespace sdw , bool ArrayedT , bool MsT , bool DepthT > - inline Array< CombinedImageT< FormatT, DimT, ArrayedT, MsT, DepthT > > ShaderWriter::declCombinedImgArray(std::string name - , LocationHelper location - , uint32_t dimension - , bool enabled) + inline Array< CombinedImageT< FormatT, DimT, ArrayedT, MsT, DepthT > > ShaderWriter::declCombinedImgArray( std::string name + , LocationHelper location + , uint32_t dimension + , bool enabled ) { return declCombinedImgArray< FormatT, DimT, ArrayedT, MsT, DepthT >( std::move( name ) , location.binding @@ -887,10 +887,10 @@ namespace sdw } template< typename T > - inline Array< T > ShaderWriter::declCombinedImgArray(std::string name + inline Array< T > ShaderWriter::declCombinedImgArray( std::string name , LocationHelper location , uint32_t dimension - , bool enabled) + , bool enabled ) { return declCombinedImgArray< T >( std::move( name ) , location.binding @@ -904,9 +904,9 @@ namespace sdw , bool ArrayedT , bool MsT , bool DepthT > - inline Array< CombinedImageT< FormatT, DimT, ArrayedT, MsT, DepthT > > ShaderWriter::declCombinedImgArray(std::string name - , LocationHelper location - , bool enabled) + inline Array< CombinedImageT< FormatT, DimT, ArrayedT, MsT, DepthT > > ShaderWriter::declCombinedImgArray( std::string name + , LocationHelper location + , bool enabled ) { return declCombinedImgArray< FormatT, DimT, ArrayedT, MsT, DepthT >( std::move( name ) , location.binding @@ -915,9 +915,9 @@ namespace sdw } template< typename T > - inline Array< T > ShaderWriter::declCombinedImgArray(std::string name + inline Array< T > ShaderWriter::declCombinedImgArray( std::string name , LocationHelper location - , bool enabled) + , bool enabled ) { return declCombinedImgArray< T >( std::move( name ) , location.binding @@ -937,10 +937,10 @@ namespace sdw , ast::type::ImageDim DimT , bool ArrayedT , bool MsT > - inline StorageImageT< FormatT, AccessT, DimT, ArrayedT, MsT > ShaderWriter::declStorageImg( std::string name - , uint32_t binding - , uint32_t set - , bool enabled ) + inline StorageImageT< FormatT, AccessT, DimT, ArrayedT, MsT > ShaderWriter::declStorageImg( std::string name + , uint32_t binding + , uint32_t set + , bool enabled ) { using T = StorageImageT< FormatT, AccessT, DimT, ArrayedT, MsT >; auto type = T::makeType( getTypesCache() ); @@ -963,10 +963,10 @@ namespace sdw } template< typename T > - inline T ShaderWriter::declStorageImg( std::string name - , uint32_t binding - , uint32_t set - , bool enabled ) + inline T ShaderWriter::declStorageImg( std::string name + , uint32_t binding + , uint32_t set + , bool enabled ) { return declStorageImg < T::Format , T::Access @@ -983,11 +983,11 @@ namespace sdw , ast::type::ImageDim DimT , bool ArrayedT , bool MsT > - inline Array< StorageImageT< FormatT, AccessT, DimT, ArrayedT, MsT > > ShaderWriter::declStorageImgArray( std::string name - , uint32_t binding - , uint32_t set - , uint32_t dimension - , bool enabled ) + inline Array< StorageImageT< FormatT, AccessT, DimT, ArrayedT, MsT > > ShaderWriter::declStorageImgArray( std::string name + , uint32_t binding + , uint32_t set + , uint32_t dimension + , bool enabled ) { using T = StorageImageT< FormatT, AccessT, DimT, ArrayedT, MsT >; auto type = Array< T >::makeType( getTypesCache() @@ -1011,11 +1011,11 @@ namespace sdw } template< typename T > - inline Array< T > ShaderWriter::declStorageImgArray( std::string name - , uint32_t binding - , uint32_t set - , uint32_t dimension - , bool enabled ) + inline Array< T > ShaderWriter::declStorageImgArray( std::string name + , uint32_t binding + , uint32_t set + , uint32_t dimension + , bool enabled ) { return declStorageImgArray < T::Format , T::Access @@ -1071,9 +1071,9 @@ namespace sdw , ast::type::ImageDim DimT , bool ArrayedT , bool MsT > - inline StorageImageT< FormatT, AccessT, DimT, ArrayedT, MsT > ShaderWriter::declStorageImg(std::string name - , LocationHelper location - , bool enabled) + inline StorageImageT< FormatT, AccessT, DimT, ArrayedT, MsT > ShaderWriter::declStorageImg( std::string name + , LocationHelper location + , bool enabled ) { return declStorageImg< FormatT, AccessT, DimT, ArrayedT, MsT >( std::move ( name ) , location.binding @@ -1082,9 +1082,9 @@ namespace sdw } template< typename T > - inline T ShaderWriter::declStorageImg(std::string name + inline T ShaderWriter::declStorageImg( std::string name , LocationHelper location - , bool enabled) + , bool enabled ) { return declStorageImg< T >( std::move ( name ) , location.binding @@ -1097,10 +1097,10 @@ namespace sdw , ast::type::ImageDim DimT , bool ArrayedT , bool MsT > - inline Array< StorageImageT< FormatT, AccessT, DimT, ArrayedT, MsT > > ShaderWriter::declStorageImgArray(std::string name - , LocationHelper location - , uint32_t dimension - , bool enabled) + inline Array< StorageImageT< FormatT, AccessT, DimT, ArrayedT, MsT > > ShaderWriter::declStorageImgArray( std::string name + , LocationHelper location + , uint32_t dimension + , bool enabled ) { return declStorageImgArray< FormatT, AccessT, DimT, ArrayedT, MsT >( std::move ( name ) , location.binding @@ -1110,10 +1110,10 @@ namespace sdw } template< typename T > - inline Array< T > ShaderWriter::declStorageImgArray(std::string name + inline Array< T > ShaderWriter::declStorageImgArray( std::string name , LocationHelper location , uint32_t dimension - , bool enabled) + , bool enabled ) { return declStorageImgArray< T >( std::move ( name ) , location.binding @@ -1127,9 +1127,9 @@ namespace sdw , ast::type::ImageDim DimT , bool ArrayedT , bool MsT > - inline Array< StorageImageT< FormatT, AccessT, DimT, ArrayedT, MsT > > ShaderWriter::declStorageImgArray(std::string name - , LocationHelper location - , bool enabled) + inline Array< StorageImageT< FormatT, AccessT, DimT, ArrayedT, MsT > > ShaderWriter::declStorageImgArray( std::string name + , LocationHelper location + , bool enabled ) { return declStorageImgArray< FormatT, AccessT, DimT, ArrayedT, MsT >( std::move ( name ) , location.binding @@ -1138,9 +1138,9 @@ namespace sdw } template< typename T > - inline Array< T > ShaderWriter::declStorageImgArray(std::string name + inline Array< T > ShaderWriter::declStorageImgArray( std::string name , LocationHelper location - , bool enabled) + , bool enabled ) { return declStorageImgArray< T >( std::move ( name ) , location.binding @@ -1604,13 +1604,13 @@ namespace sdw } template< typename T, typename ... ParamsT > - inline ArraySsboT< T > ShaderWriter::declArrayStorageBuffer( std::string name + inline ArrayStorageBufferT< T > ShaderWriter::declArrayStorageBuffer( std::string name , uint32_t binding , uint32_t set , bool enabled , ParamsT ... params ) { - return ArraySsboT< T >{ *this + return ArrayStorageBufferT< T >{ *this , std::move( name ) , binding , set @@ -1634,7 +1634,7 @@ namespace sdw } template< typename T, typename ... ParamsT > - inline ArraySsboT< T > ShaderWriter::declArrayStorageBuffer(std::string name + inline ArrayStorageBufferT< T > ShaderWriter::declArrayStorageBuffer(std::string name , LocationHelper location , bool enabled , ParamsT ... params ) diff --git a/source/ShaderWriter/CMakeLists.txt b/source/ShaderWriter/CMakeLists.txt index 0369f31a..8c5f5c1a 100644 --- a/source/ShaderWriter/CMakeLists.txt +++ b/source/ShaderWriter/CMakeLists.txt @@ -181,8 +181,8 @@ set( ${PROJECT_NAME}_SOURCE_FILES ) set( ${PROJECT_NAME}_FOLDER_HEADER_FILES - ${INCLUDE_DIR}/CompositeTypes/ArraySsbo.hpp - ${INCLUDE_DIR}/CompositeTypes/ArraySsbo.inl + ${INCLUDE_DIR}/CompositeTypes/ArrayStorageBuffer.hpp + ${INCLUDE_DIR}/CompositeTypes/ArrayStorageBuffer.inl ${INCLUDE_DIR}/CompositeTypes/BufferReference.hpp ${INCLUDE_DIR}/CompositeTypes/BufferReference.inl ${INCLUDE_DIR}/CompositeTypes/Builtins.hpp @@ -193,33 +193,33 @@ set( ${PROJECT_NAME}_FOLDER_HEADER_FILES ${INCLUDE_DIR}/CompositeTypes/FunctionParam.inl ${INCLUDE_DIR}/CompositeTypes/IOStructHelper.hpp ${INCLUDE_DIR}/CompositeTypes/IOStructInstanceHelper.hpp - ${INCLUDE_DIR}/CompositeTypes/Pcb.hpp - ${INCLUDE_DIR}/CompositeTypes/Pcb.inl ${INCLUDE_DIR}/CompositeTypes/PerPrimitive.hpp ${INCLUDE_DIR}/CompositeTypes/PerVertex.hpp + ${INCLUDE_DIR}/CompositeTypes/PushConstantBuffer.hpp + ${INCLUDE_DIR}/CompositeTypes/PushConstantBuffer.inl ${INCLUDE_DIR}/CompositeTypes/RayDesc.hpp - ${INCLUDE_DIR}/CompositeTypes/Ssbo.hpp - ${INCLUDE_DIR}/CompositeTypes/Ssbo.inl + ${INCLUDE_DIR}/CompositeTypes/StorageBuffer.hpp + ${INCLUDE_DIR}/CompositeTypes/StorageBuffer.inl ${INCLUDE_DIR}/CompositeTypes/Struct.hpp ${INCLUDE_DIR}/CompositeTypes/Struct.inl ${INCLUDE_DIR}/CompositeTypes/StructHelper.hpp ${INCLUDE_DIR}/CompositeTypes/StructInstance.hpp ${INCLUDE_DIR}/CompositeTypes/StructInstance.inl ${INCLUDE_DIR}/CompositeTypes/StructInstanceHelper.hpp - ${INCLUDE_DIR}/CompositeTypes/Ubo.hpp - ${INCLUDE_DIR}/CompositeTypes/Ubo.inl + ${INCLUDE_DIR}/CompositeTypes/UniformBuffer.hpp + ${INCLUDE_DIR}/CompositeTypes/UniformBuffer.inl ) set( ${PROJECT_NAME}_FOLDER_SOURCE_FILES - ${SOURCE_DIR}/CompositeTypes/ArraySsbo.cpp + ${SOURCE_DIR}/CompositeTypes/ArrayStorageBuffer.cpp ${SOURCE_DIR}/CompositeTypes/Builtins.cpp - ${SOURCE_DIR}/CompositeTypes/Pcb.cpp ${SOURCE_DIR}/CompositeTypes/PerPrimitive.cpp ${SOURCE_DIR}/CompositeTypes/PerVertex.cpp + ${SOURCE_DIR}/CompositeTypes/PushConstantBuffer.cpp ${SOURCE_DIR}/CompositeTypes/RayDesc.cpp - ${SOURCE_DIR}/CompositeTypes/Ssbo.cpp + ${SOURCE_DIR}/CompositeTypes/StorageBuffer.cpp ${SOURCE_DIR}/CompositeTypes/Struct.cpp ${SOURCE_DIR}/CompositeTypes/StructInstance.cpp - ${SOURCE_DIR}/CompositeTypes/Ubo.cpp + ${SOURCE_DIR}/CompositeTypes/UniformBuffer.cpp ) source_group( "Header Files\\CompositeTypes" FILES diff --git a/source/ShaderWriter/CompositeTypes/ArraySsbo.cpp b/source/ShaderWriter/CompositeTypes/ArrayStorageBuffer.cpp similarity index 82% rename from source/ShaderWriter/CompositeTypes/ArraySsbo.cpp rename to source/ShaderWriter/CompositeTypes/ArrayStorageBuffer.cpp index 63ce638d..47f440a4 100644 --- a/source/ShaderWriter/CompositeTypes/ArraySsbo.cpp +++ b/source/ShaderWriter/CompositeTypes/ArrayStorageBuffer.cpp @@ -1,7 +1,7 @@ /* See LICENSE file in root folder */ -#include "ShaderWriter/CompositeTypes/ArraySsbo.hpp" +#include "ShaderWriter/CompositeTypes/ArrayStorageBuffer.hpp" #include "ShaderWriter/Writer.hpp" #include diff --git a/source/ShaderWriter/CompositeTypes/Pcb.cpp b/source/ShaderWriter/CompositeTypes/PushConstantBuffer.cpp similarity index 82% rename from source/ShaderWriter/CompositeTypes/Pcb.cpp rename to source/ShaderWriter/CompositeTypes/PushConstantBuffer.cpp index eaaead17..cbd32e83 100644 --- a/source/ShaderWriter/CompositeTypes/Pcb.cpp +++ b/source/ShaderWriter/CompositeTypes/PushConstantBuffer.cpp @@ -1,7 +1,7 @@ /* See LICENSE file in root folder */ -#include "ShaderWriter/CompositeTypes/Pcb.hpp" +#include "ShaderWriter/CompositeTypes/PushConstantBuffer.hpp" #include "ShaderWriter/Writer.hpp" #include "ShaderWriter/CompositeTypes/Struct.hpp" @@ -9,7 +9,7 @@ See LICENSE file in root folder namespace sdw { - Pcb::Pcb( ShaderWriter & writer + PushConstantBuffer::PushConstantBuffer( ShaderWriter & writer , std::string name , ast::type::MemoryLayout layout , bool enabled ) @@ -23,7 +23,7 @@ namespace sdw { } - void Pcb::end() + void PushConstantBuffer::end() { if ( isEnabled() ) { @@ -32,7 +32,7 @@ namespace sdw } } - StructInstance Pcb::declStructMember( std::string name + StructInstance PushConstantBuffer::declStructMember( std::string name , Struct const & s , bool enabled ) { @@ -49,7 +49,7 @@ namespace sdw , isEnabled() && enabled }; } - Array< StructInstance > Pcb::declStructMember( std::string name + Array< StructInstance > PushConstantBuffer::declStructMember( std::string name , Struct const & s , uint32_t dimension , bool enabled ) diff --git a/source/ShaderWriter/CompositeTypes/Ssbo.cpp b/source/ShaderWriter/CompositeTypes/StorageBuffer.cpp similarity index 85% rename from source/ShaderWriter/CompositeTypes/Ssbo.cpp rename to source/ShaderWriter/CompositeTypes/StorageBuffer.cpp index 26f6d859..3e6b95e9 100644 --- a/source/ShaderWriter/CompositeTypes/Ssbo.cpp +++ b/source/ShaderWriter/CompositeTypes/StorageBuffer.cpp @@ -1,7 +1,7 @@ /* See LICENSE file in root folder */ -#include "ShaderWriter/CompositeTypes/Ssbo.hpp" +#include "ShaderWriter/CompositeTypes/StorageBuffer.hpp" #include "ShaderWriter/Writer.hpp" #include "ShaderWriter/CompositeTypes/Struct.hpp" @@ -9,7 +9,7 @@ See LICENSE file in root folder namespace sdw { - Ssbo::Ssbo( ShaderWriter & writer + StorageBuffer::StorageBuffer( ShaderWriter & writer , std::string name , uint32_t bind , uint32_t set @@ -26,7 +26,7 @@ namespace sdw { } - void Ssbo::end() + void StorageBuffer::end() { if ( isEnabled() ) { @@ -35,7 +35,7 @@ namespace sdw } } - StructInstance Ssbo::declStructMember( std::string name + StructInstance StorageBuffer::declStructMember( std::string name , Struct const & s , bool enabled ) { @@ -52,7 +52,7 @@ namespace sdw , isEnabled() && enabled }; } - Array< StructInstance > Ssbo::declStructMember( std::string name + Array< StructInstance > StorageBuffer::declStructMember( std::string name , Struct const & s , uint32_t dimension , bool enabled ) diff --git a/source/ShaderWriter/CompositeTypes/Ubo.cpp b/source/ShaderWriter/CompositeTypes/UniformBuffer.cpp similarity index 85% rename from source/ShaderWriter/CompositeTypes/Ubo.cpp rename to source/ShaderWriter/CompositeTypes/UniformBuffer.cpp index 03c13e33..3bc27b31 100644 --- a/source/ShaderWriter/CompositeTypes/Ubo.cpp +++ b/source/ShaderWriter/CompositeTypes/UniformBuffer.cpp @@ -1,7 +1,7 @@ /* See LICENSE file in root folder */ -#include "ShaderWriter/CompositeTypes/Ubo.hpp" +#include "ShaderWriter/CompositeTypes/UniformBuffer.hpp" #include "ShaderWriter/CompositeTypes/Struct.hpp" #include "ShaderWriter/CompositeTypes/StructInstance.hpp" @@ -11,7 +11,7 @@ See LICENSE file in root folder namespace sdw { - Ubo::Ubo( ShaderWriter & writer + UniformBuffer::UniformBuffer( ShaderWriter & writer , std::string name , uint32_t bind , uint32_t set @@ -28,7 +28,7 @@ namespace sdw { } - void Ubo::end() + void UniformBuffer::end() { if ( isEnabled() ) { @@ -37,7 +37,7 @@ namespace sdw } } - StructInstance Ubo::declStructMember( std::string name + StructInstance UniformBuffer::declStructMember( std::string name , Struct const & s , bool enabled ) { @@ -54,7 +54,7 @@ namespace sdw , isEnabled() && enabled }; } - Array< StructInstance > Ubo::declStructMember( std::string name + Array< StructInstance > UniformBuffer::declStructMember( std::string name , Struct const & s , uint32_t dimension , bool enabled ) diff --git a/test/ShaderWriter/TestWriterArraySsboDeclarations.cpp b/test/ShaderWriter/TestWriterArraySsboDeclarations.cpp index 6ba585b9..db72bd5e 100644 --- a/test/ShaderWriter/TestWriterArraySsboDeclarations.cpp +++ b/test/ShaderWriter/TestWriterArraySsboDeclarations.cpp @@ -2,7 +2,7 @@ #include "WriterCommon.hpp" #include -#include +#include namespace { @@ -19,7 +19,7 @@ namespace sdw::Struct type{ writer, "Type", ast::type::MemoryLayout::eStd140 }; type.declMember< T >( name ); type.end(); - sdw::ArraySsboT< sdw::StructInstance > bo{ writer, "Datas", type.getType(), 1u, 1u, true }; + sdw::ArrayStorageBufferT< sdw::StructInstance > bo{ writer, "Datas", type.getType(), 1u, 1u, true }; auto value = bo[0].getMember< T >( name ); check( getNonArrayKind( value.getType() ) == sdw::typeEnum< T > ); check( getArraySize( value.getType() ) == sdw::type::NotArray ); @@ -38,7 +38,7 @@ namespace sdw::Struct type{ writer, "Type", ast::type::MemoryLayout::eStd140 }; type.declMember< T >( name, 4u ); type.end(); - sdw::ArraySsboT< sdw::StructInstance > bo{ writer, "Datas", type.getType(), 1u, 1u, true }; + sdw::ArrayStorageBufferT< sdw::StructInstance > bo{ writer, "Datas", type.getType(), 1u, 1u, true }; auto value = bo[0].getMemberArray< T >( name ); check( getNonArrayKind( value.getType() ) == sdw::typeEnum< T > ); check( getArraySize( value.getType() ) == 4u ); @@ -57,7 +57,7 @@ namespace sdw::Struct type{ writer, "Type", ast::type::MemoryLayout::eStd140 }; type.declMember< T >( name ); type.end(); - sdw::ArraySsboT< sdw::StructInstance > bo{ writer, "Datas", type.getType(), { .binding = 1u, .set = 1u }, true }; + sdw::ArrayStorageBufferT< sdw::StructInstance > bo{ writer, "Datas", type.getType(), { .binding = 1u, .set = 1u }, true }; auto value = bo[0].getMember< T >( name ); check( getNonArrayKind( value.getType() ) == sdw::typeEnum< T > ); check( getArraySize( value.getType() ) == sdw::type::NotArray ); @@ -76,7 +76,7 @@ namespace sdw::Struct type{ writer, "Type", ast::type::MemoryLayout::eStd140 }; type.declMember< T >( name, 4u ); type.end(); - sdw::ArraySsboT< sdw::StructInstance > bo{ writer, "Datas", type.getType(), { .binding = 1u, .set = 1u }, true }; + sdw::ArrayStorageBufferT< sdw::StructInstance > bo{ writer, "Datas", type.getType(), { .binding = 1u, .set = 1u }, true }; auto value = bo[0].getMemberArray< T >( name ); check( getNonArrayKind( value.getType() ) == sdw::typeEnum< T > ); check( getArraySize( value.getType() ) == 4u ); @@ -99,7 +99,7 @@ namespace sdw::FragmentWriter writer; auto & shader = writer.getShader(); std::string const name = "m_member" + sdw::debug::getName( sdw::typeEnum< T > ); - sdw::ArraySsboT< T > bo{ writer, "Datas", T::makeType( shader.getTypesCache() ), ast::type::MemoryLayout::eStd140, 1u, 1u, true }; + sdw::ArrayStorageBufferT< T > bo{ writer, "Datas", T::makeType( shader.getTypesCache() ), ast::type::MemoryLayout::eStd140, 1u, 1u, true }; auto value = bo[0]; check( getNonArrayKind( value.getType() ) == sdw::typeEnum< T > ); check( getArraySize( value.getType() ) == sdw::type::NotArray ); @@ -115,7 +115,7 @@ namespace sdw::FragmentWriter writer; auto & shader = writer.getShader(); std::string const name = "m_member" + sdw::debug::getName( sdw::typeEnum< T > ); - sdw::ArraySsboT< T > bo{ writer, "Datas", T::makeType( shader.getTypesCache() ), ast::type::MemoryLayout::eStd140, { .binding = 1u, .set = 1u }, true }; + sdw::ArrayStorageBufferT< T > bo{ writer, "Datas", T::makeType( shader.getTypesCache() ), ast::type::MemoryLayout::eStd140, { .binding = 1u, .set = 1u }, true }; auto value = bo[0]; check( getNonArrayKind( value.getType() ) == sdw::typeEnum< T > ); check( getArraySize( value.getType() ) == sdw::type::NotArray ); diff --git a/test/ShaderWriter/TestWriterComputeShader.cpp b/test/ShaderWriter/TestWriterComputeShader.cpp index 08539f84..f83fb320 100644 --- a/test/ShaderWriter/TestWriterComputeShader.cpp +++ b/test/ShaderWriter/TestWriterComputeShader.cpp @@ -108,7 +108,7 @@ namespace testBegin( "compute" ); using namespace sdw; ComputeWriter writer; - ArraySsboT< UInt > ssbo{ writer, "Datas", writer.getTypesCache().getUInt32(), ast::type::MemoryLayout::eStd140 , 0u, 0u, true }; + ArrayStorageBufferT< UInt > ssbo{ writer, "Datas", writer.getTypesCache().getUInt32(), ast::type::MemoryLayout::eStd140 , 0u, 0u, true }; auto img = writer.declStorageImg< RWUImg2DR32 >( "img", 1u, 0u ); writer.implementMainT< VoidT >( 16u, 16u, [&]( ComputeIn in ) @@ -252,7 +252,7 @@ namespace ComputeWriter writer; // Inputs - sdw::Ubo voxelizer{ writer + sdw::UniformBuffer voxelizer{ writer , "VoxelUbo" , eVoxelUbo , 0u }; @@ -373,7 +373,7 @@ namespace { auto writer = ComputeWriter{}; - sdw::Ubo ubo{ writer, "Wow", 0u, 0u }; + sdw::UniformBuffer ubo{ writer, "Wow", 0u, 0u }; auto mtx = ubo.declMember< sdw::Mat4 >( "mtx" ); auto pos = ubo.declMember< sdw::Vec3 >( "pos" ); ubo.end(); @@ -479,7 +479,7 @@ namespace testBegin( "subgroupCompute" ); using namespace sdw; ComputeWriter writer; - ArraySsboT< UInt > ssbo{ writer, "Datas", writer.getTypesCache().getUInt32(), ast::type::MemoryLayout::eStd140 , 0u, 0u, true }; + ArrayStorageBufferT< UInt > ssbo{ writer, "Datas", writer.getTypesCache().getUInt32(), ast::type::MemoryLayout::eStd140 , 0u, 0u, true }; auto img = writer.declStorageImg< RWUImg2DR32 >( "img", 1u, 0u ); writer.implementMainT< VoidT >( 16u, 16u, [&]( SubgroupIn in ) diff --git a/test/ShaderWriter/TestWriterCustomType.cpp b/test/ShaderWriter/TestWriterCustomType.cpp index 1ab4fd87..af70afb4 100644 --- a/test/ShaderWriter/TestWriterCustomType.cpp +++ b/test/ShaderWriter/TestWriterCustomType.cpp @@ -1,7 +1,7 @@ #include "Common.hpp" #include "WriterCommon.hpp" -#include +#include #pragma clang diagnostic ignored "-Wunused-member-function" #pragma warning( disable:5245 ) diff --git a/test/ShaderWriter/TestWriterFragmentShader.cpp b/test/ShaderWriter/TestWriterFragmentShader.cpp index 4b18fbea..fe42599f 100644 --- a/test/ShaderWriter/TestWriterFragmentShader.cpp +++ b/test/ShaderWriter/TestWriterFragmentShader.cpp @@ -390,7 +390,7 @@ namespace FragmentWriter writer; // Shader inputs - Ubo hdrConfig{ writer, "BufferHdrConfig", 0u, 0u }; + UniformBuffer hdrConfig{ writer, "BufferHdrConfig", 0u, 0u }; auto c3d_exposure = hdrConfig.declMember< Float >( "c3d_exposure" ); auto c3d_gamma = hdrConfig.declMember< Float >( "c3d_gamma" ); hdrConfig.end(); @@ -552,7 +552,7 @@ namespace FragmentWriter writer; // Shader inputs - Ubo hdrConfig{ writer, "BufferHdrConfig", 0u, 0u }; + UniformBuffer hdrConfig{ writer, "BufferHdrConfig", 0u, 0u }; auto c3d_exposure = hdrConfig.declMember< Float >( "c3d_exposure" ); auto c3d_gamma = hdrConfig.declMember< Float >( "c3d_gamma" ); hdrConfig.end(); @@ -599,7 +599,7 @@ namespace S.declMember< Int >( "i" ); S.end(); - Ubo blockName{ writer, "blockName", 0u, 0u }; + UniformBuffer blockName{ writer, "blockName", 0u, 0u }; blockName.declStructMember( "s", S ); blockName.declMember< Int >( "cond" ); blockName.end(); diff --git a/test/ShaderWriter/TestWriterFunction.cpp b/test/ShaderWriter/TestWriterFunction.cpp index de610ea6..002ec4b5 100644 --- a/test/ShaderWriter/TestWriterFunction.cpp +++ b/test/ShaderWriter/TestWriterFunction.cpp @@ -1,7 +1,7 @@ #include "Common.hpp" #include "WriterCommon.hpp" -#include +#include #pragma warning( disable:5245 ) #pragma clang diagnostic ignored "-Wunused-member-function" @@ -274,7 +274,7 @@ namespace using namespace sdw; FragmentWriter writer; - Ubo buffer{ writer, "MyUbo", 4u, 0u }; + UniformBuffer buffer{ writer, "MyUbo", 4u, 0u }; buffer.declMember< ValueT >( "v" ); buffer.end(); @@ -304,7 +304,7 @@ namespace using namespace sdw; FragmentWriter writer; - Ssbo buffer{ writer, "MySsbo", 4u, 0u }; + StorageBuffer buffer{ writer, "MySsbo", 4u, 0u }; buffer.declMember< ValueT >( "v" ); buffer.end(); @@ -445,7 +445,7 @@ namespace using namespace sdw; FragmentWriter writer; - Ssbo buffer{ writer, "MySsbo", 4u, 0u }; + StorageBuffer buffer{ writer, "MySsbo", 4u, 0u }; buffer.declMember< ValueT >( "v" ); buffer.end(); @@ -587,7 +587,7 @@ namespace using namespace sdw; FragmentWriter writer; - Ssbo buffer{ writer, "MySsbo", 4u, 0u }; + StorageBuffer buffer{ writer, "MySsbo", 4u, 0u }; buffer.declMember< ValueT >( "v" ); buffer.end(); @@ -803,7 +803,7 @@ namespace using namespace sdw; FragmentWriter writer; - Ubo buffer{ writer, "MyUbo", 4u, 0u }; + UniformBuffer buffer{ writer, "MyUbo", 4u, 0u }; buffer.declMember< ValueT >( "v", 4u ); buffer.end(); @@ -837,7 +837,7 @@ namespace using namespace sdw; FragmentWriter writer; - Ssbo buffer{ writer, "MySsbo", 4u, 0u }; + StorageBuffer buffer{ writer, "MySsbo", 4u, 0u }; buffer.declMember< ValueT >( "v", 4u ); buffer.end(); @@ -967,7 +967,7 @@ namespace using namespace sdw; FragmentWriter writer; - Ssbo buffer{ writer, "MySsbo", 4u, 0u }; + StorageBuffer buffer{ writer, "MySsbo", 4u, 0u }; auto uv = buffer.declMember< ValueT >( "v", 4u ); buffer.end(); @@ -1093,7 +1093,7 @@ namespace using namespace sdw; FragmentWriter writer; - Ssbo buffer{ writer, "MySsbo", 4u, 0u }; + StorageBuffer buffer{ writer, "MySsbo", 4u, 0u }; buffer.declMember< ValueT >( "v", 4u ); buffer.end(); @@ -1208,7 +1208,7 @@ namespace using namespace sdw; FragmentWriter writer; - Ubo buffer{ writer, "Matrices", 0u, 0u }; + UniformBuffer buffer{ writer, "Matrices", 0u, 0u }; auto c3d_viewMatrix = buffer.declMember< Mat4 >( "c3d_viewMatrix" ); buffer.end(); @@ -1328,7 +1328,7 @@ namespace using namespace sdw; FragmentWriter writer; - Ubo buffer{ writer, "Matrices", 0u, 0u }; + UniformBuffer buffer{ writer, "Matrices", 0u, 0u }; auto c3d_viewMatrix = buffer.declMember< Mat4 >( "c3d_viewMatrix" ); buffer.end(); diff --git a/test/ShaderWriter/TestWriterIntrinsics.cpp b/test/ShaderWriter/TestWriterIntrinsics.cpp index 9cfa9787..40b6e205 100644 --- a/test/ShaderWriter/TestWriterIntrinsics.cpp +++ b/test/ShaderWriter/TestWriterIntrinsics.cpp @@ -2714,7 +2714,7 @@ namespace sdw::Struct type{ writer, "Type", ast::type::MemoryLayout::eStd140 }; type.declMember< ValueT >( mbrName ); type.end(); - sdw::ArraySsboT< sdw::StructInstance > bo{ writer, "Datas", type.getType(), 1u, 1u, true }; + sdw::ArrayStorageBufferT< sdw::StructInstance > bo{ writer, "Datas", type.getType(), 1u, 1u, true }; writer.implementMainT< VoidT >( 1u, [&]( ComputeIn ) { auto x = writer.declLocale< ValueT >( "x", test::getDefault< ValueT >( writer ) ); @@ -2750,7 +2750,7 @@ namespace sdw::Struct type{ writer, "Type", ast::type::MemoryLayout::eStd140 }; type.declMember< ValueT >( mbrName ); type.end(); - sdw::ArraySsboT< sdw::StructInstance > bo{ writer, "Datas", type.getType(), 1u, 1u, true }; + sdw::ArrayStorageBufferT< sdw::StructInstance > bo{ writer, "Datas", type.getType(), 1u, 1u, true }; writer.implementMainT< VoidT >( 1u, [&]( ComputeIn ) { auto x = writer.declLocale< ValueT >( "x", test::getDefault< ValueT >( writer ) ); @@ -2783,7 +2783,7 @@ namespace sdw::Struct type{ writer, "Type", ast::type::MemoryLayout::eStd140 }; type.declMember< ValueT >( mbrName ); type.end(); - sdw::ArraySsboT< sdw::StructInstance > bo{ writer, "Datas", type.getType(), 1u, 1u, true }; + sdw::ArrayStorageBufferT< sdw::StructInstance > bo{ writer, "Datas", type.getType(), 1u, 1u, true }; writer.implementMainT< VoidT >( 1u, [&]( ComputeIn ) { auto x = writer.declLocale< ValueT >( "x", test::getDefault< ValueT >( writer ) ); @@ -2816,7 +2816,7 @@ namespace sdw::Struct type{ writer, "Type", ast::type::MemoryLayout::eStd140 }; type.declMember< ValueT >( mbrName ); type.end(); - sdw::ArraySsboT< sdw::StructInstance > bo{ writer, "Datas", type.getType(), 1u, 1u, true }; + sdw::ArrayStorageBufferT< sdw::StructInstance > bo{ writer, "Datas", type.getType(), 1u, 1u, true }; writer.implementMainT< VoidT >( 1u, [&]( ComputeIn ) { auto x = writer.declLocale< ValueT >( "x", test::getDefault< ValueT >( writer ) ); @@ -2849,7 +2849,7 @@ namespace sdw::Struct type{ writer, "Type", ast::type::MemoryLayout::eStd140 }; type.declMember< ValueT >( mbrName ); type.end(); - sdw::ArraySsboT< sdw::StructInstance > bo{ writer, "Datas", type.getType(), 1u, 1u, true }; + sdw::ArrayStorageBufferT< sdw::StructInstance > bo{ writer, "Datas", type.getType(), 1u, 1u, true }; writer.implementMainT< VoidT >( 1u, [&]( ComputeIn ) { auto x = writer.declLocale< ValueT >( "x", test::getDefault< ValueT >( writer ) ); @@ -2882,7 +2882,7 @@ namespace sdw::Struct type{ writer, "Type", ast::type::MemoryLayout::eStd140 }; type.declMember< ValueT >( mbrName ); type.end(); - sdw::ArraySsboT< sdw::StructInstance > bo{ writer, "Datas", type.getType(), 1u, 1u, true }; + sdw::ArrayStorageBufferT< sdw::StructInstance > bo{ writer, "Datas", type.getType(), 1u, 1u, true }; writer.implementMainT< VoidT >( 1u, [&]( ComputeIn ) { auto x = writer.declLocale< ValueT >( "x", test::getDefault< ValueT >( writer ) ); @@ -2916,7 +2916,7 @@ namespace sdw::Struct type{ writer, "Type", ast::type::MemoryLayout::eStd140 }; type.declMember< ValueT >( mbrName ); type.end(); - sdw::ArraySsboT< sdw::StructInstance > bo{ writer, "Datas", type.getType(), 1u, 1u, true }; + sdw::ArrayStorageBufferT< sdw::StructInstance > bo{ writer, "Datas", type.getType(), 1u, 1u, true }; writer.implementMainT< VoidT >( 1u, [&]( ComputeIn ) { auto x = writer.declLocale< ValueT >( "x", test::getDefault< ValueT >( writer ) ); @@ -2952,7 +2952,7 @@ namespace sdw::Struct type{ writer, "Type", ast::type::MemoryLayout::eStd140 }; type.declMember< ValueT >( mbrName ); type.end(); - sdw::ArraySsboT< sdw::StructInstance > bo{ writer, "Datas", type.getType(), 1u, 1u, true }; + sdw::ArrayStorageBufferT< sdw::StructInstance > bo{ writer, "Datas", type.getType(), 1u, 1u, true }; writer.implementMainT< VoidT >( 1u, [&]( ComputeIn ) { auto c = writer.declLocale< ValueT >( "c", test::getDefault< ValueT >( writer ) ); diff --git a/test/ShaderWriter/TestWriterPcbDeclarations.cpp b/test/ShaderWriter/TestWriterPcbDeclarations.cpp index 664777b1..81f8e5f6 100644 --- a/test/ShaderWriter/TestWriterPcbDeclarations.cpp +++ b/test/ShaderWriter/TestWriterPcbDeclarations.cpp @@ -16,7 +16,7 @@ namespace sdw::FragmentWriter writer; auto & shader = writer.getShader(); std::string const name = "m_member" + sdw::debug::getName( sdw::typeEnum< T > ); - sdw::Pcb bo{ writer, "PCB", ast::type::MemoryLayout::eStd140 }; + sdw::PushConstantBuffer bo{ writer, "PCB", ast::type::MemoryLayout::eStd140 }; auto value = bo.template declMember< T >( name ); bo.end(); check( getNonArrayKind( value.getType() ) == sdw::typeEnum< T > ); @@ -43,7 +43,7 @@ namespace sdw::FragmentWriter writer; auto & shader = writer.getShader(); std::string const name = "m_memberArray" + sdw::debug::getName( sdw::typeEnum< T > ); - sdw::Pcb bo{ writer, "PCB", ast::type::MemoryLayout::eStd140 }; + sdw::PushConstantBuffer bo{ writer, "PCB", ast::type::MemoryLayout::eStd140 }; auto value = bo.template declMember< T >( name, 4u ); bo.end(); check( getNonArrayKind( value.getType() ) == sdw::typeEnum< T > ); @@ -70,7 +70,7 @@ namespace sdw::FragmentWriter writer; auto & shader = writer.getShader(); std::string const name = "m_memberOptDis" + sdw::debug::getName( sdw::typeEnum< T > ); - sdw::Pcb bo{ writer, "PCB", ast::type::MemoryLayout::eStd140 }; + sdw::PushConstantBuffer bo{ writer, "PCB", ast::type::MemoryLayout::eStd140 }; auto value = bo.template declMember< T >( name, false ); bo.end(); check( !value.isEnabled() ); @@ -99,7 +99,7 @@ namespace sdw::FragmentWriter writer; auto & shader = writer.getShader(); std::string const name = "m_memberOptDisArray" + sdw::debug::getName( sdw::typeEnum< T > ); - sdw::Pcb bo{ writer, "PCB", ast::type::MemoryLayout::eStd140 }; + sdw::PushConstantBuffer bo{ writer, "PCB", ast::type::MemoryLayout::eStd140 }; auto value = bo.template declMember< T >( name, 4u, false ); bo.end(); check( !value.isEnabled() ); @@ -128,7 +128,7 @@ namespace sdw::FragmentWriter writer; auto & shader = writer.getShader(); std::string const name = "m_memberOptEn" + sdw::debug::getName( sdw::typeEnum< T > ); - sdw::Pcb bo{ writer, "PCB", ast::type::MemoryLayout::eStd140 }; + sdw::PushConstantBuffer bo{ writer, "PCB", ast::type::MemoryLayout::eStd140 }; auto value = bo.template declMember< T >( name, true ); bo.end(); check( value.isEnabled() ); @@ -157,7 +157,7 @@ namespace sdw::FragmentWriter writer; auto & shader = writer.getShader(); std::string const name = "m_memberOptEnArray" + sdw::debug::getName( sdw::typeEnum< T > ); - sdw::Pcb bo{ writer, "PCB", ast::type::MemoryLayout::eStd140 }; + sdw::PushConstantBuffer bo{ writer, "PCB", ast::type::MemoryLayout::eStd140 }; auto value = bo.template declMember< T >( name, 4u, true ); bo.end(); check( value.isEnabled() ); @@ -187,7 +187,7 @@ namespace { sdw::FragmentWriter writer; auto & shader = writer.getShader(); - sdw::PcbHelperStd140T< sdw::StructFieldT< T, "member" > > bo{ writer, "UBO" }; + sdw::PushConstantBufferHelperStd140T< sdw::StructFieldT< T, "member" > > bo{ writer, "UBO" }; auto retrieved = bo.template getMember< "member" >(); check( getNonArrayKind( retrieved.getType() ) == sdw::typeEnum< T > ); check( getArraySize( retrieved.getType() ) == sdw::type::NotArray ); @@ -212,7 +212,7 @@ namespace { sdw::FragmentWriter writer; auto & shader = writer.getShader(); - sdw::PcbHelperStd140T< sdw::StructFieldArrayT< T, "member", 4u > > bo{ writer, "UBO" }; + sdw::PushConstantBufferHelperStd140T< sdw::StructFieldArrayT< T, "member", 4u > > bo{ writer, "UBO" }; auto retrieved = bo.template getMember< "member" >(); check( getNonArrayKind( retrieved.getType() ) == sdw::typeEnum< T > ); check( getArraySize( retrieved.getType() ) == 4u ); diff --git a/test/ShaderWriter/TestWriterRayAnyHitShader.cpp b/test/ShaderWriter/TestWriterRayAnyHitShader.cpp index 97e4078b..84d220e3 100644 --- a/test/ShaderWriter/TestWriterRayAnyHitShader.cpp +++ b/test/ShaderWriter/TestWriterRayAnyHitShader.cpp @@ -257,10 +257,10 @@ namespace auto objDescs = writer.declArrayStorageBuffer< ObjDesc >( "ObjDescs", 0u, 1u ); - auto Vertices = writer.declBufferReference< ArraySsboT< Vertex > >( "Vertices", ast::type::MemoryLayout::eScalar, ast::type::Storage::ePhysicalStorageBuffer ); - auto Indices = writer.declBufferReference< ArraySsboT< UInt > >( "Indices", ast::type::MemoryLayout::eScalar, ast::type::Storage::ePhysicalStorageBuffer ); - auto Materials = writer.declBufferReference< ArraySsboT< WaveFrontMaterial > >( "Materials", ast::type::MemoryLayout::eScalar, ast::type::Storage::ePhysicalStorageBuffer ); - auto MatIndices = writer.declBufferReference< ArraySsboT< Int > >( "MatIndices", ast::type::MemoryLayout::eScalar, ast::type::Storage::ePhysicalStorageBuffer ); + auto Vertices = writer.declBufferReference< ArrayStorageBufferT< Vertex > >( "Vertices", ast::type::MemoryLayout::eScalar, ast::type::Storage::ePhysicalStorageBuffer ); + auto Indices = writer.declBufferReference< ArrayStorageBufferT< UInt > >( "Indices", ast::type::MemoryLayout::eScalar, ast::type::Storage::ePhysicalStorageBuffer ); + auto Materials = writer.declBufferReference< ArrayStorageBufferT< WaveFrontMaterial > >( "Materials", ast::type::MemoryLayout::eScalar, ast::type::Storage::ePhysicalStorageBuffer ); + auto MatIndices = writer.declBufferReference< ArrayStorageBufferT< Int > >( "MatIndices", ast::type::MemoryLayout::eScalar, ast::type::Storage::ePhysicalStorageBuffer ); // Generate a random unsigned int in [0, 2^24) given the previous RNG state // using the Numerical Recipes linear congruential generator diff --git a/test/ShaderWriter/TestWriterRayClosestHitShader.cpp b/test/ShaderWriter/TestWriterRayClosestHitShader.cpp index e026a4bc..37af45e1 100644 --- a/test/ShaderWriter/TestWriterRayClosestHitShader.cpp +++ b/test/ShaderWriter/TestWriterRayClosestHitShader.cpp @@ -416,8 +416,8 @@ namespace auto objDescs = writer.declArrayStorageBuffer< ObjDesc >( "ObjDescs", 0u, 1u ); - auto Vertices = writer.declBufferReference< ArraySsboT< VertexScalar > >( "Vertices", ast::type::MemoryLayout::eScalar, ast::type::Storage::ePhysicalStorageBuffer ); - auto Indices = writer.declBufferReference< ArraySsboT< IVec3 > >( "Indices", ast::type::MemoryLayout::eScalar, ast::type::Storage::ePhysicalStorageBuffer ); + auto Vertices = writer.declBufferReference< ArrayStorageBufferT< VertexScalar > >( "Vertices", ast::type::MemoryLayout::eScalar, ast::type::Storage::ePhysicalStorageBuffer ); + auto Indices = writer.declBufferReference< ArrayStorageBufferT< IVec3 > >( "Indices", ast::type::MemoryLayout::eScalar, ast::type::Storage::ePhysicalStorageBuffer ); writer.implementMainT< HitPayload, Vec2 >( RayPayloadInT< HitPayload >{ writer, 0u } , HitAttributeT< Vec2 >{ writer } @@ -465,8 +465,8 @@ namespace auto objDescs = writer.declArrayStorageBuffer< ObjDesc >( "ObjDescs", 0u, 1u ); - auto Vertices = writer.declBufferReference< ArraySsboT< VertexScalar > >( "Vertices", ast::type::MemoryLayout::eScalar, ast::type::Storage::ePhysicalStorageBuffer ); - auto Indices = writer.declBufferReference< ArraySsboT< IVec3 > >( "Indices", ast::type::MemoryLayout::eScalar, ast::type::Storage::ePhysicalStorageBuffer ); + auto Vertices = writer.declBufferReference< ArrayStorageBufferT< VertexScalar > >( "Vertices", ast::type::MemoryLayout::eScalar, ast::type::Storage::ePhysicalStorageBuffer ); + auto Indices = writer.declBufferReference< ArrayStorageBufferT< IVec3 > >( "Indices", ast::type::MemoryLayout::eScalar, ast::type::Storage::ePhysicalStorageBuffer ); writer.implementMainT< HitPayload, Vec2 >( RayPayloadInT< HitPayload >{ writer, 0u } , HitAttributeT< Vec2 >{ writer } @@ -514,7 +514,7 @@ namespace auto objDescs = writer.declArrayStorageBuffer< ObjDesc >( "ObjDescs", 0u, 1u ); - auto Indices = writer.declBufferReference< ArraySsboT< IVec3 > >( "Indices", ast::type::MemoryLayout::eScalar, ast::type::Storage::ePhysicalStorageBuffer ); + auto Indices = writer.declBufferReference< ArrayStorageBufferT< IVec3 > >( "Indices", ast::type::MemoryLayout::eScalar, ast::type::Storage::ePhysicalStorageBuffer ); auto textureSamplers = writer.declCombinedImgArray< FImg2DRgba32 >( "textureSamplers", 1u, 1u, ast::type::UnknownArraySize ); writer.implementMainT< HitPayload, Vec2 >( RayPayloadInT< HitPayload >{ writer, 0u } @@ -558,10 +558,10 @@ namespace auto pcLightType = pcb.declMember< Int >( "pcLightType" ); pcb.end(); - auto Vertices = writer.declBufferReference< ArraySsboT< VertexScalar > >( "Vertices", ast::type::MemoryLayout::eScalar, ast::type::Storage::ePhysicalStorageBuffer ); - auto Indices = writer.declBufferReference< ArraySsboT< IVec3 > >( "Indices", ast::type::MemoryLayout::eScalar, ast::type::Storage::ePhysicalStorageBuffer ); - auto Materials = writer.declBufferReference< ArraySsboT< WaveFrontMaterialScalar > >( "Materials", ast::type::MemoryLayout::eScalar, ast::type::Storage::ePhysicalStorageBuffer ); - auto MatIndices = writer.declBufferReference< ArraySsboT< Int > >( "MatIndices", ast::type::MemoryLayout::eScalar, ast::type::Storage::ePhysicalStorageBuffer ); + auto Vertices = writer.declBufferReference< ArrayStorageBufferT< VertexScalar > >( "Vertices", ast::type::MemoryLayout::eScalar, ast::type::Storage::ePhysicalStorageBuffer ); + auto Indices = writer.declBufferReference< ArrayStorageBufferT< IVec3 > >( "Indices", ast::type::MemoryLayout::eScalar, ast::type::Storage::ePhysicalStorageBuffer ); + auto Materials = writer.declBufferReference< ArrayStorageBufferT< WaveFrontMaterialScalar > >( "Materials", ast::type::MemoryLayout::eScalar, ast::type::Storage::ePhysicalStorageBuffer ); + auto MatIndices = writer.declBufferReference< ArrayStorageBufferT< Int > >( "MatIndices", ast::type::MemoryLayout::eScalar, ast::type::Storage::ePhysicalStorageBuffer ); writer.implementMainT< HitPayload, Vec2 >( RayPayloadInT< HitPayload >{ writer, 0u } , HitAttributeT< Vec2 >{ writer } @@ -810,10 +810,10 @@ namespace auto pcLightType = pcb.declMember< Int >( "pcLightType" ); pcb.end(); - auto Vertices = writer.declBufferReference< ArraySsboT< VertexScalar > >( "Vertices", ast::type::MemoryLayout::eScalar, ast::type::Storage::ePhysicalStorageBuffer ); - auto Indices = writer.declBufferReference< ArraySsboT< IVec3 > >( "Indices", ast::type::MemoryLayout::eScalar, ast::type::Storage::ePhysicalStorageBuffer ); - auto Materials = writer.declBufferReference< ArraySsboT< WaveFrontMaterialScalar > >( "Materials", ast::type::MemoryLayout::eScalar, ast::type::Storage::ePhysicalStorageBuffer ); - auto MatIndices = writer.declBufferReference< ArraySsboT< Int > >( "MatIndices", ast::type::MemoryLayout::eScalar, ast::type::Storage::ePhysicalStorageBuffer ); + auto Vertices = writer.declBufferReference< ArrayStorageBufferT< VertexScalar > >( "Vertices", ast::type::MemoryLayout::eScalar, ast::type::Storage::ePhysicalStorageBuffer ); + auto Indices = writer.declBufferReference< ArrayStorageBufferT< IVec3 > >( "Indices", ast::type::MemoryLayout::eScalar, ast::type::Storage::ePhysicalStorageBuffer ); + auto Materials = writer.declBufferReference< ArrayStorageBufferT< WaveFrontMaterialScalar > >( "Materials", ast::type::MemoryLayout::eScalar, ast::type::Storage::ePhysicalStorageBuffer ); + auto MatIndices = writer.declBufferReference< ArrayStorageBufferT< Int > >( "MatIndices", ast::type::MemoryLayout::eScalar, ast::type::Storage::ePhysicalStorageBuffer ); writer.implementMainT< HitPayload, Vec2 >( RayPayloadInT< HitPayload >{ writer, 0u } , HitAttributeT< Vec2 >{ writer } diff --git a/test/ShaderWriter/TestWriterShader.cpp b/test/ShaderWriter/TestWriterShader.cpp index 040fe9c9..6f6ce35b 100644 --- a/test/ShaderWriter/TestWriterShader.cpp +++ b/test/ShaderWriter/TestWriterShader.cpp @@ -715,9 +715,9 @@ namespace auto fragUv = writer.declOutput( "fragUv", 0 ); auto fragCol = writer.declOutput( "fragCol", 1 ); - ArraySsboT ssbo{ writer, "ssbo", Mat4::makeType( writer.getTypesCache() ), ast::type::MemoryLayout::eStd430, 1, 0, true }; + ArrayStorageBufferT< Mat4 > ssbo{ writer, "ssbo", Mat4::makeType( writer.getTypesCache() ), ast::type::MemoryLayout::eStd430, 1, 0, true }; - Pcb pcb = writer.declPushConstantsBuffer( "pcb" ); + PushConstantBuffer pcb = writer.declPushConstantsBuffer( "pcb" ); pcb.declMember( "firstMatrix" ); pcb.end(); @@ -829,13 +829,13 @@ namespace { auto writer = sdw::VertexWriter{}; - auto camera = sdw::Ubo{ writer, "camera", 0, 0 }; + auto camera = sdw::UniformBuffer{ writer, "camera", 0, 0 }; camera.declMember( "camera_position" ); camera.declMember( "camera_projection" ); camera.declMember( "camera_view" ); camera.end(); - auto transform = sdw::Ubo{ writer, "transform", 1, 0 }; + auto transform = sdw::UniformBuffer{ writer, "transform", 1, 0 }; transform.declMember( "transform_model" ); transform.declMember( "transform_inverted_model" ); transform.end(); @@ -865,13 +865,13 @@ namespace { auto writer = sdw::FragmentWriter{}; - auto camera = sdw::Ubo{ writer, "camera", 0, 0 }; + auto camera = sdw::UniformBuffer{ writer, "camera", 0, 0 }; camera.declMember( "position" ); camera.declMember( "projection" ); camera.declMember( "view" ); camera.end(); - auto material = sdw::Pcb{ writer, "material", ast::type::MemoryLayout::eStd140 }; + auto material = sdw::PushConstantBuffer{ writer, "material", ast::type::MemoryLayout::eStd140 }; material.declMember( "base_color_factor" ); material.declMember( "emissive_factor" ); material.declMember( "metallic_factor" ); @@ -1027,7 +1027,7 @@ namespace { GeometryWriter writer; - Ubo voxelizeUbo{ writer, "VoxelizeUbo", 0u, 0u }; + UniformBuffer voxelizeUbo{ writer, "VoxelizeUbo", 0u, 0u }; auto mvp = voxelizeUbo.declMember< Mat4 >( "mvp" ); voxelizeUbo.end(); @@ -1106,7 +1106,7 @@ namespace { GeometryWriter writer; - sdw::Ubo voxelizeUbo{ writer, "VoxelizeUbo", 0u, 0u }; + sdw::UniformBuffer voxelizeUbo{ writer, "VoxelizeUbo", 0u, 0u }; auto c3d_vpX = voxelizeUbo.declMember< sdw::Mat4 >( "c3d_vpX" ); auto c3d_vpY = voxelizeUbo.declMember< sdw::Mat4 >( "c3d_vpY" ); auto c3d_vpZ = voxelizeUbo.declMember< sdw::Mat4 >( "c3d_vpZ" ); @@ -1240,7 +1240,7 @@ namespace auto pxl_voxelVisibility = writer.declStorageImg< WUImg3DR8 >( "pxl_voxelVisibility", 1u, 1u ); - sdw::Ubo voxelizeUbo{ writer, "VoxelizeUbo", 0u, 0u }; + sdw::UniformBuffer voxelizeUbo{ writer, "VoxelizeUbo", 0u, 0u }; auto c3d_vpX = voxelizeUbo.declMember< sdw::Mat4 >( "c3d_vpX" ); auto c3d_vpY = voxelizeUbo.declMember< sdw::Mat4 >( "c3d_vpY" ); auto c3d_vpZ = voxelizeUbo.declMember< sdw::Mat4 >( "c3d_vpZ" ); @@ -1325,7 +1325,7 @@ namespace { TessellationControlWriter writer; - sdw::Ubo ubo{ writer, "Wow", 0u, 0u }; + sdw::UniformBuffer ubo{ writer, "Wow", 0u, 0u }; auto mtx = ubo.declMember< sdw::Mat4 >( "mtx" ); auto pos = ubo.declMember< sdw::Vec3 >( "pos" ); ubo.end(); @@ -1475,7 +1475,7 @@ namespace { TessellationEvaluationWriter writer; - sdw::Ubo ubo{ writer, "Wow", 0u, 0u }; + sdw::UniformBuffer ubo{ writer, "Wow", 0u, 0u }; auto mtx = ubo.declMember< sdw::Mat4 >( "mtx" ); auto pos = ubo.declMember< sdw::Vec3 >( "pos" ); ubo.end(); @@ -1624,7 +1624,7 @@ namespace auto fragUvw = writer.declInput< Vec3 >( "fragUvw", 0u ); auto outColor = writer.declOutput< Vec4 >( "outColor", 0u ); - sdw::Ssbo colorsSsbo = writer.declStorageBuffer( "colorsBuffer", 0u, 1u ); + sdw::StorageBuffer colorsSsbo = writer.declStorageBuffer( "colorsBuffer", 0u, 1u ); auto colors = colorsSsbo.declMemberArray< Vec4 >( "colors" ); colorsSsbo.end(); diff --git a/test/ShaderWriter/TestWriterSsboDeclarations.cpp b/test/ShaderWriter/TestWriterSsboDeclarations.cpp index f01b4605..307e0021 100644 --- a/test/ShaderWriter/TestWriterSsboDeclarations.cpp +++ b/test/ShaderWriter/TestWriterSsboDeclarations.cpp @@ -17,7 +17,7 @@ namespace sdw::FragmentWriter writer; auto & shader = writer.getShader(); std::string const name = "member" + sdw::debug::getName( sdw::typeEnum< T > ); - sdw::Ssbo bo{ writer, "Datas", 1u, 1u, ast::type::MemoryLayout::eStd140 }; + sdw::StorageBuffer bo{ writer, "Datas", 1u, 1u, ast::type::MemoryLayout::eStd140 }; auto value = bo.template declMember< T >( name ); bo.end(); check( getNonArrayKind( value.getType() ) == sdw::typeEnum< T > ); @@ -42,7 +42,7 @@ namespace sdw::FragmentWriter writer; auto & shader = writer.getShader(); std::string const name = "member" + sdw::debug::getName( sdw::typeEnum< T > ); - sdw::Ssbo bo{ writer, "Datas", { .binding = 1u, .set = 1u }, ast::type::MemoryLayout::eStd140 }; + sdw::StorageBuffer bo{ writer, "Datas", { .binding = 1u, .set = 1u }, ast::type::MemoryLayout::eStd140 }; auto value = bo.template declMember< T >( name ); bo.end(); check( getNonArrayKind( value.getType() ) == sdw::typeEnum< T > ); @@ -74,7 +74,7 @@ namespace sdw::FragmentWriter writer; auto & shader = writer.getShader(); std::string const name = "member" + sdw::debug::getName( sdw::typeEnum< T > ); - sdw::Ssbo bo{ writer, "Datas", 1u, 1u, ast::type::MemoryLayout::eStd140 }; + sdw::StorageBuffer bo{ writer, "Datas", 1u, 1u, ast::type::MemoryLayout::eStd140 }; auto value = bo.template declMember< T >( name, 4u ); bo.end(); check( getNonArrayKind( value.getType() ) == sdw::typeEnum< T > ); @@ -99,7 +99,7 @@ namespace sdw::FragmentWriter writer; auto & shader = writer.getShader(); std::string const name = "member" + sdw::debug::getName( sdw::typeEnum< T > ); - sdw::Ssbo bo{ writer, "Datas", { .binding = 1u, .set = 1u }, ast::type::MemoryLayout::eStd140 }; + sdw::StorageBuffer bo{ writer, "Datas", { .binding = 1u, .set = 1u }, ast::type::MemoryLayout::eStd140 }; auto value = bo.template declMember< T >( name, 4u ); bo.end(); check( getNonArrayKind( value.getType() ) == sdw::typeEnum< T > ); @@ -131,7 +131,7 @@ namespace sdw::FragmentWriter writer; auto & shader = writer.getShader(); std::string const name = "member" + sdw::debug::getName( sdw::typeEnum< T > ); - sdw::Ssbo bo{ writer, "Datas", 1u, 1u, ast::type::MemoryLayout::eStd140 }; + sdw::StorageBuffer bo{ writer, "Datas", 1u, 1u, ast::type::MemoryLayout::eStd140 }; auto value = bo.template declMemberArray< T >( name ); bo.end(); check( getNonArrayKind( value.getType() ) == sdw::typeEnum< T > ); @@ -156,7 +156,7 @@ namespace sdw::FragmentWriter writer; auto & shader = writer.getShader(); std::string const name = "member" + sdw::debug::getName( sdw::typeEnum< T > ); - sdw::Ssbo bo{ writer, "Datas", { .binding = 1u, .set = 1u }, ast::type::MemoryLayout::eStd140 }; + sdw::StorageBuffer bo{ writer, "Datas", { .binding = 1u, .set = 1u }, ast::type::MemoryLayout::eStd140 }; auto value = bo.template declMemberArray< T >( name ); bo.end(); check( getNonArrayKind( value.getType() ) == sdw::typeEnum< T > ); @@ -189,7 +189,7 @@ namespace { sdw::FragmentWriter writer; auto & shader = writer.getShader(); - sdw::SsboHelperStd430T< sdw::StructFieldT< T, "member" > > bo{ writer, "SSBO", 1u, 1u }; + sdw::StorageBufferHelperStd430T< sdw::StructFieldT< T, "member" > > bo{ writer, "SSBO", 1u, 1u }; auto retrieved = bo.template getMember< "member" >(); check( getNonArrayKind( retrieved.getType() ) == sdw::typeEnum< T > ); check( getArraySize( retrieved.getType() ) == ast::type::NotArray ); @@ -208,7 +208,7 @@ namespace { sdw::FragmentWriter writer; auto & shader = writer.getShader(); - sdw::SsboHelperStd430T< sdw::StructFieldT< T, "member" > > bo{ writer, "SSBO", { .binding = 1u, .set = 1u } }; + sdw::StorageBufferHelperStd430T< sdw::StructFieldT< T, "member" > > bo{ writer, "SSBO", { .binding = 1u, .set = 1u } }; auto retrieved = bo.template getMember< "member" >(); check( getNonArrayKind( retrieved.getType() ) == sdw::typeEnum< T > ); check( getArraySize( retrieved.getType() ) == ast::type::NotArray ); @@ -238,7 +238,7 @@ namespace { sdw::FragmentWriter writer; auto & shader = writer.getShader(); - sdw::SsboHelperStd430T< sdw::StructFieldArrayT< T, "member", 4u > > bo{ writer, "SSBO", 1u, 1u }; + sdw::StorageBufferHelperStd430T< sdw::StructFieldArrayT< T, "member", 4u > > bo{ writer, "SSBO", 1u, 1u }; auto retrieved = bo.template getMember< "member" >(); check( getNonArrayKind( retrieved.getType() ) == sdw::typeEnum< T > ); check( getArraySize( retrieved.getType() ) == 4u ); @@ -257,7 +257,7 @@ namespace { sdw::FragmentWriter writer; auto & shader = writer.getShader(); - sdw::SsboHelperStd430T< sdw::StructFieldArrayT< T, "member", 4u > > bo{ writer, "SSBO", { .binding = 1u, .set = 1u } }; + sdw::StorageBufferHelperStd430T< sdw::StructFieldArrayT< T, "member", 4u > > bo{ writer, "SSBO", { .binding = 1u, .set = 1u } }; auto retrieved = bo.template getMember< "member" >(); check( getNonArrayKind( retrieved.getType() ) == sdw::typeEnum< T > ); check( getArraySize( retrieved.getType() ) == 4u ); @@ -287,7 +287,7 @@ namespace { sdw::FragmentWriter writer; auto & shader = writer.getShader(); - sdw::SsboHelperStd430T< sdw::StructFieldArrayT< T, "member", ast::type::UnknownArraySize > > bo{ writer, "SSBO", 1u, 1u }; + sdw::StorageBufferHelperStd430T< sdw::StructFieldArrayT< T, "member", ast::type::UnknownArraySize > > bo{ writer, "SSBO", 1u, 1u }; auto retrieved = bo.template getMember< "member" >(); check( getNonArrayKind( retrieved.getType() ) == sdw::typeEnum< T > ); check( getArraySize( retrieved.getType() ) == sdw::type::UnknownArraySize ); @@ -306,7 +306,7 @@ namespace { sdw::FragmentWriter writer; auto & shader = writer.getShader(); - sdw::SsboHelperStd430T< sdw::StructFieldArrayT< T, "member", ast::type::UnknownArraySize > > bo{ writer, "SSBO", { .binding = 1u, .set = 1u } }; + sdw::StorageBufferHelperStd430T< sdw::StructFieldArrayT< T, "member", ast::type::UnknownArraySize > > bo{ writer, "SSBO", { .binding = 1u, .set = 1u } }; auto retrieved = bo.template getMember< "member" >(); check( getNonArrayKind( retrieved.getType() ) == sdw::typeEnum< T > ); check( getArraySize( retrieved.getType() ) == sdw::type::UnknownArraySize ); diff --git a/test/ShaderWriter/TestWriterTessellationControlShader.cpp b/test/ShaderWriter/TestWriterTessellationControlShader.cpp index 0d6f60f3..c936a3a0 100644 --- a/test/ShaderWriter/TestWriterTessellationControlShader.cpp +++ b/test/ShaderWriter/TestWriterTessellationControlShader.cpp @@ -1009,7 +1009,7 @@ namespace TessellationControlWriter writer; // TCS inputs - sdw::Ubo ubo{ writer, "Wow", 0u, 0u }; + sdw::UniformBuffer ubo{ writer, "Wow", 0u, 0u }; auto mtx = ubo.declMember< sdw::Mat4 >( "mtx" ); auto pos = ubo.declMember< sdw::Vec3 >( "pos" ); ubo.end(); diff --git a/test/ShaderWriter/TestWriterTessellationEvaluationShader.cpp b/test/ShaderWriter/TestWriterTessellationEvaluationShader.cpp index a52eca6f..71269a23 100644 --- a/test/ShaderWriter/TestWriterTessellationEvaluationShader.cpp +++ b/test/ShaderWriter/TestWriterTessellationEvaluationShader.cpp @@ -905,7 +905,7 @@ namespace static uint32_t constexpr maxPoints = 3u; TessellationEvaluationWriter writer; - sdw::Ubo ubo{ writer, "Wow", 0u, 0u }; + sdw::UniformBuffer ubo{ writer, "Wow", 0u, 0u }; auto mtx = ubo.declMember< sdw::Mat4 >( "mtx" ); auto pos = ubo.declMember< sdw::Vec3 >( "pos" ); ubo.end(); diff --git a/test/ShaderWriter/TestWriterUboDeclarations.cpp b/test/ShaderWriter/TestWriterUboDeclarations.cpp index 1f16acb5..56fdf5cc 100644 --- a/test/ShaderWriter/TestWriterUboDeclarations.cpp +++ b/test/ShaderWriter/TestWriterUboDeclarations.cpp @@ -1,7 +1,7 @@ #include "Common.hpp" #include "WriterCommon.hpp" -#include +#include #pragma clang diagnostic ignored "-Wunused-member-function" #pragma warning( disable:5245 ) @@ -18,7 +18,7 @@ namespace sdw::FragmentWriter writer; auto & shader = writer.getShader(); std::string const name = "m_member" + sdw::debug::getName( sdw::typeEnum< T > ); - sdw::Ubo bo{ writer, "UBO", 1u, 1u }; + sdw::UniformBuffer bo{ writer, "UBO", 1u, 1u }; auto value = bo.template declMember< T >( name ); bo.end(); check( getNonArrayKind( value.getType() ) == sdw::typeEnum< T > ); @@ -40,7 +40,7 @@ namespace sdw::FragmentWriter writer; auto & shader = writer.getShader(); std::string const name = "m_member" + sdw::debug::getName( sdw::typeEnum< T > ); - sdw::Ubo bo{ writer, "UBO", { .binding = 1u, .set = 1u } }; + sdw::UniformBuffer bo{ writer, "UBO", { .binding = 1u, .set = 1u } }; auto value = bo.template declMember< T >( name ); bo.end(); check( getNonArrayKind( value.getType() ) == sdw::typeEnum< T > ); @@ -69,7 +69,7 @@ namespace sdw::FragmentWriter writer; auto & shader = writer.getShader(); std::string const name = "m_memberArray" + sdw::debug::getName( sdw::typeEnum< T > ); - sdw::Ubo bo{ writer, "UBO", 1u, 1u }; + sdw::UniformBuffer bo{ writer, "UBO", 1u, 1u }; auto value = bo.template declMember< T >( name, 4u ); bo.end(); check( getNonArrayKind( value.getType() ) == sdw::typeEnum< T > ); @@ -91,7 +91,7 @@ namespace sdw::FragmentWriter writer; auto & shader = writer.getShader(); std::string const name = "m_memberArray" + sdw::debug::getName( sdw::typeEnum< T > ); - sdw::Ubo bo{ writer, "UBO", { .binding = 1u, .set = 1u } }; + sdw::UniformBuffer bo{ writer, "UBO", { .binding = 1u, .set = 1u } }; auto value = bo.template declMember< T >( name, 4u ); bo.end(); check( getNonArrayKind( value.getType() ) == sdw::typeEnum< T > ); @@ -120,7 +120,7 @@ namespace sdw::FragmentWriter writer; auto & shader = writer.getShader(); std::string const name = "m_memberOptDis" + sdw::debug::getName( sdw::typeEnum< T > ); - sdw::Ubo bo{ writer, "UBO", 1u, 1u }; + sdw::UniformBuffer bo{ writer, "UBO", 1u, 1u }; auto value = bo.template declMember< T >( name, false ); bo.end(); check( !value.isEnabled() ); @@ -144,7 +144,7 @@ namespace sdw::FragmentWriter writer; auto & shader = writer.getShader(); std::string const name = "m_memberOptDis" + sdw::debug::getName( sdw::typeEnum< T > ); - sdw::Ubo bo{ writer, "UBO", { .binding = 1u, .set = 1u } }; + sdw::UniformBuffer bo{ writer, "UBO", { .binding = 1u, .set = 1u } }; auto value = bo.template declMember< T >( name, false ); bo.end(); check( !value.isEnabled() ); @@ -175,7 +175,7 @@ namespace sdw::FragmentWriter writer; auto & shader = writer.getShader(); std::string const name = "m_memberOptDisArray" + sdw::debug::getName( sdw::typeEnum< T > ); - sdw::Ubo bo{ writer, "UBO", 1u, 1u }; + sdw::UniformBuffer bo{ writer, "UBO", 1u, 1u }; auto value = bo.template declMember< T >( name, 4u, false ); bo.end(); check( !value.isEnabled() ); @@ -199,7 +199,7 @@ namespace sdw::FragmentWriter writer; auto & shader = writer.getShader(); std::string const name = "m_memberOptDisArray" + sdw::debug::getName( sdw::typeEnum< T > ); - sdw::Ubo bo{ writer, "UBO", { .binding = 1u, .set = 1u } }; + sdw::UniformBuffer bo{ writer, "UBO", { .binding = 1u, .set = 1u } }; auto value = bo.template declMember< T >( name, 4u, false ); bo.end(); check( !value.isEnabled() ); @@ -230,7 +230,7 @@ namespace sdw::FragmentWriter writer; auto & shader = writer.getShader(); std::string const name = "m_memberOptEn" + sdw::debug::getName( sdw::typeEnum< T > ); - sdw::Ubo bo{ writer, "UBO", 1u, 1u }; + sdw::UniformBuffer bo{ writer, "UBO", 1u, 1u }; auto value = bo.template declMember< T >( name, true ); bo.end(); check( value.isEnabled() ); @@ -254,7 +254,7 @@ namespace sdw::FragmentWriter writer; auto & shader = writer.getShader(); std::string const name = "m_memberOptEn" + sdw::debug::getName( sdw::typeEnum< T > ); - sdw::Ubo bo{ writer, "UBO", { .binding = 1u, .set = 1u } }; + sdw::UniformBuffer bo{ writer, "UBO", { .binding = 1u, .set = 1u } }; auto value = bo.template declMember< T >( name, true ); bo.end(); check( value.isEnabled() ); @@ -285,7 +285,7 @@ namespace sdw::FragmentWriter writer; auto & shader = writer.getShader(); std::string const name = "m_memberOptEnArray" + sdw::debug::getName( sdw::typeEnum< T > ); - sdw::Ubo bo{ writer, "UBO", 1u, 1u }; + sdw::UniformBuffer bo{ writer, "UBO", 1u, 1u }; auto value = bo.template declMember< T >( name, 4u, true ); bo.end(); check( value.isEnabled() ); @@ -309,7 +309,7 @@ namespace sdw::FragmentWriter writer; auto & shader = writer.getShader(); std::string const name = "m_memberOptEnArray" + sdw::debug::getName( sdw::typeEnum< T > ); - sdw::Ubo bo{ writer, "UBO", { .binding = 1u, .set = 1u } }; + sdw::UniformBuffer bo{ writer, "UBO", { .binding = 1u, .set = 1u } }; auto value = bo.template declMember< T >( name, 4u, true ); bo.end(); check( value.isEnabled() ); @@ -341,7 +341,7 @@ namespace { sdw::FragmentWriter writer; auto & shader = writer.getShader(); - sdw::UboHelperStd140T< sdw::StructFieldT< T, "member" > > bo{ writer, "UBO", 1u, 1u }; + sdw::UniformBufferHelperStd140T< sdw::StructFieldT< T, "member" > > bo{ writer, "UBO", 1u, 1u }; auto retrieved = bo.template getMember< "member" >(); check( getNonArrayKind( retrieved.getType() ) == sdw::typeEnum< T > ); check( getArraySize( retrieved.getType() ) == sdw::type::NotArray ); @@ -357,7 +357,7 @@ namespace { sdw::FragmentWriter writer; auto & shader = writer.getShader(); - sdw::UboHelperStd140T< sdw::StructFieldT< T, "member" > > bo{ writer, "UBO", { .binding = 1u, .set = 1u } }; + sdw::UniformBufferHelperStd140T< sdw::StructFieldT< T, "member" > > bo{ writer, "UBO", { .binding = 1u, .set = 1u } }; auto retrieved = bo.template getMember< "member" >(); check( getNonArrayKind( retrieved.getType() ) == sdw::typeEnum< T > ); check( getArraySize( retrieved.getType() ) == sdw::type::NotArray ); @@ -384,7 +384,7 @@ namespace { sdw::FragmentWriter writer; auto & shader = writer.getShader(); - sdw::UboHelperStd140T< sdw::StructFieldArrayT< T, "member", 4u > > bo{ writer, "UBO", 1u, 1u }; + sdw::UniformBufferHelperStd140T< sdw::StructFieldArrayT< T, "member", 4u > > bo{ writer, "UBO", 1u, 1u }; auto retrieved = bo.template getMember< "member" >(); check( getNonArrayKind( retrieved.getType() ) == sdw::typeEnum< T > ); check( getArraySize( retrieved.getType() ) == 4u ); @@ -400,7 +400,7 @@ namespace { sdw::FragmentWriter writer; auto & shader = writer.getShader(); - sdw::UboHelperStd140T< sdw::StructFieldArrayT< T, "member", 4u > > bo{ writer, "UBO", { .binding = 1u, .set = 1u } }; + sdw::UniformBufferHelperStd140T< sdw::StructFieldArrayT< T, "member", 4u > > bo{ writer, "UBO", { .binding = 1u, .set = 1u } }; auto retrieved = bo.template getMember< "member" >(); check( getNonArrayKind( retrieved.getType() ) == sdw::typeEnum< T > ); check( getArraySize( retrieved.getType() ) == 4u );