TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-01-19 20:24:49 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #1116 from Lopuska/patch-16

Browse source 
Intel OpenGL - fix a crash/shader compile error when you activate Vertex...
This commit is contained in:
Luis Anton Rebollo 2015-02-07 22:24:55 +01:00
parent 2d3f711443 9d84372dc8
commit 25a790103e
1 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1422,6 +1422,13 @@ void VertLitGLSL::processVert( Vector<ShaderComponent*> &componentList,
Var* outColor = dynamic_cast< Var* >( LangElement::find( "vertColor" ) );
if( !outColor )
{
// Grab the connector color
ShaderConnector *connectComp = dynamic_cast<ShaderConnector *>( componentList[C_CONNECTOR] );
Var *outColor = connectComp->getElement( RT_COLOR );
outColor->setName( "vertColor" );
outColor->setStructName( "OUT" );
outColor->setType( "vec4" );
// Search for vert color
Var *inColor = (Var*) LangElement::find( "diffuse" );
@ -1432,13 +1439,6 @@ void VertLitGLSL::processVert( Vector<ShaderComponent*> &componentList,
return;
}
// Grab the connector color
ShaderConnector *connectComp = dynamic_cast<ShaderConnector *>( componentList[C_CONNECTOR] );
Var *outColor = connectComp->getElement( RT_COLOR );
outColor->setName( "vertColor" );
outColor->setStructName( "OUT" );
outColor->setType( "vec4" );
output = new GenOp( " @ = @;\r\n", outColor, inColor );
}
else