Fixed remaining warnings.

DragonJoker · Sep 29, 2023 · ba421a9 · ba421a9
1 parent 9a15195
commit ba421a9
Show file tree

Hide file tree

Showing 38 changed files with 246 additions and 268 deletions.
diff --git a/.github/workflows/cmake.yml b/.github/workflows/cmake.yml
@@ -52,7 +52,7 @@ jobs:
       shell: bash
       working-directory: ${{runner.workspace}}/build-${{ matrix.buildType }}
       run: |
-        cmake $GITHUB_WORKSPACE -DCMAKE_BUILD_TYPE=${{ matrix.buildType }} -DCMAKE_TOOLCHAIN_FILE=$GITHUB_WORKSPACE/external/vcpkg/scripts/buildsystems/vcpkg.cmake -DSDW_UNITY_BUILD=ON -DCMAKE_INSTALL_PREFIX=$GITHUB_WORKSPACE/package/shaderwriter -DPROJECTS_WARNINGS_AS_ERRORS=$PROJ_WAE -DSDW_GENERATE_SOURCE=OFF -DSDW_BUILD_TESTS=ON -DSDW_TESTS_ENABLE_VALIDATION=OFF -DSDW_ALL_TESTS=OFF
+        cmake $GITHUB_WORKSPACE -DCMAKE_BUILD_TYPE=${{ matrix.buildType }} --preset ci -DPROJECTS_WARNINGS_AS_ERRORS=$PROJ_WAE
     - name: Build
       if: (steps.configure.conclusion == 'success')
       id: build
@@ -72,7 +72,7 @@ jobs:
       shell: bash
       run: |
         cmake --install . --config ${{ matrix.buildType }}
-        7z a $GITHUB_WORKSPACE/ShaderWriter-${{ matrix.os[1] }}.zip $GITHUB_WORKSPACE/package/shaderwriter/
+        7z a $GITHUB_WORKSPACE/ShaderWriter-${{ matrix.os[1] }}.zip $GITHUB_WORKSPACE/package/ShaderWriter/
     - name: Clean build folder
       if: (steps.build.conclusion == 'success')
       working-directory: ${{runner.workspace}}/build-${{ matrix.buildType }}
@@ -125,7 +125,7 @@ jobs:
       shell: bash
       working-directory: ${{runner.workspace}}/build-${{ matrix.buildType }}
       run: |
-        cmake $GITHUB_WORKSPACE -DCMAKE_BUILD_TYPE=${{ matrix.buildType }} -DCMAKE_TOOLCHAIN_FILE=$GITHUB_WORKSPACE/external/vcpkg/scripts/buildsystems/vcpkg.cmake -DSDW_UNITY_BUILD=ON -DCMAKE_INSTALL_PREFIX=$GITHUB_WORKSPACE/package/shaderwriter -DPROJECTS_WARNINGS_AS_ERRORS=$PROJ_WAE -DSDW_GENERATE_SOURCE=OFF -DSDW_BUILD_TESTS=ON -DSDW_TESTS_ENABLE_VALIDATION=OFF -DSDW_ALL_TESTS=OFF
+        cmake $GITHUB_WORKSPACE -DCMAKE_BUILD_TYPE=${{ matrix.buildType }} --preset ci -DPROJECTS_WARNINGS_AS_ERRORS=$PROJ_WAE
     - name: Build
       if: (steps.configure.conclusion == 'success')
       id: build
@@ -139,7 +139,7 @@ jobs:
       shell: bash
       run: |
         cmake --install . --config ${{ matrix.buildType }}
-        7z a $GITHUB_WORKSPACE/ShaderWriter-${{ matrix.os[1] }}.zip $GITHUB_WORKSPACE/package/shaderwriter/
+        7z a $GITHUB_WORKSPACE/ShaderWriter-${{ matrix.os[1] }}.zip $GITHUB_WORKSPACE/package/ShaderWriter/
     - name: Clean build folder
       if: (steps.build.conclusion == 'success')
       working-directory: ${{runner.workspace}}/build-${{ matrix.buildType }}
@@ -199,7 +199,7 @@ jobs:
       shell: bash
       working-directory: ${{runner.workspace}}/build-${{ matrix.buildType }}
       run: |
-        cmake $GITHUB_WORKSPACE -DCMAKE_BUILD_TYPE=${{ matrix.buildType }} -DCMAKE_TOOLCHAIN_FILE=$GITHUB_WORKSPACE/external/vcpkg/scripts/buildsystems/vcpkg.cmake -DSDW_UNITY_BUILD=ON -DCMAKE_INSTALL_PREFIX=$GITHUB_WORKSPACE/package/shaderwriter -DPROJECTS_WARNINGS_AS_ERRORS=$PROJ_WAE -DSDW_GENERATE_SOURCE=OFF -DSDW_BUILD_TESTS=ON -DSDW_TESTS_ENABLE_VALIDATION=OFF -DSDW_ALL_TESTS=OFF
+        cmake $GITHUB_WORKSPACE -DCMAKE_BUILD_TYPE=${{ matrix.buildType }} --preset ci -DPROJECTS_WARNINGS_AS_ERRORS=$PROJ_WAE
     - name: Build
       if: (steps.configure.conclusion == 'success')
       id: build
@@ -219,7 +219,7 @@ jobs:
       shell: bash
       run: |
         cmake --install . --config ${{ matrix.buildType }}
-        7z a $GITHUB_WORKSPACE/ShaderWriter-${{ matrix.os[1] }}.zip $GITHUB_WORKSPACE/package/shaderwriter/
+        7z a $GITHUB_WORKSPACE/ShaderWriter-${{ matrix.os[1] }}.zip $GITHUB_WORKSPACE/package/ShaderWriter/
     - name: Clean build folder
       if: (steps.build.conclusion == 'success')
       working-directory: ${{runner.workspace}}/build-${{ matrix.buildType }}

diff --git a/CMakePresets.json b/CMakePresets.json
@@ -74,6 +74,31 @@
 			"description": "Build configuration using Ninja, for ShaderWriter developers",
 			"inherits": "dev-base",
 			"generator": "Ninja"
+		},
+		{
+			"name": "ci",
+			"installDir": "${sourceDir}/package/ShaderWriter",
+			"displayName": "ShaderWriter CI Config",
+			"description": "Build configuration using Ninja, for ShaderWriter CI",
+			"cacheVariables": {
+				"CMAKE_TOOLCHAIN_FILE": "${sourceDir}/external/vcpkg/scripts/buildsystems/vcpkg.cmake",
+				"SDW_ALL_TESTS": false,
+				"SDW_BUILD_EXPORTERS": true,
+				"SDW_BUILD_EXPORTER_GLSL": true,
+				"SDW_BUILD_EXPORTER_HLSL": true,
+				"SDW_BUILD_EXPORTER_SPIRV": true,
+				"SDW_BUILD_TESTS": true,
+				"SDW_BUILD_VULKAN_LAYER": true,
+				"SDW_BUILD_STATIC_EXPORTERS": false,
+				"SDW_BUILD_STATIC_SDAST": false,
+				"SDW_BUILD_STATIC_SDW": false,
+				"SDW_BUILD_STATIC": false,
+				"SDW_GENERATE_SOURCE": false,
+				"SDW_TESTS_ENABLE_VALIDATION": false,
+				"SDW_UNITY_BUILD": true,
+				"PROJECTS_WARNINGS_AS_ERRORS": true,
+				"PROJECTS_OUTPUT_DIR": "${sourceDir}"
+			}
 		}
 	]
 }
diff --git a/include/ShaderAST/Expr/ExprCache.hpp b/include/ShaderAST/Expr/ExprCache.hpp
@@ -22,7 +22,7 @@ namespace ast::expr
 	class ExprCache
 	{
 	public:
-		SDAST_API ExprCache( ShaderAllocatorBlock & allocator );
+		SDAST_API explicit ExprCache( ShaderAllocatorBlock & allocator );
 		SDAST_API ~ExprCache() = default;
 
 		SDAST_API AddPtr makeAdd( type::TypePtr type, ExprPtr lhs, ExprPtr rhs );

diff --git a/include/ShaderAST/ShaderAllocator.hpp b/include/ShaderAST/ShaderAllocator.hpp
@@ -7,7 +7,9 @@ See LICENSE file in root folder
 
 #include "ShaderASTPrerequisites.hpp"
 
+#include <list>
 #include <memory>
+#include <unordered_map>
 #include <vector>
 
 namespace ast
@@ -122,7 +124,7 @@ namespace ast
 		friend class ShaderAllocatorBlock;
 
 	public:
-		SDAST_API ShaderAllocator( AllocationMode allocationMode = AllocationMode::eFragmented );
+		SDAST_API explicit ShaderAllocator( AllocationMode allocationMode = AllocationMode::eFragmented );
 		SDAST_API ~ShaderAllocator() = default;
 
 		SDAST_API void * allocate( size_t size );

diff --git a/include/ShaderAST/Stmt/PreprocEndif.hpp b/include/ShaderAST/Stmt/PreprocEndif.hpp
@@ -13,7 +13,7 @@ namespace ast::stmt
 		: public Stmt
 	{
 	public:
-		SDAST_API PreprocEndif( StmtCache & stmtCache );
+		SDAST_API explicit PreprocEndif( StmtCache & stmtCache );
 
 		SDAST_API void accept( VisitorPtr vis )override;
 	};

diff --git a/include/ShaderAST/Stmt/StmtCache.hpp b/include/ShaderAST/Stmt/StmtCache.hpp
@@ -19,7 +19,7 @@ namespace ast::stmt
 	class StmtCache
 	{
 	public:
-		SDAST_API StmtCache( ShaderAllocatorBlock & allocator );
+		SDAST_API explicit StmtCache( ShaderAllocatorBlock & allocator );
 		SDAST_API ~StmtCache() = default;
 
 		SDAST_API PreprocDefinePtr makePreprocDefine( EntityName nameId, std::string name, expr::ExprPtr expr );

diff --git a/include/ShaderAST/Stmt/StmtCompound.hpp b/include/ShaderAST/Stmt/StmtCompound.hpp
@@ -13,12 +13,12 @@ namespace ast::stmt
 		: public Container
 	{
 	protected:
-		SDAST_API explicit Compound( StmtCache & stmtCache
+		SDAST_API Compound( StmtCache & stmtCache
 			, size_t size
 			, Kind kind );
 
 	public:
-		SDAST_API Compound( StmtCache & stmtCache );
+		SDAST_API explicit Compound( StmtCache & stmtCache );
 
 		SDAST_API void accept( VisitorPtr vis )override;
 	};

diff --git a/include/ShaderAST/Stmt/StmtContainer.hpp b/include/ShaderAST/Stmt/StmtContainer.hpp
@@ -13,7 +13,7 @@ namespace ast::stmt
 		: public Stmt
 	{
 	protected:
-		SDAST_API explicit Container( StmtCache & stmtCache
+		SDAST_API Container( StmtCache & stmtCache
 			, size_t size
 			, Kind kind );
 

diff --git a/include/ShaderAST/Stmt/StmtContinue.hpp b/include/ShaderAST/Stmt/StmtContinue.hpp
@@ -13,7 +13,7 @@ namespace ast::stmt
 		: public Stmt
 	{
 	public:
-		SDAST_API Continue( StmtCache & stmtCache );
+		SDAST_API explicit Continue( StmtCache & stmtCache );
 
 		SDAST_API void accept( VisitorPtr vis )override;
 	};

diff --git a/include/ShaderAST/Stmt/StmtDemote.hpp b/include/ShaderAST/Stmt/StmtDemote.hpp
@@ -13,7 +13,7 @@ namespace ast::stmt
 		: public Stmt
 	{
 	public:
-		SDAST_API Demote( StmtCache & stmtCache );
+		SDAST_API explicit Demote( StmtCache & stmtCache );
 
 		SDAST_API void accept( VisitorPtr vis )override;
 	};

diff --git a/include/ShaderAST/Stmt/StmtIgnoreIntersection.hpp b/include/ShaderAST/Stmt/StmtIgnoreIntersection.hpp
@@ -15,7 +15,7 @@ namespace ast::stmt
 		: public Stmt
 	{
 	public:
-		SDAST_API IgnoreIntersection( StmtCache & stmtCache );
+		SDAST_API explicit IgnoreIntersection( StmtCache & stmtCache );
 
 		SDAST_API void accept( VisitorPtr vis )override;
 	};

diff --git a/include/ShaderAST/Stmt/StmtTerminateInvocation.hpp b/include/ShaderAST/Stmt/StmtTerminateInvocation.hpp
@@ -13,7 +13,7 @@ namespace ast::stmt
 		: public Stmt
 	{
 	public:
-		SDAST_API TerminateInvocation( StmtCache & stmtCache );
+		SDAST_API explicit TerminateInvocation( StmtCache & stmtCache );
 
 		SDAST_API void accept( VisitorPtr vis )override;
 	};

diff --git a/include/ShaderAST/Stmt/StmtTerminateRay.hpp b/include/ShaderAST/Stmt/StmtTerminateRay.hpp
@@ -15,7 +15,7 @@ namespace ast::stmt
 		: public Stmt
 	{
 	public:
-		SDAST_API TerminateRay( StmtCache & stmtCache );
+		SDAST_API explicit TerminateRay( StmtCache & stmtCache );
 
 		SDAST_API void accept( VisitorPtr vis )override;
 	};

diff --git a/include/ShaderAST/Visitors/CloneExpr.hpp b/include/ShaderAST/Visitors/CloneExpr.hpp
@@ -22,11 +22,10 @@ namespace ast
 		SDAST_API explicit ExprCloner( expr::ExprCache & exprCache
 			, expr::ExprPtr & result );
 
-	private:
+	protected:
 		SDAST_API virtual expr::ExprPtr doSubmit( expr::Expr * expr );
-		SDAST_API virtual expr::ExprPtr doSubmit( expr::ExprPtr const & expr );
+		SDAST_API expr::ExprPtr doSubmit( expr::ExprPtr const & expr );
 
-	protected:
 		SDAST_API void visitAddExpr( expr::Add * expr )override;
 		SDAST_API void visitAddAssignExpr( expr::AddAssign * expr )override;
 		SDAST_API void visitAggrInitExpr( expr::AggrInit * expr )override;

diff --git a/include/ShaderAST/Visitors/CloneStmt.hpp b/include/ShaderAST/Visitors/CloneStmt.hpp
@@ -24,7 +24,7 @@ namespace ast
 
 	protected:
 		SDAST_API virtual expr::ExprPtr doSubmit( expr::Expr * expr );
-		SDAST_API virtual expr::ExprPtr doSubmit( expr::ExprPtr const & expr );
+		SDAST_API expr::ExprPtr doSubmit( expr::ExprPtr const & expr );
 
 		SDAST_API void visitContainerStmt( stmt::Container * cont )override;
 		SDAST_API void visitAccelerationStructureDeclStmt( stmt::AccelerationStructureDecl * stmt )override;

diff --git a/include/ShaderWriter/RayIntersectionWriter.hpp b/include/ShaderWriter/RayIntersectionWriter.hpp
@@ -77,7 +77,7 @@ namespace sdw
 		: public ShaderWriter
 	{
 	public:
-		SDW_API RayIntersectionWriter( ShaderAllocator * allocator = nullptr );
+		SDW_API explicit RayIntersectionWriter( ShaderAllocator * allocator = nullptr );
 
 		SDW_API void implementMain( RayIntersectionMainFunc const & function );
 	};

diff --git a/source/CompilerGlsl/GlslExprAdapter.cpp b/source/CompilerGlsl/GlslExprAdapter.cpp
@@ -196,11 +196,6 @@ namespace glsl
 		return result;
 	}
 
-	ast::expr::ExprPtr ExprAdapter::doSubmit( ast::expr::ExprPtr const & expr )
-	{
-		return doSubmit( expr.get() );
-	}
-
 	void ExprAdapter::visitAssignExpr( ast::expr::Assign * expr )
 	{
 		auto lhs = expr->getLHS();

diff --git a/source/CompilerGlsl/GlslExprAdapter.hpp b/source/CompilerGlsl/GlslExprAdapter.hpp
@@ -36,8 +36,8 @@ namespace glsl
 			, ast::stmt::Container * container
 			, ast::expr::ExprPtr & result );
 
+		using ast::ExprCloner::doSubmit;
 		ast::expr::ExprPtr doSubmit( ast::expr::Expr * expr )override;
-		ast::expr::ExprPtr doSubmit( ast::expr::ExprPtr const & expr )override;
 		void visitAssignExpr( ast::expr::Assign * expr )override;
 		void visitArrayAccessExpr( ast::expr::ArrayAccess * expr )override;
 		void visitIdentifierExpr( ast::expr::Identifier * expr )override;

diff --git a/source/CompilerGlsl/GlslStmtAdapter.cpp b/source/CompilerGlsl/GlslStmtAdapter.cpp
@@ -432,11 +432,6 @@ namespace glsl
 			, m_adaptationData
 			, m_current );
 	}
-
-	ast::expr::ExprPtr StmtAdapter::doSubmit( ast::expr::ExprPtr const & expr )
-	{
-		return doSubmit( expr.get() );
-	}
 
 	void StmtAdapter::visitConstantBufferDeclStmt( ast::stmt::ConstantBufferDecl * stmt )
 	{

diff --git a/source/CompilerGlsl/GlslStmtAdapter.hpp b/source/CompilerGlsl/GlslStmtAdapter.hpp
@@ -78,8 +78,8 @@ namespace glsl
 			, ast::stmt::Container * globalsCont
 			, ast::stmt::ContainerPtr & result );
 
+		using ast::StmtCloner::doSubmit;
 		ast::expr::ExprPtr doSubmit( ast::expr::Expr * expr )override;
-		ast::expr::ExprPtr doSubmit( ast::expr::ExprPtr const & expr )override;
 
 		void visitConstantBufferDeclStmt( ast::stmt::ConstantBufferDecl * stmt )override;
 		void visitFunctionDeclStmt( ast::stmt::FunctionDecl * stmt )override;

diff --git a/source/CompilerHlsl/HlslExprAdapter.cpp b/source/CompilerHlsl/HlslExprAdapter.cpp
@@ -503,11 +503,6 @@ namespace hlsl
 		return result;
 	}
 
-	ast::expr::ExprPtr ExprAdapter::doSubmit( ast::expr::ExprPtr const & expr )
-	{
-		return doSubmit( expr.get() );
-	}
-
 	void ExprAdapter::visitArrayAccessExpr( ast::expr::ArrayAccess * expr )
 	{
 		auto arrayIndex = doSubmit( expr->getRHS() );

diff --git a/source/CompilerHlsl/HlslExprAdapter.hpp b/source/CompilerHlsl/HlslExprAdapter.hpp
@@ -52,8 +52,8 @@ namespace hlsl
 			, ast::stmt::Container * intrinsics
 			, bool preventVarTypeReplacement );
 
+		using ast::ExprCloner::doSubmit;
 		ast::expr::ExprPtr doSubmit( ast::expr::Expr * expr )override;
-		ast::expr::ExprPtr doSubmit( ast::expr::ExprPtr const & expr )override;
 		void visitArrayAccessExpr( ast::expr::ArrayAccess * expr )override;
 		void visitCompositeConstructExpr( ast::expr::CompositeConstruct * expr )override;
 		void visitIdentifierExpr( ast::expr::Identifier * expr )override;

diff --git a/source/CompilerHlsl/HlslStmtAdapter.cpp b/source/CompilerHlsl/HlslStmtAdapter.cpp
@@ -71,11 +71,6 @@ namespace hlsl
 			, false );
 	}
 
-	ast::expr::ExprPtr StmtAdapter::doSubmit( ast::expr::ExprPtr const & expr )
-	{
-		return doSubmit( expr.get() );
-	}
-
 	void StmtAdapter::linkVars( ast::var::VariablePtr textureSampler
 		, ast::var::VariablePtr texture
 		, ast::var::VariablePtr sampler )

diff --git a/source/CompilerHlsl/HlslStmtAdapter.hpp b/source/CompilerHlsl/HlslStmtAdapter.hpp
@@ -34,8 +34,8 @@ namespace hlsl
 			, AdaptationData & adaptationData
 			, ast::stmt::ContainerPtr & result );
 
+		using ast::StmtCloner::doSubmit;
 		ast::expr::ExprPtr doSubmit( ast::expr::Expr * expr )override;
-		ast::expr::ExprPtr doSubmit( ast::expr::ExprPtr const & expr )override;
 
 		void linkVars( ast::var::VariablePtr textureSampler
 			, ast::var::VariablePtr texture

diff --git a/source/CompilerHlsl/HlslVariableReplacer.hpp b/source/CompilerHlsl/HlslVariableReplacer.hpp
@@ -24,6 +24,7 @@ namespace hlsl
 			, ast::var::VariablePtr origin
 			, ast::var::VariablePtr replacement );
 
+		using ast::ExprCloner::doSubmit;
 		ast::expr::ExprPtr doSubmit( ast::expr::Expr * expr )override;
 		void visitIdentifierExpr( ast::expr::Identifier * expr )override;
 

diff --git a/source/CompilerSpirV/SpirvExprAdapter.cpp b/source/CompilerSpirV/SpirvExprAdapter.cpp
@@ -80,11 +80,6 @@ namespace spirv
 		return result;
 	}
 
-	ast::expr::ExprPtr ExprAdapter::doSubmit( ast::expr::ExprPtr const & expr )
-	{
-		return doSubmit( expr.get() );
-	}
-
 	void ExprAdapter::visitAssignExpr( ast::expr::Assign * expr )
 	{
 		TraceFunc;

diff --git a/source/CompilerSpirV/SpirvExprAdapter.hpp b/source/CompilerSpirV/SpirvExprAdapter.hpp
@@ -32,8 +32,8 @@ namespace spirv
 			, AdaptationData & adaptationData
 			, ast::expr::ExprPtr & result );
 
+		using ast::ExprCloner::doSubmit;
 		ast::expr::ExprPtr doSubmit( ast::expr::Expr * expr )override;
-		ast::expr::ExprPtr doSubmit( ast::expr::ExprPtr const & expr )override;
 		void visitAssignExpr( ast::expr::Assign * expr )override;
 		void visitIdentifierExpr( ast::expr::Identifier * expr )override;
 		void visitIntrinsicCallExpr( ast::expr::IntrinsicCall * expr )override;

diff --git a/source/CompilerSpirV/SpirvStmtAdapter.cpp b/source/CompilerSpirV/SpirvStmtAdapter.cpp
@@ -43,11 +43,6 @@ namespace spirv
 		return ExprAdapter::submit( m_exprCache, m_typesCache, expr, m_current, m_ioDeclarations, m_adaptationData );
 	}
 
-	ast::expr::ExprPtr StmtAdapter::doSubmit( ast::expr::ExprPtr const & expr )
-	{
-		return doSubmit( expr.get() );
-	}
-
 	void StmtAdapter::visitElseIfStmt( ast::stmt::ElseIf * stmt )
 	{
 		AST_Failure( "Unexpected ElseIf statement." );

diff --git a/source/CompilerSpirV/SpirvStmtAdapter.hpp b/source/CompilerSpirV/SpirvStmtAdapter.hpp
@@ -42,9 +42,9 @@ namespace spirv
 			, ast::type::TypesCache & typesCache
 			, ast::stmt::ContainerPtr & result
 			, AdaptationData & adaptationData );
-
+
+		using ast::StmtCloner::doSubmit;
 		ast::expr::ExprPtr doSubmit( ast::expr::Expr * expr )override;
-		ast::expr::ExprPtr doSubmit( ast::expr::ExprPtr const & expr )override;
 
 		void visitElseIfStmt( ast::stmt::ElseIf * stmt )override;
 		void visitElseStmt( ast::stmt::Else * stmt )override;

diff --git a/source/CompilerSpirV/compileSpirV.cpp b/source/CompilerSpirV/compileSpirV.cpp
@@ -164,7 +164,6 @@ namespace spirv
 		private:
 			ast::type::TypePtr type;
 			ast::var::VariablePtr var;
-			ast::expr::Expr * expr{};
 		};
 
 		auto module = spirv::Module::deserialize( spirv );