#include <msp/core/algorithm.h>
-#include <msp/gl/extensions/ext_gpu_shader4.h>
#include <msp/strings/format.h>
+#include "builtin.h"
#include "compatibility.h"
#include "compiler.h"
+#include "debug.h"
#include "error.h"
#include "generate.h"
+#include "glsl_error.h"
#include "optimize.h"
#include "output.h"
#include "resources.h"
-#include "shader.h"
+#include "validate.h"
#undef interface
Compiler::Compiler():
features(Features::from_context()),
- module(0)
+ module(0),
+ specialized(false)
{ }
Compiler::Compiler(const Features &f):
features(f),
- module(0)
+ module(0),
+ specialized(false)
{ }
Compiler::~Compiler()
load_source(io, 0, src_name);
}
+void Compiler::specialize(const map<string, int> &sv)
+{
+ specialized = true;
+ spec_values = sv;
+}
+
void Compiler::compile(Mode mode)
{
for(list<Stage>::iterator i=module->stages.begin(); i!=module->stages.end(); ++i)
generate(*i, mode);
- for(list<Stage>::iterator i=module->stages.begin(); i!=module->stages.end(); )
+
+ bool valid = true;
+ for(list<Stage>::iterator i=module->stages.begin(); i!=module->stages.end(); ++i)
+ if(!validate(*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<10000); ++n)
{
- if(optimize(*i))
+ OptimizeResult result = optimize(*i);
+ if(result==REDO_PREVIOUS)
i = module->stages.begin();
- else
+ else if(result!=REDO_STAGE)
++i;
}
for(list<Stage>::iterator i=module->stages.begin(); i!=module->stages.end(); ++i)
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);
+ 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)
+ combined += format("%s:%d: %s\n", module->source_map.get_name(j->source), j->line, j->message);
+ return combined;
+}
+
void Compiler::append_module(Module &mod, DataFile::Collection *res)
{
module->source_map.merge_from(mod.source_map);
target = &*i;
}
+ if(target->content.body.empty())
+ {
+ Stage *builtins = get_builtins(stage.type);
+ if(builtins && builtins!=&stage)
+ append_stage(*builtins);
+ }
+
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)
stage.required_features.glsl_version = module->shared.required_features.glsl_version;
inject_block(stage.content, module->shared.content);
- DeclarationReorderer().apply(stage);
- BlockResolver().apply(stage);
+ // Initial resolving pass
+ BlockHierarchyResolver().apply(stage);
FunctionResolver().apply(stage);
VariableResolver().apply(stage);
+
+ /* All variables local to a stage have been resolved. Resolve non-local
+ variables through interfaces. */
InterfaceGenerator().apply(stage);
VariableResolver().apply(stage);
- DeclarationReorderer().apply(stage);
+
FunctionResolver().apply(stage);
+ ConstantSpecializer().apply(stage, (mode==PROGRAM && specialized ? &spec_values : 0));
if(mode==PROGRAM)
LegacyConverter().apply(stage, features);
}
-bool Compiler::optimize(Stage &stage)
+bool Compiler::validate(Stage &stage)
+{
+ DeclarationValidator().apply(stage);
+
+ for(vector<Diagnostic>::const_iterator i=stage.diagnostics.begin(); i!=stage.diagnostics.end(); ++i)
+ if(i->severity==Diagnostic::ERR)
+ return false;
+
+ return true;
+}
+
+Compiler::OptimizeResult Compiler::optimize(Stage &stage)
{
ConstantConditionEliminator().apply(stage);
- FunctionInliner().apply(stage);
- BlockResolver().apply(stage);
- VariableResolver().apply(stage);
+ bool any_inlined = FunctionInliner().apply(stage);
+ any_inlined |= ExpressionInliner().apply(stage);
+ if(any_inlined)
+ {
+ VariableResolver().apply(stage);
+ FunctionResolver().apply(stage);
+ }
- bool result = UnusedVariableRemover().apply(stage);
- result |= UnusedFunctionRemover().apply(stage);
+ /* Removing variables or functions may cause things from the previous stage
+ to become unused. */
+ bool any_removed = UnusedVariableRemover().apply(stage);
+ any_removed |= UnusedFunctionRemover().apply(stage);
- return result;
+ return any_removed ? REDO_PREVIOUS : any_inlined ? REDO_STAGE : NEXT_STAGE;
}
void Compiler::finalize(Stage &stage, Mode mode)