X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fglsl%2Fcompiler.cpp;h=e0a676065953412db77519308f28db7becd88af2;hb=20a86c5905e1f7527d3c9edc3f56f6b7679c268a;hp=5ff003e71722e5da09d0cda8786bbca89f7726f8;hpb=1c2c36f1342df84ff195d8c58347c5e875590e0e;p=libs%2Fgl.git diff --git a/source/glsl/compiler.cpp b/source/glsl/compiler.cpp index 5ff003e7..e0a67606 100644 --- a/source/glsl/compiler.cpp +++ b/source/glsl/compiler.cpp @@ -82,9 +82,13 @@ void Compiler::compile(Mode mode) generate(*i); ConstantIdAssigner().apply(*module, features); + for(list::iterator i=module->stages.begin(); i!=module->stages.end(); ++i) + validate(*i); + GlobalInterfaceValidator().apply(*module); + bool valid = true; for(list::iterator i=module->stages.begin(); i!=module->stages.end(); ++i) - if(!validate(*i)) + if(!check_errors(*i)) valid = false; if(!valid) throw invalid_shader_source(get_diagnostics()); @@ -297,13 +301,17 @@ void Compiler::resolve(Stage &stage, unsigned flags) } } -bool Compiler::validate(Stage &stage) +void Compiler::validate(Stage &stage) { DeclarationValidator().apply(stage); IdentifierValidator().apply(stage); ReferenceValidator().apply(stage); ExpressionValidator().apply(stage); + StageInterfaceValidator().apply(stage); +} +bool Compiler::check_errors(Stage &stage) +{ stable_sort(stage.diagnostics, &diagnostic_line_order); for(vector::const_iterator i=stage.diagnostics.begin(); i!=stage.diagnostics.end(); ++i)