#include <msp/strings/format.h>
#include <msp/strings/utils.h>
#include "builtin.h"
-#include "compatibility.h"
#include "compiler.h"
#include "debug.h"
#include "error.h"
+#include "finalize.h"
#include "generate.h"
#include "glsl_error.h"
#include "optimize.h"
#include "output.h"
+#include "resolve.h"
#include "resources.h"
#include "validate.h"
Compiler::Compiler():
features(Features::from_context()),
module(0),
+ compiled(false),
specialized(false)
{ }
Compiler::Compiler(const Features &f):
features(f),
module(0),
+ compiled(false),
specialized(false)
{ }
void Compiler::compile(Mode mode)
{
+ if(specialized && mode!=PROGRAM)
+ throw invalid_operation("Compiler::compile");
+
+ for(list<Stage>::iterator i=module->stages.begin(); i!=module->stages.end(); ++i)
+ generate(*i);
+ ConstantIdAssigner().apply(*module, features);
+
for(list<Stage>::iterator i=module->stages.begin(); i!=module->stages.end(); ++i)
- generate(*i, mode);
+ validate(*i);
+ GlobalInterfaceValidator().apply(*module);
bool valid = true;
for(list<Stage>::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());
- unsigned n = 0;
- for(list<Stage>::iterator i=module->stages.begin(); i!=module->stages.end(); ++n)
+ if(specialized)
+ {
+ for(list<Stage>::iterator i=module->stages.begin(); i!=module->stages.end(); ++i)
+ ConstantSpecializer().apply(*i, spec_values);
+ }
+ for(list<Stage>::iterator i=module->stages.begin(); i!=module->stages.end(); )
{
OptimizeResult result = optimize(*i);
if(result==REDO_PREVIOUS)
else if(result!=REDO_STAGE)
++i;
}
+
+ LocationAllocator().apply(*module, features);
for(list<Stage>::iterator i=module->stages.begin(); i!=module->stages.end(); ++i)
finalize(*i, 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(list<Stage>::iterator i=module->stages.begin(); i!=module->stages.end(); ++i)
{
glsl += format("#pragma MSP stage(%s)\n", Stage::get_stage_name(i->type));
- glsl += Formatter().apply(*i, MODULE);
+ glsl += Formatter().apply(*i);
glsl += '\n';
}
string Compiler::get_stage_glsl(Stage::Type stage_type) const
{
+ 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, PROGRAM);
+ return Formatter().apply(*i);
throw key_error(Stage::get_stage_name(stage_type));
}
const map<string, unsigned> &Compiler::get_vertex_attributes() const
{
+ 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;
const map<string, unsigned> &Compiler::get_fragment_outputs() const
{
+ 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;
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 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)
- append(combined, "\n", format("%s:%d: %s", module->source_map.get_name(j->source), j->line, j->message));
+ if(j->source!=INTERNAL_SOURCE)
+ append(combined, "\n", format("%s:%d: %s", module->source_map.get_name(j->source), j->line, j->message));
return combined;
}
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);
}
void Compiler::import(DataFile::Collection *resources, const string &name)
append_module(import_parser.parse(*io, fn, module->source_map.get_count()), resources);
}
-void Compiler::generate(Stage &stage, Mode mode)
+void Compiler::generate(Stage &stage)
{
stage.required_features.gl_api = features.gl_api;
if(module->shared.required_features.glsl_version>stage.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>
if(resolve<BlockHierarchyResolver>(stage, flags, RESOLVE_BLOCKS))
;
else if(resolve<TypeResolver>(stage, flags, RESOLVE_TYPES))
- flags |= RESOLVE_VARIABLES|RESOLVE_EXPRESSIONS;
+ flags |= RESOLVE_BLOCKS|RESOLVE_VARIABLES|RESOLVE_EXPRESSIONS;
else if(resolve<VariableResolver>(stage, flags, RESOLVE_VARIABLES))
flags |= RESOLVE_EXPRESSIONS;
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);
+}
+
+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 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))
{
- resolve(stage, RESOLVE_VARIABLES|RESOLVE_EXPRESSIONS);
+ resolve(stage, RESOLVE_VARIABLES|RESOLVE_FUNCTIONS|RESOLVE_EXPRESSIONS);
any_inlined = true;
}
/* 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);
+ }
+
+ // 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)
projects / libs / gl.git / blobdiff