TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-04-22 04:45:31 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Compilation fixes for C++20

Browse source
This commit is contained in:
Jeff Hutchinson 2022-11-27 23:08:07 -05:00
parent e16351605b
commit 1940becb2d
40 changed files with 220 additions and 211 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Engine/source/shaderGen/GLSL/shaderCompGLSL.cpp
View file

@ -140,7 +140,7 @@ void AppVertConnectorGLSL::sortVars()
// Not required in GLSL
}
void AppVertConnectorGLSL::setName( char *newName )
void AppVertConnectorGLSL::setName( const char *newName )
{
dStrcpy( (char*)mName, newName, 32 );
}
@ -285,7 +285,7 @@ void VertPixelConnectorGLSL::sortVars()
// Not needed in GLSL
}
void VertPixelConnectorGLSL::setName( char *newName )
void VertPixelConnectorGLSL::setName( const char *newName )
{
dStrcpy( (char*)mName, newName, 32 );
}

4
Engine/source/shaderGen/GLSL/shaderCompGLSL.h
View file

@ -36,7 +36,7 @@ public:
virtual Var* getElement( RegisterType type,
U32 numElements = 1,
U32 numRegisters = -1 );
virtual void setName( char *newName );
virtual void setName( const char *newName );
virtual void reset();
virtual void sortVars();
@ -52,7 +52,7 @@ public:
virtual Var* getElement( RegisterType type,
U32 numElements = 1,
U32 numRegisters = -1 );
virtual void setName( char *newName );
virtual void setName( const char *newName );
virtual void reset();
virtual void sortVars();

2
Engine/source/shaderGen/HLSL/shaderCompHLSL.cpp
View file

@ -230,7 +230,7 @@ void ShaderConnectorHLSL::sortVars()
return;
}
void ShaderConnectorHLSL::setName( char *newName )
void ShaderConnectorHLSL::setName( const char *newName )
{
dStrcpy( (char*)mName, newName, 32 );
}

4
Engine/source/shaderGen/HLSL/shaderCompHLSL.h
View file

@ -43,7 +43,7 @@ public:
U32 numElements = 1,
U32 numRegisters = -1 );
virtual void setName( char *newName );
virtual void setName( const char *newName );
virtual void reset();
virtual void sortVars();
@ -71,4 +71,4 @@ public:
virtual void print( Stream &stream, bool isVerterShader );
};
#endif // _SHADERCOMP_HLSL_H_
#endif // _SHADERCOMP_HLSL_H_

2
Engine/source/shaderGen/shaderComp.h
View file

@ -87,7 +87,7 @@ public:
U32 numElements = 1,
U32 numRegisters = -1 ) = 0;
virtual void setName( char *newName ) = 0;
virtual void setName( const char *newName ) = 0;
virtual void reset() = 0;
virtual void sortVars() = 0;