#include <msp/strings/format.h>
#include <msp/strings/utils.h>
#include "builtin.h"
-#include "compatibility.h"
#include "compiler.h"
#include "debug.h"
+#include "deviceinfo.h"
#include "error.h"
+#include "finalize.h"
#include "generate.h"
#include "glsl_error.h"
+#include "modulecache.h"
#include "optimize.h"
#include "output.h"
-#include "resources.h"
+#include "resolve.h"
+#include "spirv.h"
#include "validate.h"
#undef interface
namespace SL {
Compiler::Compiler():
- features(Features::from_context()),
- module(0),
- specialized(false)
+ features(DeviceInfo::get_global().glsl_features)
{ }
Compiler::Compiler(const Features &f):
- features(f),
- module(0),
- specialized(false)
+ features(f)
{ }
Compiler::~Compiler()
void Compiler::set_source(const string &source, const string &src_name)
{
clear();
- Parser parser;
imported_names.push_back(src_name);
- append_module(parser.parse(source, src_name, 1), 0);
+ ModuleCache mod_cache(0);
+ append_module(mod_cache.add_module(source, src_name), mod_cache);
}
void Compiler::load_source(IO::Base &io, DataFile::Collection *res, const string &src_name)
{
clear();
- Parser parser;
imported_names.push_back(src_name);
- append_module(parser.parse(io, src_name, 1), res);
+ ModuleCache mod_cache(res);
+ append_module(mod_cache.add_module(io, src_name), mod_cache);
}
void Compiler::load_source(IO::Base &io, const string &src_name)
void Compiler::compile(Mode mode)
{
- for(list<Stage>::iterator i=module->stages.begin(); i!=module->stages.end(); ++i)
- generate(*i, mode);
+ if(specialized && mode!=PROGRAM)
+ throw invalid_operation("Compiler::compile");
+
+ for(Stage &s: module->stages)
+ generate(s);
+ ConstantIdAssigner().apply(*module, features);
+
+ for(Stage &s: module->stages)
+ validate(s);
+ GlobalInterfaceValidator().apply(*module);
bool valid = true;
- for(list<Stage>::iterator i=module->stages.begin(); i!=module->stages.end(); ++i)
- if(!validate(*i))
+ for(Stage &s: module->stages)
+ if(!check_errors(s))
valid = false;
if(!valid)
throw invalid_shader_source(get_diagnostics());
- unsigned n = 0;
- for(list<Stage>::iterator i=module->stages.begin(); i!=module->stages.end(); ++n)
+ if(specialized)
+ {
+ for(Stage &s: module->stages)
+ ConstantSpecializer().apply(s, spec_values);
+ }
+ for(auto i=module->stages.begin(); i!=module->stages.end(); )
{
OptimizeResult result = optimize(*i);
if(result==REDO_PREVIOUS)
else if(result!=REDO_STAGE)
++i;
}
- for(list<Stage>::iterator i=module->stages.begin(); i!=module->stages.end(); ++i)
- finalize(*i, mode);
+
+ LocationAllocator().apply(*module, features);
+ for(Stage &s: module->stages)
+ finalize(s, mode);
+
+ compiled = true;
}
string Compiler::get_combined_glsl() const
{
+ if(!compiled)
+ throw invalid_operation("Compiler::get_combined_glsl");
+
string glsl;
unsigned source_count = module->source_map.get_count();
for(unsigned i=1; i<source_count; ++i)
glsl += format("#pragma MSP source(%d, \"%s\")\n", i, module->source_map.get_name(i));
- for(list<Stage>::iterator i=module->stages.begin(); i!=module->stages.end(); ++i)
+ for(Stage &s: module->stages)
{
- glsl += format("#pragma MSP stage(%s)\n", Stage::get_stage_name(i->type));
- glsl += Formatter().apply(*i, MODULE);
+ glsl += format("#pragma MSP stage(%s)\n", Stage::get_stage_name(s.type));
+ glsl += Formatter().apply(s);
glsl += '\n';
}
{
vector<Stage::Type> stage_types;
stage_types.reserve(module->stages.size());
- for(list<Stage>::const_iterator i=module->stages.begin(); i!=module->stages.end(); ++i)
- stage_types.push_back(i->type);
+ for(const Stage &s: module->stages)
+ stage_types.push_back(s.type);
return stage_types;
}
string Compiler::get_stage_glsl(Stage::Type stage_type) const
{
- for(list<Stage>::iterator i=module->stages.begin(); i!=module->stages.end(); ++i)
- if(i->type==stage_type)
- return Formatter().apply(*i, PROGRAM);
+ if(!compiled)
+ throw invalid_operation("Compiler::get_stage_glsl");
+ auto i = find_member(module->stages, stage_type, &Stage::type);
+ if(i!=module->stages.end())
+ return Formatter().apply(*i);
throw key_error(Stage::get_stage_name(stage_type));
}
+vector<uint32_t> Compiler::get_combined_spirv() const
+{
+ if(!compiled)
+ throw invalid_operation("Compiler::get_combined_spirv");
+ SpirVGenerator gen;
+ gen.apply(*module);
+ return gen.get_code();
+}
+
const map<string, unsigned> &Compiler::get_vertex_attributes() const
{
- for(list<Stage>::const_iterator i=module->stages.begin(); i!=module->stages.end(); ++i)
- if(i->type==Stage::VERTEX)
- return i->locations;
+ if(!compiled)
+ throw invalid_operation("Compiler::get_vertex_attributes");
+ auto i = find_member(module->stages, Stage::VERTEX, &Stage::type);
+ if(i!=module->stages.end())
+ return i->locations;
throw invalid_operation("Compiler::get_vertex_attributes");
}
const map<string, unsigned> &Compiler::get_fragment_outputs() const
{
- for(list<Stage>::const_iterator i=module->stages.begin(); i!=module->stages.end(); ++i)
- if(i->type==Stage::FRAGMENT)
- return i->locations;
+ if(!compiled)
+ throw invalid_operation("Compiler::get_fragment_outputs");
+ auto i = find_member(module->stages, Stage::FRAGMENT, &Stage::type);
+ if(i!=module->stages.end())
+ return i->locations;
throw invalid_operation("Compiler::get_fragment_outputs");
}
+const map<string, unsigned> &Compiler::get_texture_bindings() const
+{
+ if(!compiled)
+ throw invalid_operation("Compiler::get_texture_bindings");
+ return module->shared.texture_bindings;
+}
+
+const map<string, unsigned> &Compiler::get_uniform_block_bindings() const
+{
+ if(!compiled)
+ throw invalid_operation("Compiler::get_uniform_block_bindings");
+ return module->shared.uniform_block_bindings;
+}
+
const SourceMap &Compiler::get_source_map() const
{
return module->source_map;
string Compiler::get_stage_debug(Stage::Type stage_type) const
{
- for(list<Stage>::iterator i=module->stages.begin(); i!=module->stages.end(); ++i)
- if(i->type==stage_type)
- return DumpTree().apply(*i);
+ auto i = find_member(module->stages, stage_type, &Stage::type);
+ if(i!=module->stages.end())
+ return DumpTree().apply(*i);
throw key_error(Stage::get_stage_name(stage_type));
}
string Compiler::get_diagnostics() const
{
string combined;
- for(list<Stage>::const_iterator i=module->stages.begin(); i!=module->stages.end(); ++i)
- for(vector<Diagnostic>::const_iterator j=i->diagnostics.begin(); j!=i->diagnostics.end(); ++j)
- if(j->source!=INTERNAL_SOURCE)
- append(combined, "\n", format("%s:%d: %s", module->source_map.get_name(j->source), j->line, j->message));
+ for(const Stage &s: module->stages)
+ for(const Diagnostic &d: s.diagnostics)
+ if(d.source!=INTERNAL_SOURCE)
+ append(combined, "\n", format("%s:%d: %s", module->source_map.get_name(d.source), d.line, d.message));
return combined;
}
-void Compiler::append_module(Module &mod, DataFile::Collection *res)
+void Compiler::append_module(const Module &mod, ModuleCache &mod_cache)
{
module->source_map.merge_from(mod.source_map);
vector<Import *> imports;
- for(NodeList<Statement>::const_iterator i=mod.shared.content.body.begin(); i!=mod.shared.content.body.end(); ++i)
- if(Import *imp = dynamic_cast<Import *>(i->get()))
+ for(const RefPtr<Statement> &s: mod.shared.content.body)
+ if(Import *imp = dynamic_cast<Import *>(s.get()))
imports.push_back(imp);
- for(vector<Import *>::iterator i=imports.begin(); i!=imports.end(); ++i)
- import(res, (*i)->module);
- NodeRemover().apply(mod.shared, set<Node *>(imports.begin(), imports.end()));
+ for(Import *i: imports)
+ import(mod_cache, i->module);
append_stage(mod.shared);
- for(list<Stage>::iterator i=mod.stages.begin(); i!=mod.stages.end(); ++i)
- append_stage(*i);
+ for(const Stage &s: mod.stages)
+ append_stage(s);
}
-void Compiler::append_stage(Stage &stage)
+void Compiler::append_stage(const Stage &stage)
{
Stage *target = 0;
if(stage.type==Stage::SHARED)
target = &module->shared;
else
{
- list<Stage>::iterator i;
- for(i=module->stages.begin(); (i!=module->stages.end() && i->type<stage.type); ++i) ;
+ auto i = find_if(module->stages, [&stage](const Stage &s){ return s.type>=stage.type; });
if(i==module->stages.end() || i->type>stage.type)
{
- list<Stage>::iterator j = module->stages.insert(i, stage.type);
+ auto j = module->stages.insert(i, stage.type);
if(i!=module->stages.end())
i->previous = &*j;
i = j;
if(stage.required_features.glsl_version>target->required_features.glsl_version)
target->required_features.glsl_version = stage.required_features.glsl_version;
- for(NodeList<Statement>::iterator i=stage.content.body.begin(); i!=stage.content.body.end(); ++i)
- target->content.body.push_back(*i);
- DeclarationCombiner().apply(*target);
+ for(const RefPtr<Statement> &s: stage.content.body)
+ if(!dynamic_cast<Import *>(s.get()))
+ target->content.body.push_back(s);
}
-void Compiler::import(DataFile::Collection *resources, const string &name)
+void Compiler::import(ModuleCache &mod_cache, const string &name)
{
- string fn = name+".glsl";
- if(find(imported_names, fn)!=imported_names.end())
+ if(find(imported_names, name)!=imported_names.end())
return;
- imported_names.push_back(fn);
+ imported_names.push_back(name);
- RefPtr<IO::Seekable> io = (resources ? resources->open_raw(fn) : Resources::get_builtins().open(fn));
- if(!io)
- throw runtime_error(format("module %s not found", name));
- Parser import_parser;
- append_module(import_parser.parse(*io, fn, module->source_map.get_count()), resources);
+ append_module(mod_cache.get_module(name), mod_cache);
}
-void Compiler::generate(Stage &stage, Mode mode)
+void Compiler::generate(Stage &stage)
{
- stage.required_features.gl_api = features.gl_api;
+ stage.required_features.target_api = features.target_api;
if(module->shared.required_features.glsl_version>stage.required_features.glsl_version)
stage.required_features.glsl_version = module->shared.required_features.glsl_version;
variables through interfaces. */
InterfaceGenerator().apply(stage);
resolve(stage, RESOLVE_BLOCKS|RESOLVE_TYPES|RESOLVE_VARIABLES);
-
- ConstantSpecializer().apply(stage, (mode==PROGRAM && specialized ? &spec_values : 0));
- if(mode==PROGRAM)
- {
- LegacyConverter().apply(stage, features);
- resolve(stage, RESOLVE_VARIABLES|RESOLVE_FUNCTIONS);
- }
}
template<typename T>
else if(resolve<FunctionResolver>(stage, flags, RESOLVE_FUNCTIONS))
flags |= RESOLVE_EXPRESSIONS;
else if(resolve<ExpressionResolver>(stage, flags, RESOLVE_EXPRESSIONS))
- flags |= RESOLVE_VARIABLES;
+ flags |= RESOLVE_VARIABLES|RESOLVE_FUNCTIONS;
}
}
-bool Compiler::validate(Stage &stage)
+void Compiler::validate(Stage &stage)
{
- TypeValidator().apply(stage);
DeclarationValidator().apply(stage);
+ IdentifierValidator().apply(stage);
ReferenceValidator().apply(stage);
ExpressionValidator().apply(stage);
+ FlowControlValidator().apply(stage);
+ StageInterfaceValidator().apply(stage);
+}
- for(vector<Diagnostic>::const_iterator i=stage.diagnostics.begin(); i!=stage.diagnostics.end(); ++i)
- if(i->severity==Diagnostic::ERR)
- return false;
+bool Compiler::check_errors(Stage &stage)
+{
+ stable_sort(stage.diagnostics, &diagnostic_line_order);
+ return !any_of(stage.diagnostics.begin(), stage.diagnostics.end(),
+ [](const Diagnostic &d){ return d.severity==Diagnostic::ERR; });
+}
- return true;
+bool Compiler::diagnostic_line_order(const Diagnostic &diag1, const Diagnostic &diag2)
+{
+ if(diag1.provoking_source!=diag2.provoking_source)
+ {
+ // Sort builtins first and imported modules according to import order.
+ if(diag1.provoking_source<=BUILTIN_SOURCE)
+ return diag1.provoking_source<diag2.provoking_source;
+ else if(diag2.provoking_source<=BUILTIN_SOURCE)
+ return false;
+ else
+ return diag1.provoking_source>diag2.provoking_source;
+ }
+ return diag1.provoking_line<diag2.provoking_line;
}
Compiler::OptimizeResult Compiler::optimize(Stage &stage)
{
+ if(ConstantFolder().apply(stage))
+ resolve(stage, RESOLVE_EXPRESSIONS);
ConstantConditionEliminator().apply(stage);
bool any_inlined = false;
if(FunctionInliner().apply(stage))
{
- resolve(stage, RESOLVE_TYPES|RESOLVE_VARIABLES|RESOLVE_EXPRESSIONS);
+ resolve(stage, RESOLVE_TYPES|RESOLVE_VARIABLES|RESOLVE_FUNCTIONS|RESOLVE_EXPRESSIONS);
any_inlined = true;
}
if(ExpressionInliner().apply(stage))
/* Removing variables or functions may cause things from the previous stage
to become unused. */
- bool any_removed = UnusedVariableRemover().apply(stage);
+ bool any_removed = UnreachableCodeRemover().apply(stage);
+ any_removed |= UnusedVariableRemover().apply(stage);
any_removed |= UnusedFunctionRemover().apply(stage);
any_removed |= UnusedTypeRemover().apply(stage);
void Compiler::finalize(Stage &stage, Mode mode)
{
- if(get_gl_api()==OPENGL_ES2 && mode==PROGRAM)
- DefaultPrecisionGenerator().apply(stage);
- else if(mode==MODULE)
- PrecisionRemover().apply(stage);
+ if(mode==PROGRAM)
+ {
+ LegacyConverter().apply(stage, features);
+ resolve(stage, RESOLVE_VARIABLES|RESOLVE_FUNCTIONS);
+ PrecisionConverter().apply(stage);
+ }
+ else if(mode==SPIRV)
+ StructOrganizer().apply(stage);
+
+ // Collect bindings from all stages into the shared stage's maps
+ module->shared.texture_bindings.insert(stage.texture_bindings.begin(), stage.texture_bindings.end());
+ module->shared.uniform_block_bindings.insert(stage.uniform_block_bindings.begin(), stage.uniform_block_bindings.end());
}
void Compiler::inject_block(Block &target, const Block &source)
{
- NodeList<Statement>::iterator insert_point = target.body.begin();
- for(NodeList<Statement>::const_iterator i=source.body.begin(); i!=source.body.end(); ++i)
- target.body.insert(insert_point, (*i)->clone());
+ auto insert_point = target.body.begin();
+ for(const RefPtr<Statement> &s: source.body)
+ target.body.insert(insert_point, s->clone());
}
} // namespace SL
projects / libs / gl.git / blobdiff