Skip to content

Reworked functions export in another way. #292

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
DragonJoker merged 1 commit into from
Mar 5, 2026
Merged

Reworked functions export in another way. #292

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion CMake
Open in desktop
Submodule CMake updated 4 files
+0 −1 CompilationFlags.cmake
+4 −2 Modules/FindATL.cmake
+128 −282 Modules/FindFbxSDK.cmake
+1 −0 Project.cmake
1 change: 0 additions & 1 deletion CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,6 @@ if( MSVC )
string( REGEX REPLACE "/W[0-4]" "" CMAKE_C_FLAGS "${CMAKE_C_FLAGS}" )
string( REGEX REPLACE "/W[0-4]" "" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}" )
string( REGEX REPLACE "/Zm[0-9]*" "" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}" )
set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /Zm300" )
add_definitions( -D_CRT_SECURE_NO_WARNINGS )
endif()

Expand Down
2 changes: 1 addition & 1 deletion include/ShaderWriter/BaseTypes/ArithmeticValue.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ namespace sdw
struct ArithmeticValue
: public Value
{
SDW_DeclValue( ArithmeticValue );
SDW_DeclValue( , ArithmeticValue );

ArithmeticValue( ShaderWriter & writer
, expr::ExprPtr expr
Expand Down
2 changes: 1 addition & 1 deletion include/ShaderWriter/BaseTypes/Array.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ namespace sdw
struct Array
: public Value
{
SDW_DeclValue( Array );
SDW_DeclValue( , Array );

Array( ShaderWriter & writer
, expr::ExprPtr expr
Expand Down
2 changes: 1 addition & 1 deletion include/ShaderWriter/BaseTypes/Boolean.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ namespace sdw
struct Boolean
: public Value
{
SDW_DeclValue( Boolean );
SDW_DeclValue( SDW_INL_API, Boolean );

SDW_API Boolean( ShaderWriter & writer
, expr::ExprPtr expr
Expand Down
2 changes: 1 addition & 1 deletion include/ShaderWriter/BaseTypes/CallableData.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ namespace sdw
struct CallableDataBaseT
: public ValueT
{
SDW_DeclValue( CallableDataBaseT );
SDW_DeclValue( , CallableDataBaseT );

template< typename ... ParamsT >
CallableDataBaseT( ShaderWriter & writer
Expand Down
6 changes: 3 additions & 3 deletions include/ShaderWriter/BaseTypes/CombinedImage.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@ namespace sdw
struct CombinedImage
: public Value
{
SDW_DeclValue( CombinedImage );
SDW_DeclValue( SDW_INL_API, CombinedImage );

SDW_API CombinedImage( ShaderWriter & writer
, expr::ExprPtr expr
Expand All @@ -138,7 +138,7 @@ namespace sdw
struct CombinedImageFuncsT
: public CombinedImage
{
SDW_DeclValue( CombinedImageFuncsT );
SDW_DeclValue( , CombinedImageFuncsT );

CombinedImageFuncsT( ShaderWriter & writer
, expr::ExprPtr expr
Expand All @@ -154,7 +154,7 @@ namespace sdw
struct CombinedImageT
: public combinedSmplImg::CombinedImageFuncsT< FormatT, DimT, ArrayedT, MsT, DepthT >
{
SDW_DeclValue( CombinedImageT );
SDW_DeclValue( , CombinedImageT );

static constexpr ast::type::ImageFormat Format = FormatT;
static constexpr ast::type::ImageDim Dim = DimT;
Expand Down
22 changes: 11 additions & 11 deletions include/ShaderWriter/BaseTypes/CombinedImage.inl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2716,7 +2716,7 @@ namespace sdw
, public GatherOffsetFuncT< FormatT, DimT, ArrayedT, MsT >
, public GatherOffsetsFuncT< FormatT, DimT, ArrayedT, MsT >
{
SDW_DeclValue( CombinedImageFuncsT );
SDW_DeclValue( , CombinedImageFuncsT );

using SampleFuncT< FormatT, DimT, ArrayedT, MsT >::sample;
using SampleBiasFuncT< FormatT, DimT, ArrayedT, MsT >::sample;
Expand Down Expand Up @@ -2785,7 +2785,7 @@ namespace sdw
, public GradProjFuncT< FormatT, DimT, ArrayedT, MsT >
, public GradProjOffsetFuncT< FormatT, DimT, ArrayedT, MsT >
{
SDW_DeclValue( CombinedImageFuncsT );
SDW_DeclValue( , CombinedImageFuncsT );

using SampleFuncT< FormatT, DimT, ArrayedT, MsT >::sample;
using SampleBiasFuncT< FormatT, DimT, ArrayedT, MsT >::sample;
Expand Down Expand Up @@ -2842,7 +2842,7 @@ namespace sdw
, public GradFuncT< FormatT, DimT, ArrayedT, MsT >
, public GradOffsetFuncT< FormatT, DimT, ArrayedT, MsT >
{
SDW_DeclValue( CombinedImageFuncsT );
SDW_DeclValue( , CombinedImageFuncsT );

using SampleFuncT< FormatT, DimT, ArrayedT, MsT >::sample;
using SampleBiasFuncT< FormatT, DimT, ArrayedT, MsT >::sample;
Expand Down Expand Up @@ -2894,7 +2894,7 @@ namespace sdw
, public GatherOffsetFuncT< FormatT, DimT, ArrayedT, MsT >
, public GatherOffsetsFuncT< FormatT, DimT, ArrayedT, MsT >
{
SDW_DeclValue( CombinedImageFuncsT );
SDW_DeclValue( , CombinedImageFuncsT );

using SampleFuncT< FormatT, DimT, ArrayedT, MsT >::sample;
using SampleBiasFuncT< FormatT, DimT, ArrayedT, MsT >::sample;
Expand Down Expand Up @@ -2942,7 +2942,7 @@ namespace sdw
, public GradFuncT< FormatT, DimT, ArrayedT, MsT >
, public GatherFuncT< FormatT, DimT, ArrayedT, MsT >
{
SDW_DeclValue( CombinedImageFuncsT );
SDW_DeclValue( , CombinedImageFuncsT );

using SampleFuncT< FormatT, DimT, ArrayedT, MsT >::sample;
using SampleBiasFuncT< FormatT, DimT, ArrayedT, MsT >::sample;
Expand Down Expand Up @@ -2990,7 +2990,7 @@ namespace sdw
, public GradRefProjFuncT< FormatT, DimT, ArrayedT, MsT >
, public GradRefProjOffsetFuncT< FormatT, DimT, ArrayedT, MsT >
{
SDW_DeclValue( CombinedImageFuncsT );
SDW_DeclValue( , CombinedImageFuncsT );

using SampleRefFuncT< FormatT, DimT, ArrayedT, MsT >::sample;
using SampleRefBiasFuncT< FormatT, DimT, ArrayedT, MsT >::sample;
Expand Down Expand Up @@ -3054,7 +3054,7 @@ namespace sdw
, public GatherRefOffsetFuncT< FormatT, DimT, ArrayedT, MsT >
, public GatherRefOffsetsFuncT< FormatT, DimT, ArrayedT, MsT >
{
SDW_DeclValue( CombinedImageFuncsT );
SDW_DeclValue( , CombinedImageFuncsT );

using SampleRefFuncT< FormatT, DimT, ArrayedT, MsT >::sample;
using SampleRefBiasFuncT< FormatT, DimT, ArrayedT, MsT >::sample;
Expand Down Expand Up @@ -3109,7 +3109,7 @@ namespace sdw
, public GradRefFuncT< FormatT, DimT, ArrayedT, MsT >
, public GradRefOffsetFuncT< FormatT, DimT, ArrayedT, MsT >
{
SDW_DeclValue( CombinedImageFuncsT );
SDW_DeclValue( , CombinedImageFuncsT );

using SampleRefFuncT< FormatT, DimT, ArrayedT, MsT >::sample;
using SampleRefBiasFuncT< FormatT, DimT, ArrayedT, MsT >::sample;
Expand Down Expand Up @@ -3155,7 +3155,7 @@ namespace sdw
, public GatherRefOffsetFuncT< FormatT, DimT, ArrayedT, MsT >
, public GatherRefOffsetsFuncT< FormatT, DimT, ArrayedT, MsT >
{
SDW_DeclValue( CombinedImageFuncsT );
SDW_DeclValue( , CombinedImageFuncsT );

using SampleRefFuncT< FormatT, DimT, ArrayedT, MsT >::sample;
using SampleRefBiasFuncT< FormatT, DimT, ArrayedT, MsT >::sample;
Expand Down Expand Up @@ -3199,7 +3199,7 @@ namespace sdw
, public SampleRefLodFuncT< FormatT, DimT, ArrayedT, MsT >
, public GatherRefFuncT< FormatT, DimT, ArrayedT, MsT >
{
SDW_DeclValue( CombinedImageFuncsT );
SDW_DeclValue( , CombinedImageFuncsT );

using SampleRefFuncT< FormatT, DimT, ArrayedT, MsT >::sample;
using SampleRefBiasFuncT< FormatT, DimT, ArrayedT, MsT >::sample;
Expand Down Expand Up @@ -3229,7 +3229,7 @@ namespace sdw
, public TexSizeFuncT< FormatT, DimT, ArrayedT, MsT, DepthT >
, public FetchFuncT< FormatT, DimT, ArrayedT, MsT >
{
SDW_DeclValue( CombinedImageFuncsT );
SDW_DeclValue( , CombinedImageFuncsT );

CombinedImageFuncsT( ShaderWriter & writer
, expr::ExprPtr expr
Expand Down
2 changes: 1 addition & 1 deletion include/ShaderWriter/BaseTypes/HitAttribute.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ namespace sdw
struct HitAttributeT
: public ValueT
{
SDW_DeclValue( HitAttributeT );
SDW_DeclValue( , HitAttributeT );

template< typename ... ParamsT >
explicit HitAttributeT( ShaderWriter & writer
Expand Down
2 changes: 1 addition & 1 deletion include/ShaderWriter/BaseTypes/IntegerValue.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ namespace sdw
struct IntegerValue
: public Value
{
SDW_DeclValue( IntegerValue );
SDW_DeclValue( , IntegerValue );

IntegerValue( ShaderWriter & writer
, expr::ExprPtr expr
Expand Down
2 changes: 1 addition & 1 deletion include/ShaderWriter/BaseTypes/RayPayload.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ namespace sdw
struct RayPayloadBaseT
: public ValueT
{
SDW_DeclValue( RayPayloadBaseT );
SDW_DeclValue( , RayPayloadBaseT );

template< typename ... ParamsT >
RayPayloadBaseT( ShaderWriter & writer
Expand Down
4 changes: 2 additions & 2 deletions include/ShaderWriter/BaseTypes/SampledImage.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ namespace sdw
struct SampledImage
: public Value
{
SDW_DeclValue( SampledImage );
SDW_DeclValue( SDW_INL_API, SampledImage );

SDW_API SampledImage( ShaderWriter & writer
, expr::ExprPtr expr
Expand All @@ -25,7 +25,7 @@ namespace sdw
struct SampledImageT
: public SampledImage
{
SDW_DeclValue( SampledImageT );
SDW_DeclValue( , SampledImageT );

static constexpr ast::type::ImageFormat Format = FormatT;
static constexpr ast::type::ImageDim Dim = DimT;
Expand Down
4 changes: 2 additions & 2 deletions include/ShaderWriter/BaseTypes/Sampler.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ namespace sdw
struct Sampler
: public Value
{
SDW_DeclValue( Sampler );
SDW_DeclValue( SDW_INL_API, Sampler );

SDW_API Sampler( ShaderWriter & writer
, expr::ExprPtr expr
Expand All @@ -28,7 +28,7 @@ namespace sdw
struct SamplerT
: public Sampler
{
SDW_DeclValue( SamplerT );
SDW_DeclValue( , SamplerT );

static constexpr bool Comparison = ComparisonT;

Expand Down
6 changes: 3 additions & 3 deletions include/ShaderWriter/BaseTypes/StorageImage.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ namespace sdw
struct StorageImage
: public Value
{
SDW_DeclValue( StorageImage );
SDW_DeclValue( SDW_INL_API, StorageImage );

SDW_API StorageImage( ShaderWriter & writer
, expr::ExprPtr expr
Expand All @@ -41,7 +41,7 @@ namespace sdw
struct StorageImageFuncsT
: public StorageImage
{
SDW_DeclValue( StorageImageFuncsT );
SDW_DeclValue( , StorageImageFuncsT );

StorageImageFuncsT( ShaderWriter & writer
, expr::ExprPtr expr
Expand All @@ -57,7 +57,7 @@ namespace sdw
struct StorageImageT
: public storageImg::StorageImageFuncsT< FormatT, AccessT, DimT, ArrayedT, MsT >
{
SDW_DeclValue( StorageImageT );
SDW_DeclValue( , StorageImageT );

static constexpr ast::type::ImageFormat Format = FormatT;
static constexpr ast::type::AccessKind Access = AccessT;
Expand Down
26 changes: 13 additions & 13 deletions include/ShaderWriter/BaseTypes/StorageImage.inl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1774,7 +1774,7 @@ namespace sdw
: public StorageImage
, public ImgSizeFuncT< FormatT, AccessT, DimT, ArrayedT, MsT >
{
SDW_DeclValue( StorageImageFuncsT );
SDW_DeclValue( , StorageImageFuncsT );

StorageImageFuncsT( ShaderWriter & writer
, expr::ExprPtr expr
Expand Down Expand Up @@ -1803,7 +1803,7 @@ namespace sdw
, public ImgSizeFuncT< FormatT, AccessT, DimT, ArrayedT, MsT >
, public ImgStoreFuncT< FormatT, AccessT, DimT, ArrayedT >
{
SDW_DeclValue( StorageImageFuncsT );
SDW_DeclValue( , StorageImageFuncsT );

StorageImageFuncsT( ShaderWriter & writer
, expr::ExprPtr expr
Expand Down Expand Up @@ -1832,7 +1832,7 @@ namespace sdw
, public ImgSizeFuncT< FormatT, AccessT, DimT, ArrayedT, MsT >
, public ImgLoadFuncT< FormatT, AccessT, DimT, ArrayedT >
{
SDW_DeclValue( StorageImageFuncsT );
SDW_DeclValue( , StorageImageFuncsT );

StorageImageFuncsT( ShaderWriter & writer
, expr::ExprPtr expr
Expand Down Expand Up @@ -1863,7 +1863,7 @@ namespace sdw
, public ImgLoadFuncT< FormatT, AccessT, DimT, ArrayedT >
, public ImgStoreFuncT< FormatT, AccessT, DimT, ArrayedT >
{
SDW_DeclValue( StorageImageFuncsT );
SDW_DeclValue( , StorageImageFuncsT );

StorageImageFuncsT( ShaderWriter & writer
, expr::ExprPtr expr
Expand Down Expand Up @@ -1909,7 +1909,7 @@ namespace sdw
, public ImgAtomicAddFuncT< FormatT, AccessT, DimT, ArrayedT >
, public ImgAtomicExchangeFuncT< FormatT, AccessT, DimT, ArrayedT >
{
SDW_DeclValue( StorageImageFuncsT );
SDW_DeclValue( , StorageImageFuncsT );

StorageImageFuncsT( ShaderWriter & writer
, expr::ExprPtr expr
Expand Down Expand Up @@ -1941,7 +1941,7 @@ namespace sdw
, public ImgLoadFuncT< FormatT, AccessT, DimT, ArrayedT >
, public ImgStoreFuncT< FormatT, AccessT, DimT, ArrayedT >
{
SDW_DeclValue( StorageImageFuncsT );
SDW_DeclValue( , StorageImageFuncsT );

StorageImageFuncsT( ShaderWriter & writer
, expr::ExprPtr expr
Expand Down Expand Up @@ -1980,7 +1980,7 @@ namespace sdw
, public ImgAtomicExchangeFuncT< FormatT, AccessT, DimT, ArrayedT >
, public ImgAtomicCompSwapFuncT< FormatT, AccessT, DimT, ArrayedT >
{
SDW_DeclValue( StorageImageFuncsT );
SDW_DeclValue( , StorageImageFuncsT );

StorageImageFuncsT( ShaderWriter & writer
, expr::ExprPtr expr
Expand Down Expand Up @@ -2009,7 +2009,7 @@ namespace sdw
, public ImgSizeFuncT< FormatT, AccessT, DimT, ArrayedT, MsT >
, public ImgSamplesFuncT< FormatT, AccessT, DimT, ArrayedT >
{
SDW_DeclValue( StorageImageFuncsT );
SDW_DeclValue( , StorageImageFuncsT );

StorageImageFuncsT( ShaderWriter & writer
, expr::ExprPtr expr
Expand Down Expand Up @@ -2039,7 +2039,7 @@ namespace sdw
, public ImgSamplesFuncT< FormatT, AccessT, DimT, ArrayedT >
, public ImgMsStoreFuncT< FormatT, AccessT, DimT, ArrayedT >
{
SDW_DeclValue( StorageImageFuncsT );
SDW_DeclValue( , StorageImageFuncsT );

StorageImageFuncsT( ShaderWriter & writer
, expr::ExprPtr expr
Expand Down Expand Up @@ -2069,7 +2069,7 @@ namespace sdw
, public ImgSamplesFuncT< FormatT, AccessT, DimT, ArrayedT >
, public ImgMsLoadFuncT< FormatT, AccessT, DimT, ArrayedT >
{
SDW_DeclValue( StorageImageFuncsT );
SDW_DeclValue( , StorageImageFuncsT );

StorageImageFuncsT( ShaderWriter & writer
, expr::ExprPtr expr
Expand Down Expand Up @@ -2101,7 +2101,7 @@ namespace sdw
, public ImgMsLoadFuncT< FormatT, AccessT, DimT, ArrayedT >
, public ImgMsStoreFuncT< FormatT, AccessT, DimT, ArrayedT >
{
SDW_DeclValue( StorageImageFuncsT );
SDW_DeclValue( , StorageImageFuncsT );

StorageImageFuncsT( ShaderWriter & writer
, expr::ExprPtr expr
Expand Down Expand Up @@ -2135,7 +2135,7 @@ namespace sdw
, public ImgMsAtomicAddFuncT< FormatT, AccessT, DimT, ArrayedT >
, public ImgMsAtomicExchangeFuncT< FormatT, AccessT, DimT, ArrayedT >
{
SDW_DeclValue( StorageImageFuncsT );
SDW_DeclValue( , StorageImageFuncsT );

StorageImageFuncsT( ShaderWriter & writer
, expr::ExprPtr expr
Expand Down Expand Up @@ -2175,7 +2175,7 @@ namespace sdw
, public ImgMsAtomicExchangeFuncT< FormatT, AccessT, DimT, ArrayedT >
, public ImgMsAtomicCompSwapFuncT< FormatT, AccessT, DimT, ArrayedT >
{
SDW_DeclValue( StorageImageFuncsT );
SDW_DeclValue( , StorageImageFuncsT );

StorageImageFuncsT( ShaderWriter & writer
, expr::ExprPtr expr
Expand Down
6 changes: 3 additions & 3 deletions include/ShaderWriter/BaseTypes/Void.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,9 @@ namespace sdw
// Intently non explicit
SDW_API Void( ReturnWrapperT< Void > const & rhs );

~Void()override = default;
Void( Void && rhs ) = default;
Void( Void const & rhs ) = default;
SDW_INL_API ~Void()override = default;
SDW_INL_API Void( Void && rhs ) = default;
SDW_INL_API Void( Void const & rhs ) = default;

SDW_API static ast::type::TypePtr makeType( ast::type::TypesCache & cache );
};
Expand Down
Loading
Loading