Added support for EXT_fragment_shader_interlock.

DragonJoker · May 15, 2024 · 8732c2d · 8732c2d
1 parent 073f111
commit 8732c2d
Show file tree

Hide file tree

Showing 40 changed files with 565 additions and 57 deletions.
diff --git a/include/CompilerSpirV/compileSpirV.hpp b/include/CompilerSpirV/compileSpirV.hpp
@@ -93,6 +93,8 @@ namespace spirv
 	makeSpirVExtension( v1_0, v1_3, vUnk, NV_mesh_shader );
 	// Enable this extension to be able to enable use derivatives in compute shader stage.
 	makeSpirVExtension( v1_0, v1_3, vUnk, NV_compute_shader_derivatives );
+	// Enable this extension to allow use of beginInvocationInterlock and endInvocationInterlock intrinsic functions.
+	makeSpirVExtension( v1_0, v1_3, vUnk, EXT_fragment_shader_interlock );
 	// Enable this extension to prevent mapping of demote instruction to discard instruction.
 	makeSpirVExtension( v1_0, v1_4, v1_6, EXT_demote_to_helper_invocation );
 	// Enable this extension if you need any of the following intrinsic functions:

diff --git a/include/GlslCommon/GlslStatementsHelpers.hpp b/include/GlslCommon/GlslStatementsHelpers.hpp
@@ -108,6 +108,7 @@ namespace glsl
 	makeGlExtension( v4_2, v4_2, v4_3, ARB_explicit_uniform_location );
 	makeGlExtension( v4_2, v4_2, vUnk, ARB_compute_shader );
 	makeGlExtension( v4_2, v4_2, vUnk, NV_shader_atomic_float );
+	makeGlExtension( v4_2, v4_5, vUnk, ARB_fragment_shader_interlock );
 	makeGlExtension( v4_3, v4_3, vUnk, NV_viewport_array2 );
 	makeGlExtension( v4_3, v4_3, vUnk, NV_shader_atomic_fp16_vector );
 	makeGlExtension( v4_4, v4_4, v4_5, ARB_derivative_control );

diff --git a/include/ShaderAST/Expr/EnumIntrinsic.hpp b/include/ShaderAST/Expr/EnumIntrinsic.hpp
@@ -1383,6 +1383,10 @@ namespace ast::expr
 		eReadFirstInvocation3D,
 		eReadFirstInvocation4D,
 
+	// Fragment Shader Interlock Functions
+		eBeginInvocationInterlock,
+		eEndInvocationInterlock,
+
 	// Boundaries,
 		eCount,
 		eInvalid = ~( 0u ),

diff --git a/include/ShaderAST/Expr/GetIntrinsicName.hpp b/include/ShaderAST/Expr/GetIntrinsicName.hpp
@@ -5398,6 +5398,16 @@ namespace ast::expr
 			result = "ReadFirstInvocation4D";
 			break;
 
+
+	// Fragment Shader Interlock Functions
+		case Intrinsic::eBeginInvocationInterlock:
+			result = "BeginInvocationInterlock";
+			break;
+
+		case Intrinsic::eEndInvocationInterlock:
+			result = "EndInvocationInterlock";
+			break;
+
 		default:
 			throw Exception{ "Unsupported Intrinsic type." };
 		}

diff --git a/include/ShaderAST/Expr/Intrinsic.enum b/include/ShaderAST/Expr/Intrinsic.enum
@@ -1371,4 +1371,8 @@ ASTIntrDecl( Intrinsic )
 	ASTIntrValue( type::Kind::eVec2D, ASTIntrName( readFirstInvocation, ReadFirstInvocation, 2, D ), ASTIntrParams( ASTIntrParam( type::Kind::eVec2D, value ) ) )
 	ASTIntrValue( type::Kind::eVec3D, ASTIntrName( readFirstInvocation, ReadFirstInvocation, 3, D ), ASTIntrParams( ASTIntrParam( type::Kind::eVec3D, value ) ) )
 	ASTIntrValue( type::Kind::eVec4D, ASTIntrName( readFirstInvocation, ReadFirstInvocation, 4, D ), ASTIntrParams( ASTIntrParam( type::Kind::eVec4D, value ) ) )
+
+	// Fragment Shader Interlock Functions
+	ASTIntrValue( type::Kind::eVoid, ASTIntrName( beginInvocationInterlock, BeginInvocationInterlock ) )
+	ASTIntrValue( type::Kind::eVoid, ASTIntrName( endInvocationInterlock, EndInvocationInterlock ) )
 ASTIntrEnd
diff --git a/include/ShaderAST/Expr/MakeIntrinsic.hpp b/include/ShaderAST/Expr/MakeIntrinsic.hpp
@@ -23427,6 +23427,28 @@ namespace ast::expr
 			, Intrinsic::eReadFirstInvocation4D
 			, std::move( value ) );
 	}
+	// Fragment Shader Interlock Functions
+
+	/**
+	*@return
+	*	void
+	*/
+	inline IntrinsicCallPtr makeBeginInvocationInterlock( ExprCache & exprCache
+		, type::TypesCache & typesCache )
+	{
+		return exprCache.makeIntrinsicCall( typesCache.getBasicType( type::Kind::eVoid )
+			, Intrinsic::eBeginInvocationInterlock );
+	}
+	/**
+	*@return
+	*	void
+	*/
+	inline IntrinsicCallPtr makeEndInvocationInterlock( ExprCache & exprCache
+		, type::TypesCache & typesCache )
+	{
+		return exprCache.makeIntrinsicCall( typesCache.getBasicType( type::Kind::eVoid )
+			, Intrinsic::eEndInvocationInterlock );
+	}
 }
 
 #endif
diff --git a/include/ShaderAST/ShaderASTPrerequisites.hpp b/include/ShaderAST/ShaderASTPrerequisites.hpp
@@ -153,6 +153,17 @@ namespace ast
 		eBackFacingTriangle = 0xFFu,
 	};
 
+	enum class InvocationOrdering
+	{
+		eNone = 0u,
+		ePixelInterlockOrdered = 1u,
+		ePixelInterlockUnordered = 2u,
+		eSampleInterlockOrdered = 3u,
+		eSampleInterlockUnordered = 4u,
+		eShadingRateInterlockOrdered = 5u,
+		eShadingRateInterlockUnordered = 6u,
+	};
+
 	enum class Builtin
 	{
 		eNone,

diff --git a/include/ShaderAST/Stmt/StmtCache.hpp b/include/ShaderAST/Stmt/StmtCache.hpp
@@ -39,7 +39,7 @@ namespace ast::stmt
 		SDAST_API ElseIfPtr makeElseIf( expr::ExprPtr ctrlExpr );
 		SDAST_API ElsePtr makeElse();
 		SDAST_API ForPtr makeFor( expr::ExprPtr initExpr, expr::ExprPtr ctrlExpr, expr::ExprPtr incrExpr );
-		SDAST_API FragmentLayoutPtr makeFragmentLayout( type::TypePtr type, FragmentOrigin origin, FragmentCenter center );
+		SDAST_API FragmentLayoutPtr makeFragmentLayout( type::TypePtr type, FragmentOrigin origin, FragmentCenter center, InvocationOrdering ordering );
 		SDAST_API FunctionDeclPtr makeFunctionDecl( var::VariablePtr funcVar, FunctionFlag flag = {} );
 		SDAST_API FunctionDeclPtr makeFunctionDecl( var::VariablePtr funcVar, uint32_t flags );
 		SDAST_API HitAttributeVariableDeclPtr makeHitAttributeVariableDecl( var::VariablePtr variable );

diff --git a/include/ShaderAST/Stmt/StmtFragmentLayout.hpp b/include/ShaderAST/Stmt/StmtFragmentLayout.hpp
@@ -18,7 +18,8 @@ namespace ast::stmt
 		SDAST_API FragmentLayout( StmtCache & stmtCache
 			, type::TypePtr type
 			, FragmentOrigin origin
-			, FragmentCenter center );
+			, FragmentCenter center
+			, InvocationOrdering ordering );
 
 		SDAST_API void accept( VisitorPtr vis )const override;
 
@@ -37,10 +38,16 @@ namespace ast::stmt
 			return m_center;
 		}
 
+		InvocationOrdering getOrdering()const
+		{
+			return m_ordering;
+		}
+
 	private:
 		type::TypePtr m_type;
 		FragmentOrigin m_origin{ FragmentOrigin::eUpperLeft };
 		FragmentCenter m_center{ FragmentCenter::eHalfPixel };
+		InvocationOrdering m_ordering{ InvocationOrdering::eNone };
 	};
 }
 

diff --git a/include/ShaderAST/Type/TypeFragmentIO.hpp b/include/ShaderAST/Type/TypeFragmentIO.hpp
@@ -13,8 +13,9 @@ namespace ast::type
 		: public Type
 	{
 		SDAST_API FragmentInput( TypePtr type
-			, ast::FragmentOrigin origin
-			, ast::FragmentCenter center );
+			, FragmentOrigin origin
+			, FragmentCenter center
+			, InvocationOrdering ordering );
 
 		TypePtr getType()const
 		{
@@ -31,20 +32,28 @@ namespace ast::type
 			return m_center;
 		}
 
+		InvocationOrdering getOrdering()const
+		{
+			return m_ordering;
+		}
+
 	private:
 		TypePtr m_type;
 		FragmentOrigin m_origin;
 		FragmentCenter m_center;
+		InvocationOrdering m_ordering;
 	};
 	using FragmentInputPtr = std::shared_ptr< FragmentInput >;
 
 	inline FragmentInputPtr makeFragmentInputType( TypePtr type
-		, ast::FragmentOrigin origin
-		, ast::FragmentCenter center )
+		, FragmentOrigin origin
+		, FragmentCenter center
+		, InvocationOrdering ordering )
 	{
 		return std::make_shared< FragmentInput >( type
 			, origin
-			, center );
+			, center
+			, ordering );
 	}
 }
 

diff --git a/include/ShaderWriter/FragmentWriter.hpp b/include/ShaderWriter/FragmentWriter.hpp
@@ -23,6 +23,7 @@ namespace sdw
 		FragmentInT( ShaderWriter & writer
 			, ast::FragmentOrigin origin
 			, ast::FragmentCenter center
+			, ast::InvocationOrdering ordering
 			, ParamsT && ... params );
 		template< typename ... ParamsT >
 		explicit FragmentInT( ShaderWriter & writer
@@ -101,6 +102,7 @@ namespace sdw
 		SDW_API void implementMain( FragmentMainFuncT< VoidT, VoidT > const & function );
 		SDW_API void implementMain( ast::FragmentOrigin origin
 			, ast::FragmentCenter center
+			, ast::InvocationOrdering ordering
 			, FragmentMainFuncT< VoidT, VoidT > const & function );
 
 		template< template< ast::var::Flag FlagT > typename InT
@@ -110,6 +112,7 @@ namespace sdw
 			, template< ast::var::Flag FlagT > typename OutT >
 		void implementMainT( ast::FragmentOrigin origin
 			, ast::FragmentCenter center
+			, ast::InvocationOrdering ordering
 			, FragmentMainFuncT< InT, OutT > const & function );
 
 		template< template< ast::var::Flag FlagT > typename InT
@@ -148,6 +151,14 @@ namespace sdw
 			, uint64_t attributes
 			, bool enabled = true );
 		/**@}*/
+		/**
+		*name
+		*	Shader Interlock declaration.
+		*/
+		/**@{*/
+		SDW_API void beginInvocationInterlock();
+		SDW_API void endInvocationInterlock();
+		/**@}*/
 	};
 	/**@}*/
 }

diff --git a/include/ShaderWriter/FragmentWriter.inl b/include/ShaderWriter/FragmentWriter.inl
@@ -12,13 +12,15 @@ namespace sdw
 	FragmentInT< DataT >::FragmentInT( ShaderWriter & writer
 		, ast::FragmentOrigin origin
 		, ast::FragmentCenter center
+		, ast::InvocationOrdering ordering
 		, ParamsT && ... params )
 		: FragmentInT{ writer
 			, makeExpr( writer
 				, getBuilder( writer ).registerName( "fragIn"
 					, makeFragmentInputType( makeType( getTypesCache( writer ), std::forward< ParamsT >( params )... )
 						, origin
-						, center )
+						, center
+						, ordering )
 					, FlagT ) ) }
 	{
 	}
@@ -30,6 +32,7 @@ namespace sdw
 		: FragmentInT{ writer
 			, ast::FragmentOrigin::eUpperLeft
 			, ast::FragmentCenter::eHalfPixel
+			, ast::InvocationOrdering::eNone
 			, std::forward< ParamsT >( params )... }
 	{
 	}
@@ -153,16 +156,18 @@ namespace sdw
 	{
 		this->implementMainT( ast::FragmentOrigin::eUpperLeft
 			, ast::FragmentCenter::eHalfPixel
+			, ast::InvocationOrdering::eNone
 			, function );
 	}
 
 	template< template< ast::var::Flag FlagT > typename InT
 		, template< ast::var::Flag FlagT > typename OutT >
 	inline void FragmentWriter::implementMainT( ast::FragmentOrigin origin
 		, ast::FragmentCenter center
+		, ast::InvocationOrdering ordering
 		, FragmentMainFuncT< InT, OutT > const & function )
 	{
-		this->implementMainT( FragmentInT< InT >{ *this, origin, center }
+		this->implementMainT( FragmentInT< InT >{ *this, origin, center, ordering }
 			, FragmentOutT< OutT >{ *this }
 			, function );
 	}

diff --git a/include/ShaderWriter/GraphicsPipelineWriter.hpp b/include/ShaderWriter/GraphicsPipelineWriter.hpp
@@ -31,6 +31,7 @@ namespace sdw
 		SDW_API void implementEntryPoint( FragmentMainFuncT< VoidT, VoidT > const & function );
 		SDW_API void implementEntryPoint( ast::FragmentOrigin origin
 			, ast::FragmentCenter center
+			, ast::InvocationOrdering ordering
 			, FragmentMainFuncT< VoidT, VoidT > const & function );
 
 		template< template< ast::var::Flag FlagT > typename InT
@@ -40,6 +41,7 @@ namespace sdw
 			, template< ast::var::Flag FlagT > typename OutT >
 		void implementEntryPointT( ast::FragmentOrigin origin
 			, ast::FragmentCenter center
+			, ast::InvocationOrdering ordering
 			, FragmentMainFuncT< InT, OutT > const & function );
 
 		template< template< ast::var::Flag FlagT > typename InT
@@ -80,6 +82,16 @@ namespace sdw
 			, uint64_t attributes
 			, bool enabled = true );
 		/**@}*/
+#pragma endregion
+#pragma region Shader Interlock declaration
+		/**
+		*name
+		*	Shader Interlock declaration.
+		*/
+		/**@{*/
+		SDW_API void beginInvocationInterlock();
+		SDW_API void endInvocationInterlock();
+		/**@}*/
 #pragma endregion
 		/**@}*/
 #pragma endregion

diff --git a/include/ShaderWriter/GraphicsPipelineWriter.inl b/include/ShaderWriter/GraphicsPipelineWriter.inl
@@ -21,16 +21,18 @@ namespace sdw
 	{
 		this->implementEntryPointT( ast::FragmentOrigin::eUpperLeft
 			, ast::FragmentCenter::eHalfPixel
+			, ast::InvocationOrdering::eNone
 			, function );
 	}
 
 	template< template< ast::var::Flag FlagT > typename InT
 		, template< ast::var::Flag FlagT > typename OutT >
 	inline void GraphicsPipelineWriter::implementEntryPointT( ast::FragmentOrigin origin
 		, ast::FragmentCenter center
+		, ast::InvocationOrdering ordering
 		, FragmentMainFuncT< InT, OutT > const & function )
 	{
-		this->implementEntryPointT( FragmentInT< InT >{ *this, origin, center }
+		this->implementEntryPointT( FragmentInT< InT >{ *this, origin, center, ordering }
 			, FragmentOutT< OutT >{ *this }
 			, function );
 	}

diff --git a/include/ShaderWriter/Intrinsics/IntrinsicFunctions.hpp b/include/ShaderWriter/Intrinsics/IntrinsicFunctions.hpp
@@ -2766,6 +2766,24 @@ namespace sdw
 	SDW_API RetDVec4 readFirstInvocation( DVec4 const value );
 	/**@}*/
 #pragma endregion
+#pragma region beginInvocationInterlock
+	/**
+	*name
+	*	beginInvocationInterlock
+	*/
+	/**@{*/
+	SDW_API RetVoid beginInvocationInterlock( ShaderWriter & writer );
+	/**@}*/
+#pragma endregion
+#pragma region endInvocationInterlock
+	/**
+	*name
+	*	endInvocationInterlock
+	*/
+	/**@{*/
+	SDW_API RetVoid endInvocationInterlock( ShaderWriter & writer );
+	/**@}*/
+#pragma endregion
 }
 
 #endif
diff --git a/source/CompilerGlsl/GlslAdaptStatements.cpp b/source/CompilerGlsl/GlslAdaptStatements.cpp
@@ -1757,7 +1757,8 @@ namespace glsl
 
 				m_current->addStmt( m_stmtCache.makeFragmentLayout( type
 					, fragType.getOrigin()
-					, fragType.getCenter() ) );
+					, fragType.getCenter()
+					, fragType.getOrdering() ) );
 			}
 
 			void doProcess( ast::var::VariablePtr var

diff --git a/source/CompilerHlsl/HlslHelpers.cpp b/source/CompilerHlsl/HlslHelpers.cpp
@@ -3150,7 +3150,8 @@ namespace hlsl
 		m_highFreqInputs.initialiseMainVar( var
 			, ast::type::makeFragmentInputType( m_highFreqInputs.paramStruct
 				, fragType.getOrigin()
-				, fragType.getCenter() )
+				, fragType.getCenter()
+				, fragType.getOrdering() )
 			, m_currentRoutine->paramToEntryPoint );
 	}
 

diff --git a/source/CompilerSpirV/SpirVAdaptStatements.cpp b/source/CompilerSpirV/SpirVAdaptStatements.cpp
@@ -151,7 +151,8 @@ namespace spirv
 				auto type = fragType.getType();
 				m_current->addStmt( m_stmtCache.makeFragmentLayout( type
 					, fragType.getOrigin()
-					, fragType.getCenter() ) );
+					, fragType.getCenter()
+					, fragType.getOrdering() ) );
 			}
 
 			void doProcess( ast::type::GeometryOutput const & geomType )

diff --git a/source/CompilerSpirV/SpirVFillConfig.cpp b/source/CompilerSpirV/SpirVFillConfig.cpp
@@ -576,6 +576,23 @@ namespace spirv
 
 			void visitFragmentLayoutStmt( ast::stmt::FragmentLayout const * stmt )override
 			{
+				switch ( stmt->getOrdering() )
+				{
+				case ast::InvocationOrdering::ePixelInterlockOrdered:
+				case ast::InvocationOrdering::ePixelInterlockUnordered:
+					m_result.registerCapability( spv::CapabilityFragmentShaderPixelInterlockEXT );
+					break;
+				case ast::InvocationOrdering::eSampleInterlockOrdered:
+				case ast::InvocationOrdering::eSampleInterlockUnordered:
+					m_result.registerCapability( spv::CapabilityFragmentShaderSampleInterlockEXT );
+					break;
+				case ast::InvocationOrdering::eShadingRateInterlockOrdered:
+				case ast::InvocationOrdering::eShadingRateInterlockUnordered:
+					m_result.registerCapability( spv::CapabilityFragmentShaderShadingRateInterlockEXT );
+					break;
+				default:
+					break;
+				}
 			}
 
 			void visitFunctionDeclStmt( ast::stmt::FunctionDecl const * stmt )override