ShaderWriter: Added MixedStructInstanceHelperT.

This class allows declaring a structure to use as IO and buffer block.

.github/workflows/cmake.yml

@@ -60,12 +60,6 @@ jobs:
       shell: bash
       run: |
         cmake --build . --parallel 2 --config ${{ matrix.buildType }}
-    - name: Test
-      if: (steps.build.conclusion == 'success')
-      working-directory: ${{runner.workspace}}/build-${{ matrix.buildType }}
-      shell: bash
-      run: |
-        ctest -C ${{ matrix.buildType }}
     - name: Prepare success package
       if: (github.event_name == 'push') && (steps.build.conclusion == 'success')
       working-directory: ${{runner.workspace}}/build-${{ matrix.buildType }}

include/ShaderWriter/CompositeTypes/IOStructInstanceHelper.hpp

@@ -5,20 +5,25 @@ See LICENSE file in root folder
 #define ___SDW_IOStructInstanceHelper_H___
 #pragma once
 
-#if SDW_EnableStructHelper
+#include "MixedStructInstanceHelper.hpp"
 
-#include "StructInstance.hpp"
+#if SDW_EnableStructHelper
 
 namespace sdw
 {
 	template< ast::var::Flag FlagT
 		, StringLiteralT StructNameT
 		, typename... FieldsT >
 	class IOStructInstanceHelperT
-		: public StructInstance
+		: public MixedStructInstanceHelperT< FlagT
+			, StructNameT
+			, ast::type::MemoryLayout::eC
+			, FieldsT... >
 	{
-		static_assert( sizeof...( FieldsT ) > 0
-			, "A structure must have at least one field" );
+		using MyHelper = MixedStructInstanceHelperT< FlagT
+			, StructNameT
+			, ast::type::MemoryLayout::eC
+			, FieldsT... >;
 
 	public:
 		~IOStructInstanceHelperT() override = default;
@@ -28,83 +33,24 @@ namespace sdw
 		IOStructInstanceHelperT( ShaderWriter & writer
 			, ast::expr::ExprPtr expr
 			, bool enabled = true )
-			: StructInstance{ writer, std::move( expr ), enabled }
+			: MyHelper{ writer, std::move( expr ), enabled }
 		{
 		}
 
 		IOStructInstanceHelperT & operator=( IOStructInstanceHelperT const & rhs )
 		{
-			StructInstance::operator=( rhs );
+			MyHelper::operator=( rhs );
 			return *this;
 		}
 
 		IOStructInstanceHelperT & operator=( IOStructInstanceHelperT && rhs )
 		{
-			StructInstance::operator=( std::move( rhs ) );
+			MyHelper::operator=( std::move( rhs ) );
 			return *this;
 		}
 
-		template< sdw::StringLiteralT FieldNameT >
-		constexpr static auto getFieldByName()
-		{
-			return doGetFieldByName< FieldNameT, FieldsT... >();
-		}
-
-		template< sdw::StringLiteralT FieldNameT >
-		constexpr static bool hasFieldByName()
-		{
-			return ( ... || ( std::string_view( FieldNameT.value ) == FieldsT::Name ) );
-		}
-
-		template< sdw::StringLiteralT FieldNameT >
-		auto getMember()const
-		{
-			static_assert( hasFieldByName< FieldNameT >() );
-			using FieldT = decltype( getFieldByName< FieldNameT >() );
-			return FieldT::template get( *this );
-		}
-
-		static type::IOStructPtr makeIOType( type::TypesCache & cache
-			, ast::EntryPoint entryPoint )
-		{
-			auto result = cache.getIOStruct( std::string( StructNameT.value )
-				, entryPoint
-				, FlagT );
-
-			if ( result->empty() )
-			{
-				( result->declMember( std::string( FieldsT::Name )
-					, FieldsT::TypeT::makeType( cache )
-					, FieldsT::ArraySize
-					, FieldsT::Location )
-					, ... );
-			}
-
-			return result;
-		}
-
-		using StructInstance::getMember;
-		using StructInstance::getMemberArray;
-
-	private:
-		template< sdw::StringLiteralT FieldNameT >
-		constexpr static auto doGetFieldByName()
-		{
-			return sdw::Void{};
-		}
-
-		template< sdw::StringLiteralT FieldNameT, typename FieldU, typename... FieldsU >
-		constexpr static auto doGetFieldByName()
-		{
-			if constexpr ( std::string_view( FieldNameT.value ) == FieldU::Name )
-			{
-				return FieldU{};
-			}
-			else
-			{
-				return doGetFieldByName< FieldNameT, FieldsU... >();
-			}
-		}
+		using MyHelper::getMember;
+		using MyHelper::getMemberArray;
 	};
 }
 #endif

include/ShaderWriter/CompositeTypes/MixedStructInstanceHelper.hpp

@@ -0,0 +1,129 @@
+/*
+See LICENSE file in root folder
+*/
+#ifndef ___SDW_MixedStructInstanceHelper_H___
+#define ___SDW_MixedStructInstanceHelper_H___
+#pragma once
+
+#include "StructInstance.hpp"
+
+#if SDW_EnableStructHelper
+
+namespace sdw
+{
+	template< ast::var::Flag FlagT
+		, StringLiteralT StructNameT
+		, ast::type::MemoryLayout LayoutT
+		, typename... FieldsT >
+	class MixedStructInstanceHelperT
+		: public StructInstance
+	{
+		static_assert( sizeof...( FieldsT ) > 0
+			, "A structure must have at least one field" );
+
+	public:
+		~MixedStructInstanceHelperT() override = default;
+		MixedStructInstanceHelperT( MixedStructInstanceHelperT const & ) = default;
+		MixedStructInstanceHelperT( MixedStructInstanceHelperT && ) = default;
+
+		MixedStructInstanceHelperT( ShaderWriter & writer
+			, ast::expr::ExprPtr expr
+			, bool enabled = true )
+			: StructInstance{ writer, std::move( expr ), enabled }
+		{
+		}
+
+		MixedStructInstanceHelperT & operator=( MixedStructInstanceHelperT const & rhs )
+		{
+			StructInstance::operator=( rhs );
+			return *this;
+		}
+
+		MixedStructInstanceHelperT & operator=( MixedStructInstanceHelperT && rhs )
+		{
+			StructInstance::operator=( std::move( rhs ) );
+			return *this;
+		}
+
+		template< sdw::StringLiteralT FieldNameT >
+		constexpr static auto getFieldByName()
+		{
+			return doGetFieldByName< FieldNameT, FieldsT... >();
+		}
+
+		template< sdw::StringLiteralT FieldNameT >
+		constexpr static bool hasFieldByName()
+		{
+			return ( ... || ( std::string_view( FieldNameT.value ) == FieldsT::Name ) );
+		}
+
+		template< sdw::StringLiteralT FieldNameT >
+		auto getMember()const
+		{
+			static_assert( hasFieldByName< FieldNameT >() );
+			using FieldT = decltype( getFieldByName< FieldNameT >() );
+			return FieldT::template get( *this );
+		}
+
+		static type::IOStructPtr makeIOType( type::TypesCache & cache
+			, ast::EntryPoint entryPoint )
+		{
+			auto result = cache.getIOStruct( std::string( StructNameT.value )
+				, entryPoint
+				, FlagT );
+
+			if ( result->empty() )
+			{
+				( result->declMember( std::string( FieldsT::Name )
+					, FieldsT::TypeT::makeType( cache )
+					, FieldsT::ArraySize
+					, FieldsT::Location )
+					, ... );
+			}
+
+			return result;
+		}
+
+		static type::BaseStructPtr makeType( type::TypesCache & cache )
+		{
+			auto result = cache.getStruct( LayoutT
+				, std::string( StructNameT.value ) );
+
+			if ( result->empty() )
+			{
+				( result->declMember( std::string( FieldsT::Name )
+					, FieldsT::TypeT::makeType( cache )
+					, FieldsT::ArraySize )
+					, ... );
+			}
+
+			return result;
+		}
+
+		using StructInstance::getMember;
+		using StructInstance::getMemberArray;
+
+	private:
+		template< sdw::StringLiteralT FieldNameT >
+		constexpr static auto doGetFieldByName()
+		{
+			return sdw::Void{};
+		}
+
+		template< sdw::StringLiteralT FieldNameT, typename FieldU, typename... FieldsU >
+		constexpr static auto doGetFieldByName()
+		{
+			if constexpr ( std::string_view( FieldNameT.value ) == FieldU::Name )
+			{
+				return FieldU{};
+			}
+			else
+			{
+				return doGetFieldByName< FieldNameT, FieldsU... >();
+			}
+		}
+	};
+}
+#endif
+
+#endif

include/ShaderWriter/CompositeTypes/StructHelper.hpp

@@ -4,9 +4,10 @@ See LICENSE file in root folder
 #ifndef ___SDW_StructHelper_H___
 #define ___SDW_StructHelper_H___
 
+#include "ShaderWriter/ShaderWriterPrerequisites.hpp"
+
 #if SDW_EnableStructHelper
 
-#include "ShaderWriter/ShaderWriterPrerequisites.hpp"
 #include "ShaderWriter/BaseTypes/Void.hpp"
 
 namespace sdw

include/ShaderWriter/CompositeTypes/StructInstanceHelper.hpp

@@ -5,10 +5,10 @@ See LICENSE file in root folder
 #define ___SDW_StructInstanceHelper_H___
 #pragma once
 
-#if SDW_EnableStructHelper
-
 #include "StructInstance.hpp"
 
+#if SDW_EnableStructHelper
+
 namespace sdw
 {
 	template< StringLiteralT StructNameT

include/ShaderWriter/TessellationControlWriter.hpp

@@ -4,7 +4,7 @@ See LICENSE file in root folder
 #ifndef ___SDW_TessellationControlWriter_H___
 #define ___SDW_TessellationControlWriter_H___
 
-#include "ShaderWriter/Writer.hpp"
+#include "ShaderWriter/EntryPointWriter.hpp"
 #include "ShaderWriter/Intrinsics/Intrinsics.hpp"
 
 namespace sdw

source/ShaderWriter/CMakeLists.txt

@@ -224,6 +224,8 @@ set( ${PROJECT_NAME}_FOLDER_HEADER_FILES
 	${INCLUDE_DIR}/CompositeTypes/FunctionParam.inl
 	${INCLUDE_DIR}/CompositeTypes/IOStructHelper.hpp
 	${INCLUDE_DIR}/CompositeTypes/IOStructInstanceHelper.hpp
+	${INCLUDE_DIR}/CompositeTypes/MixedStructHelper.hpp
+	${INCLUDE_DIR}/CompositeTypes/MixedStructInstanceHelper.hpp
 	${INCLUDE_DIR}/CompositeTypes/PerPrimitive.hpp
 	${INCLUDE_DIR}/CompositeTypes/PerVertex.hpp
 	${INCLUDE_DIR}/CompositeTypes/PushConstantBuffer.hpp

source/ShaderWriter/RayTraceWriter.cpp

@@ -3,6 +3,9 @@ See LICENSE file in root folder
 */
 #include "ShaderWriter/RayTraceWriter.hpp"
 
+#include <ShaderAST/Stmt/StmtIgnoreIntersection.hpp>
+#include <ShaderAST/Stmt/StmtTerminateRay.hpp>
+
 namespace sdw
 {
 	RayTraceWriter::RayTraceWriter( ShaderAllocator * allocator )

test/ShaderWriter/TestWriterCompositeCtors.cpp

@@ -1,8 +1,8 @@
 #include "Common.hpp"
 #include "WriterCommon.hpp"
 
-#include <ShaderWriter/CompositeTypes/IOStructHelper.hpp>
-#include <ShaderWriter/CompositeTypes/IOStructInstanceHelper.hpp>
+#include <ShaderWriter/CompositeTypes/StructHelper.hpp>
+#include <ShaderWriter/CompositeTypes/StructInstanceHelper.hpp>
 
 #pragma warning( disable:5245 )
 #pragma GCC diagnostic ignored "-Wunused-function"