Compilation: Fixed some warnings from GCC and Clang.

DragonJoker · Nov 20, 2024 · 7722fdd · 7722fdd
1 parent f3d8529
commit 7722fdd
Show file tree

Hide file tree

Showing 14 changed files with 35 additions and 29 deletions.
diff --git a/include/Core/Castor3D/Shader/LightingModelFactory.hpp b/include/Core/Castor3D/Shader/LightingModelFactory.hpp
@@ -22,7 +22,7 @@ namespace castor3d
 		using ObjPtr = PtrType;
 		struct LightingModel
 		{
-			LightingModel( castor::String name = {}
+			explicit LightingModel( castor::String name = {}
 				, Creator create = {}
 				, shader::LightingModelDesc defaultDesc = {} )
 				: name{ std::move( name ) }
@@ -302,7 +302,6 @@ namespace castor3d
 			, shader::LightingModelNames const & descNames );
 
 	private:
-		LightingModelID m_currentId{};
 		ObjCont m_registered;
 		LightingModelCont m_models;
 		shader::DiffuseBrdfArray m_diffuseBrdfs;

diff --git a/include/Core/Castor3D/Shader/Shaders/GlslLighting.hpp b/include/Core/Castor3D/Shader/Shaders/GlslLighting.hpp
@@ -21,7 +21,7 @@ namespace castor3d::shader
 	class ScatteringModel
 	{
 	public:
-		C3D_API ScatteringModel( sdw::ShaderWriter & writer );
+		C3D_API explicit ScatteringModel( sdw::ShaderWriter & writer );
 		C3D_API virtual ~ScatteringModel() = default;
 
 		C3D_API virtual void initialiseBackground( BackgroundModel & background

diff --git a/source/Core/Castor3D/Material/Pass/Component/Map/DiffuseTransmissionColourMapComponent.cpp b/source/Core/Castor3D/Material/Pass/Component/Map/DiffuseTransmissionColourMapComponent.cpp
@@ -50,7 +50,7 @@ namespace castor3d
 {
 	//*********************************************************************************************
 
-	namespace trscmp
+	namespace dftrclmk
 	{
 		static CU_ImplementAttributeParserBlock( parserUnitTransmissionMask, TextureContext )
 		{
@@ -133,25 +133,25 @@ namespace castor3d
 		castor::addParserT( parsers
 			, CSCNSection::eTexture
 			, cuT( "diffuse_transmission_colour_mask" )
-			, trscmp::parserUnitTransmissionMask
+			, dftrclmk::parserUnitTransmissionMask
 			, { castor::makeParameter< castor::ParameterType::eUInt32 >() } );
 
 		castor::addParserT( parsers
 			, CSCNSection::eTextureUnit
 			, cuT( "diffuse_transmission_colour_mask" )
-			, trscmp::parserUnitTransmissionMask
+			, dftrclmk::parserUnitTransmissionMask
 			, { castor::makeParameter< castor::ParameterType::eUInt32 >() } );
 
 		castor::addParserT( parsers
 			, CSCNSection::eTextureRemap
 			, CSCNSection::eTextureRemapChannel
 			, cuT( "diffuse_transmission_colour" )
-			, trscmp::parserTexRemapTransmission );
+			, dftrclmk::parserTexRemapTransmission );
 
 		castor::addParserT( parsers
 			, CSCNSection::eTextureRemapChannel
 			, cuT( "diffuse_transmission_colour_mask" )
-			, trscmp::parserTexRemapTransmissionMask
+			, dftrclmk::parserTexRemapTransmissionMask
 			, { castor::makeParameter< castor::ParameterType::eUInt32 >() } );
 	}
 

diff --git a/source/Core/Castor3D/Material/Pass/Component/Map/DiffuseTransmissionFactorMapComponent.cpp b/source/Core/Castor3D/Material/Pass/Component/Map/DiffuseTransmissionFactorMapComponent.cpp
@@ -50,7 +50,7 @@ namespace castor3d
 {
 	//*********************************************************************************************
 
-	namespace trscmp
+	namespace dftrftmk
 	{
 		static CU_ImplementAttributeParserBlock( parserUnitTransmissionMask, TextureContext )
 		{
@@ -133,25 +133,25 @@ namespace castor3d
 		castor::addParserT( parsers
 			, CSCNSection::eTexture
 			, cuT( "diffuse_transmission_factor_mask" )
-			, trscmp::parserUnitTransmissionMask
+			, dftrftmk::parserUnitTransmissionMask
 			, { castor::makeParameter< castor::ParameterType::eUInt32 >() } );
 
 		castor::addParserT( parsers
 			, CSCNSection::eTextureUnit
 			, cuT( "diffuse_transmission_factor_mask" )
-			, trscmp::parserUnitTransmissionMask
+			, dftrftmk::parserUnitTransmissionMask
 			, { castor::makeParameter< castor::ParameterType::eUInt32 >() } );
 
 		castor::addParserT( parsers
 			, CSCNSection::eTextureRemap
 			, CSCNSection::eTextureRemapChannel
 			, cuT( "diffuse_transmission_factor" )
-			, trscmp::parserTexRemapTransmission );
+			, dftrftmk::parserTexRemapTransmission );
 
 		castor::addParserT( parsers
 			, CSCNSection::eTextureRemapChannel
 			, cuT( "diffuse_transmission_factor_mask" )
-			, trscmp::parserTexRemapTransmissionMask
+			, dftrftmk::parserTexRemapTransmissionMask
 			, { castor::makeParameter< castor::ParameterType::eUInt32 >() } );
 	}
 

diff --git a/source/Core/Castor3D/Render/Node/QueueRenderNodes.cpp b/source/Core/Castor3D/Render/Node/QueueRenderNodes.cpp
@@ -37,6 +37,8 @@
 #include <RenderGraph/RecordContext.hpp>
 #include <RenderGraph/RunnablePass.hpp>
 
+#include <ashespp/Command/CommandBuffer.hpp>
+
 CU_ImplementSmartPtr( castor3d, QueueRenderNodes )
 
 using ashes::operator==;

diff --git a/source/Core/Castor3D/Render/PipelineFlags.cpp b/source/Core/Castor3D/Render/PipelineFlags.cpp
@@ -536,9 +536,9 @@ namespace castor3d
 		uint32_t offset{};
 		result |= uint32_t( pass.getComponentCombineID() & pipflags::hi::maxPassMask ) << offset;
 		offset += pipflags::hi::maxPassSize;
-		result |= ( uint32_t( pass.getTextureCombineID() ) & pipflags::hi::maxSubmeshMask ) << offset;
+		result |= uint32_t( pass.getTextureCombineID() & pipflags::hi::maxSubmeshMask ) << offset;
 		offset += pipflags::hi::maxTexturesSize;
-		result |= ( uint32_t( pass.getLightingModelId() - 1u ) & pipflags::hi::maxLightingModelIDMask ) << offset;
+		result |= uint32_t( ( pass.getLightingModelId() - 1u ) & pipflags::hi::maxLightingModelIDMask ) << offset;
 		return result;
 	}
 

diff --git a/source/Core/Castor3D/Scene/Background/Shaders/GlslNoIblBackground.cpp b/source/Core/Castor3D/Scene/Background/Shaders/GlslNoIblBackground.cpp
@@ -114,7 +114,7 @@ namespace castor3d::shader
 			, components.perceptualRoughness );
 	}
 
-	sdw::RetVec3 NoIblBackgroundModel::computeDiffuse( sdw::Vec3 const & wsDirection
+	sdw::RetVec3 NoIblBackgroundModel::computeDiffuse( sdw::Vec3 const & pwsDirection
 		, BlendComponents & components
 		, DebugOutputCategory const & debugOutput )
 	{
@@ -133,7 +133,7 @@ namespace castor3d::shader
 		}
 
 		auto backgroundMap = m_writer.getVariable< sdw::CombinedImageCubeRgba32 >( "c3d_mapBackground" );
-		return m_computeDiffuse( wsDirection
+		return m_computeDiffuse( pwsDirection
 			, backgroundMap
 			, components.perceptualRoughness );
 	}

diff --git a/source/Core/Castor3D/Shader/Shaders/GlslBlendComponents.cpp b/source/Core/Castor3D/Shader/Shaders/GlslBlendComponents.cpp
@@ -16,7 +16,7 @@ namespace castor3d::shader
 
 	namespace blendcomp
 	{
-		void fillType( ast::type::BaseStruct & type )
+		static void fillType( ast::type::BaseStruct & type )
 		{
 			type.declMember( "dielectricF0", sdw::type::Kind::eVec3F );
 			type.declMember( "alphaRoughness", sdw::type::Kind::eFloat );
@@ -25,7 +25,7 @@ namespace castor3d::shader
 			type.declMember( "specularWeight", sdw::type::Kind::eFloat );
 		}
 
-		void fillInit( sdw::expr::ExprList & inits )
+		static void fillInit( sdw::expr::ExprList & inits )
 		{
 			inits.emplace_back( sdw::makeExpr( vec3( 0.04_f ) ) );
 			inits.emplace_back( sdw::makeExpr( 1.0_f ) );

diff --git a/source/Core/Castor3D/Shader/Shaders/GlslDebugOutput.cpp b/source/Core/Castor3D/Shader/Shaders/GlslDebugOutput.cpp
@@ -26,11 +26,11 @@ namespace castor3d::shader
 		}
 		ROF
 		m_registerOutput = writer.implementFunction< sdw::Void >( "c3d_registerOutput"
-			, [this]( sdw::UInt const & index
-				, sdw::Vec3 const & value )
+			, [this]( sdw::UInt const & idx
+				, sdw::Vec3 const & val )
 			{
-				m_indices[index] = 1_u;
-				m_values[index] = value;
+				m_indices[idx] = 1_u;
+				m_values[idx] = val;
 			}
 			, sdw::InUInt{ writer, "index" }
 			, sdw::InVec3{ writer, "value" } );

diff --git a/source/Core/Castor3D/Shader/Shaders/GlslOrenNayarBRDF.cpp b/source/Core/Castor3D/Shader/Shaders/GlslOrenNayarBRDF.cpp
@@ -3,6 +3,8 @@
 #include "Castor3D/Shader/Shaders/GlslBlendComponents.hpp"
 #include "Castor3D/Shader/Shaders/GlslLightSurface.hpp"
 
+#include <ShaderWriter/Writer.hpp>
+
 namespace castor3d::shader
 {
 	//*********************************************************************************************

diff --git a/source/Core/Castor3D/Shader/Shaders/GlslReflection.cpp b/source/Core/Castor3D/Shader/Shaders/GlslReflection.cpp
@@ -1219,10 +1219,10 @@ namespace castor3d::shader
 		, sdw::Vec3 & result
 		, DebugOutputCategory const & debugOutput )
 	{
-		auto & writer = *envMap.getWriter();
-
 		if ( m_hasEnvMap )
 		{
+			auto & writer = *envMap.getWriter();
+
 			IF( writer, hasEnvMap )
 			{
 				result = computeDiffuseEnvMaps( wsDirection

diff --git a/source/Core/Castor3D/Shader/Shaders/GlslSpecularBRDF.cpp b/source/Core/Castor3D/Shader/Shaders/GlslSpecularBRDF.cpp
@@ -7,6 +7,8 @@
 #include "Castor3D/Shader/Shaders/GlslOutputComponents.hpp"
 #include "Castor3D/Shader/Shaders/GlslUtils.hpp"
 
+#include <ShaderWriter/Writer.hpp>
+
 CU_ImplementDeleter( castor3d::shader, SpecularBRDF )
 
 namespace castor3d::shader

diff --git a/source/Core/Castor3D/Shader/Shaders/GlslUtils.cpp b/source/Core/Castor3D/Shader/Shaders/GlslUtils.cpp
@@ -1165,8 +1165,8 @@ namespace castor3d::shader
 			, pshift );
 	}
 
-	sdw::RetFloat Utils::directionalAlbedoSheen( sdw::Float const & cosTheta
-		, sdw::Float const & roughness )
+	sdw::RetFloat Utils::directionalAlbedoSheen( sdw::Float const & pcosTheta
+		, sdw::Float const & proughness )
 	{
 		if ( !m_directionalAlbedoSheen )
 		{
@@ -1184,7 +1184,7 @@ namespace castor3d::shader
 				, sdw::InFloat{ m_writer, "roughness" } );
 		}
 
-		return m_directionalAlbedoSheen( cosTheta, roughness );
+		return m_directionalAlbedoSheen( pcosTheta, proughness );
 	}
 
 	sdw::Vec3 Utils::reconstructNormal( sdw::Vec2 const & normal )

diff --git a/source/Core/SceneExporter/Text/TextRenderTarget.cpp b/source/Core/SceneExporter/Text/TextRenderTarget.cpp
@@ -3,6 +3,7 @@
 #include "TextClustersConfig.hpp"
 #include "TextSsaoConfig.hpp"
 
+#include <Castor3D/Material/MaterialModule.hpp>
 #include <Castor3D/Miscellaneous/Logger.hpp>
 #include <Castor3D/Render/Clustered/FrustumClusters.hpp>
 #include <Castor3D/Render/PostEffect/PostEffect.hpp>
@@ -33,7 +34,7 @@ namespace castor
 		if ( auto block{ beginBlock( file, cuT( "render_target" ) ) } )
 		{
 			result = writeNamedSub( file, cuT( "size" ), target.getSize() )
-				&& write( file, cuT( "format" ), getFormatName( convert( target.getPixelFormat() ) ) )
+				&& write( file, cuT( "format" ), getFormatName( castor3d::convert( target.getPixelFormat() ) ) )
 				&& writeName( file, cuT( "tone_mapping" ), target.getToneMapping()->getName() );
 
 			if ( result && target.getScene() )