TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-03-13 09:20:47 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

shader hooks and gen cleanups

Browse source
This commit is contained in:
Azaezel 2018-03-13 18:07:58 -05:00
parent 407e3d95b2
commit 02541ab1f9
3 changed files with 10 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

10
Engine/source/materials/shaderData.cpp
View file

@ -363,17 +363,17 @@ bool ShaderData::_checkDefinition(GFXShader *shader)
{
if( !shader->findShaderConstHandle( String::ToString("$rtParams%d", pos)) )
{
String error = String::ToString("ShaderData(%s) sampler[%d] used but rtParams%d not used in shader compilation. Possible error", shader->getPixelShaderFile().c_str(), pos, pos);
Con::errorf( error );
String errStr = String::ToString("ShaderData(%s) sampler[%d] used but rtParams%d not used in shader compilation. Possible error", shader->getPixelShaderFile().c_str(), pos, pos);
Con::errorf(errStr);
error = true;
}
}
if(!find)
{
String error = String::ToString("ShaderData(%s) sampler %s not defined", shader->getPixelShaderFile().c_str(), samplers[i].c_str());
Con::errorf(error );
GFXAssertFatal(0, error );
String errStr = String::ToString("ShaderData(%s) sampler %s not defined", shader->getPixelShaderFile().c_str(), samplers[i].c_str());
Con::errorf(errStr);
GFXAssertFatal(0, errStr);
error = true;
}
}

6
Engine/source/shaderGen/GLSL/shaderFeatureGLSL.cpp
View file

@ -1105,7 +1105,7 @@ void DiffuseFeatureGLSL::processPix( Vector<ShaderComponent*> &componentList,
targ = ShaderFeature::RenderTarget1;
col = (Var*)LangElement::find("col1");
MultiLine * meta = new MultiLine;
meta = new MultiLine;
if (!col)
{
// create color var
@ -1154,7 +1154,7 @@ void DiffuseVertColorFeatureGLSL::processVert( Vector< ShaderComponent* >& comp
ShaderConnector* connectComp = dynamic_cast< ShaderConnector* >( componentList[ C_CONNECTOR ] );
AssertFatal( connectComp, "DiffuseVertColorFeatureGLSL::processVert - C_CONNECTOR is not a ShaderConnector" );
Var* outColor = connectComp->getElement( RT_COLOR );
outColor = connectComp->getElement( RT_COLOR );
outColor->setName( "vertColor" );
outColor->setStructName( "OUT" );
outColor->setType( "vec4" );
@ -1455,7 +1455,7 @@ void VertLitGLSL::processVert( Vector<ShaderComponent*> &componentList,
{
// Grab the connector color
ShaderConnector *connectComp = dynamic_cast<ShaderConnector *>( componentList[C_CONNECTOR] );
Var *outColor = connectComp->getElement( RT_COLOR );
outColor = connectComp->getElement( RT_COLOR );
outColor->setName( "vertColor" );
outColor->setStructName( "OUT" );
outColor->setType( "vec4" );

5
Engine/source/shaderGen/HLSL/shaderFeatureHLSL.cpp
View file

@ -1109,7 +1109,6 @@ void DiffuseFeatureHLSL::processPix( Vector<ShaderComponent*> &componentList,
targ = ShaderFeature::RenderTarget1;
col = (Var*)LangElement::find("col1");
MultiLine * meta = new MultiLine;
if (!col)
{
// create color var
@ -1158,7 +1157,7 @@ void DiffuseVertColorFeatureHLSL::processVert( Vector< ShaderComponent* >& comp
ShaderConnector* connectComp = dynamic_cast< ShaderConnector* >( componentList[ C_CONNECTOR ] );
AssertFatal( connectComp, "DiffuseVertColorFeatureGLSL::processVert - C_CONNECTOR is not a ShaderConnector" );
Var* outColor = connectComp->getElement( RT_COLOR );
outColor = connectComp->getElement( RT_COLOR );
outColor->setName( "vertColor" );
outColor->setStructName( "OUT" );
outColor->setType( "float4" );
@ -1487,7 +1486,7 @@ void VertLitHLSL::processVert( Vector<ShaderComponent*> &componentList,
// Grab the connector color
ShaderConnector *connectComp = dynamic_cast<ShaderConnector *>( componentList[C_CONNECTOR] );
Var *outColor = connectComp->getElement( RT_COLOR );
outColor = connectComp->getElement( RT_COLOR );
outColor->setName( "vertColor" );
outColor->setStructName( "OUT" );
outColor->setType( "float4" );