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 #1718 from Azaezel/reportAug

Browse source 
file name reporting for 'sampler not defined' and rtParams error reports.
This commit is contained in:
Areloch 2016-08-01 22:45:43 -05:00 committed by GitHub
parent 09c8ad99aa aae017fcc3
commit fcefb863a5
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -365,7 +365,7 @@ 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", getName(), pos, 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 );
error = true;
}
@ -373,7 +373,7 @@ bool ShaderData::_checkDefinition(GFXShader *shader)
if(!find)
{
String error = String::ToString("ShaderData(%s) sampler %s not defined", getName(), samplers[i].c_str());
String error = String::ToString("ShaderData(%s) sampler %s not defined", shader->getPixelShaderFile().c_str(), samplers[i].c_str());
Con::errorf(error );
GFXAssertFatal(0, error );
error = true;