TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-07-13 15:44:36 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

truncation warning cleanups dx side (was also causing cornercase crashes gl side)

Browse source
This commit is contained in:
Azaezel 2016-02-26 00:21:01 -06:00
parent 8c5810adad
commit 496b6a3ea8
2 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -365,7 +365,7 @@ Var* ShaderFeatureGLSL::getOutTexCoord( const char *name,
// Statement allows for casting of different types which // Statement allows for casting of different types which
// eliminates vector truncation problems. // eliminates vector truncation problems.
String statement = String::ToString( " @ = %s(tMul(@, @));\r\n", type ); String statement = String::ToString( " @ = %s(tMul(@, @).xy);\r\n", type );
meta->addStatement( new GenOp( statement , texCoord, texMat, inTex ) ); meta->addStatement( new GenOp( statement , texCoord, texMat, inTex ) );
} }
else else
@ -813,7 +813,7 @@ Var* ShaderFeatureGLSL::addOutDetailTexCoord( Vector<ShaderComponent*> &compon
texMat->constSortPos = cspPass; texMat->constSortPos = cspPass;
} }
meta->addStatement( new GenOp( " @ = tMul(@, @) * @;\r\n", outTex, texMat, inTex, detScale ) ); meta->addStatement( new GenOp( " @ = tMul(@, @).xy * @;\r\n", outTex, texMat, inTex, detScale ) );
} }
else else
{ {

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

@ -365,7 +365,7 @@ Var* ShaderFeatureHLSL::getOutTexCoord( const char *name,
// Statement allows for casting of different types which // Statement allows for casting of different types which
// eliminates vector truncation problems. // eliminates vector truncation problems.
String statement = String::ToString( " @ = (%s)mul(@, @);\r\n", type ); String statement = String::ToString( " @ = (%s)mul(@, @).xy;\r\n", type );
meta->addStatement( new GenOp( statement, texCoord, texMat, inTex ) ); meta->addStatement( new GenOp( statement, texCoord, texMat, inTex ) );
} }
else else
@ -811,7 +811,7 @@ Var* ShaderFeatureHLSL::addOutDetailTexCoord( Vector<ShaderComponent*> &compon
texMat->constSortPos = cspPass; texMat->constSortPos = cspPass;
} }
meta->addStatement( new GenOp( " @ = mul(@, @) * @;\r\n", outTex, texMat, inTex, detScale ) ); meta->addStatement( new GenOp( " @ = mul(@, @).xy * @;\r\n", outTex, texMat, inTex, detScale ) );
} }
else else
{ {