tseeker-pub/demotool
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Shaders - add input loader errors for main file

Browse source
This commit is contained in:
Emmanuel BENOîT 2017-10-08 09:45:47 +02:00
parent 88f1ecfb5d
commit d53269e09e
1 changed files with 17 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
shaders.cc
View file

@ -157,6 +157,7 @@ void T_InputReader_::handleDirective(
void T_InputReader_::error(
__rd__ std::string const& err )
{
printf( "input error (%d - %s)\n" , line , err.c_str( ) );
input.errors.push_back( T_ShaderInputError{
line , err } );
}
@ -323,6 +324,10 @@ struct T_CodeBuilder_
void include( __rd__ std::string const& name ,
__rd__ const uint32_t lines );
void next( );
void addInputLoaderErrors(
__rd__ T_ShaderInput const* input ,
__rd__ std::string const& name );
};
/*----------------------------------------------------------------------------*/
@ -341,6 +346,7 @@ bool T_CodeBuilder_::buildCode( )
} else {
code.type = E_ShaderType( int( main->type ) - 2 );
}
addInputLoaderErrors( main , name );
cname = name;
current = main;
@ -409,10 +415,7 @@ void T_CodeBuilder_::include(
// Add input loader errors
if ( libraries.find( nname ) == libraries.end( ) ) {
for ( auto const& errs : isi->errors ) {
code.errors.push_back( T_ShaderError{
nname , errs.line , errs.error } );
}
addInputLoaderErrors( isi , nname );
}
libraries.insert( nname );
@ -437,6 +440,16 @@ void T_CodeBuilder_::next( )
}
}
void T_CodeBuilder_::addInputLoaderErrors(
__rd__ T_ShaderInput const* input ,
__rd__ std::string const& name )
{
for ( auto const& errs : input->errors ) {
code.errors.push_back( T_ShaderError{
name , errs.line , errs.error } );
}
}
} // namespace