#include "builtin.h"
#include "compiler.h"
#include "debug.h"
+#include "deviceinfo.h"
#include "error.h"
#include "finalize.h"
#include "generate.h"
namespace SL {
Compiler::Compiler():
- features(Features::from_context()),
- module(0),
- compiled(false),
- specialized(false)
+ features(DeviceInfo::get_global().glsl_features)
{ }
Compiler::Compiler(const Features &f):
- features(f),
- module(0),
- compiled(false),
- specialized(false)
+ features(f)
{ }
Compiler::~Compiler()
if(specialized && mode!=PROGRAM)
throw invalid_operation("Compiler::compile");
- for(list<Stage>::iterator i=module->stages.begin(); i!=module->stages.end(); ++i)
- generate(*i);
+ for(Stage &s: module->stages)
+ generate(s);
ConstantIdAssigner().apply(*module, features);
- for(list<Stage>::iterator i=module->stages.begin(); i!=module->stages.end(); ++i)
- validate(*i);
+ 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(!check_errors(*i))
+ for(Stage &s: module->stages)
+ if(!check_errors(s))
valid = false;
if(!valid)
throw invalid_shader_source(get_diagnostics());
if(specialized)
{
- for(list<Stage>::iterator i=module->stages.begin(); i!=module->stages.end(); ++i)
- ConstantSpecializer().apply(*i, spec_values);
+ for(Stage &s: module->stages)
+ ConstantSpecializer().apply(s, spec_values);
}
- for(list<Stage>::iterator i=module->stages.begin(); i!=module->stages.end(); )
+ for(auto i=module->stages.begin(); i!=module->stages.end(); )
{
OptimizeResult result = optimize(*i);
if(result==REDO_PREVIOUS)
}
LocationAllocator().apply(*module, features);
- for(list<Stage>::iterator i=module->stages.begin(); i!=module->stages.end(); ++i)
- finalize(*i, mode);
+ for(Stage &s: module->stages)
+ finalize(s, mode);
compiled = true;
}
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);
+ 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;
}
{
if(!compiled)
throw invalid_operation("Compiler::get_stage_glsl");
- for(list<Stage>::iterator i=module->stages.begin(); i!=module->stages.end(); ++i)
- if(i->type==stage_type)
- return Formatter().apply(*i);
+ 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> Compiler::get_combined_spirv() const
+vector<uint32_t> Compiler::get_combined_spirv() const
{
if(!compiled)
throw invalid_operation("Compiler::get_combined_spirv");
{
if(!compiled)
throw invalid_operation("Compiler::get_vertex_attributes");
- for(list<Stage>::const_iterator i=module->stages.begin(); i!=module->stages.end(); ++i)
- if(i->type==Stage::VERTEX)
- return i->locations;
+ 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");
}
{
if(!compiled)
throw invalid_operation("Compiler::get_fragment_outputs");
- for(list<Stage>::const_iterator i=module->stages.begin(); i!=module->stages.end(); ++i)
- if(i->type==Stage::FRAGMENT)
- return i->locations;
+ 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");
}
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;
}
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(mod_cache, (*i)->module);
+ for(Import *i: imports)
+ import(mod_cache, i->module);
append_stage(mod.shared);
- for(list<Stage>::const_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(const Stage &stage)
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>::const_iterator i=stage.content.body.begin(); i!=stage.content.body.end(); ++i)
- if(!dynamic_cast<Import *>(i->get()))
- target->content.body.push_back(*i);
+ for(const RefPtr<Statement> &s: stage.content.body)
+ if(!dynamic_cast<Import *>(s.get()))
+ target->content.body.push_back(s);
}
void Compiler::import(ModuleCache &mod_cache, const string &name)
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;
bool Compiler::check_errors(Stage &stage)
{
stable_sort(stage.diagnostics, &diagnostic_line_order);
-
- for(vector<Diagnostic>::const_iterator i=stage.diagnostics.begin(); i!=stage.diagnostics.end(); ++i)
- if(i->severity==Diagnostic::ERR)
- return false;
-
- return true;
+ return !any_of(stage.diagnostics.begin(), stage.diagnostics.end(),
+ [](const Diagnostic &d){ return d.severity==Diagnostic::ERR; });
}
bool Compiler::diagnostic_line_order(const Diagnostic &diag1, const Diagnostic &diag2)
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