]> git.tdb.fi Git - libs/gl.git/blobdiff - source/glsl/compiler.cpp
Further refactor the resolving process in SL::Compiler
[libs/gl.git] / source / glsl / compiler.cpp
index 35977cb42be534077bca6c9f3427fbbcc158d443..7dbb501c777bd177b53e9ba37229913e5f07fd92 100644 (file)
@@ -1,14 +1,17 @@
 #include <msp/core/algorithm.h>
-#include <msp/gl/extensions/ext_gpu_shader4.h>
 #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 "generate.h"
+#include "glsl_error.h"
 #include "optimize.h"
 #include "output.h"
 #include "resources.h"
-#include "shader.h"
+#include "validate.h"
 
 #undef interface
 
@@ -19,7 +22,15 @@ namespace GL {
 namespace SL {
 
 Compiler::Compiler():
-       module(0)
+       features(Features::from_context()),
+       module(0),
+       specialized(false)
+{ }
+
+Compiler::Compiler(const Features &f):
+       features(f),
+       module(0),
+       specialized(false)
 { }
 
 Compiler::~Compiler()
@@ -56,55 +67,107 @@ void Compiler::load_source(IO::Base &io, const string &src_name)
        load_source(io, 0, src_name);
 }
 
-void Compiler::compile()
+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);
-       for(list<Stage>::iterator i=module->stages.begin(); i!=module->stages.end(); )
+               generate(*i, mode);
+
+       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)
        {
-               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)
-               finalize(*i);
+               finalize(*i, mode);
 }
 
-void Compiler::add_shaders(Program &program)
+string Compiler::get_combined_glsl() const
 {
-       if(!module)
-               throw invalid_operation("Compiler::add_shaders");
+       string glsl;
 
-       try
-       {
-               for(list<Stage>::iterator i=module->stages.begin(); i!=module->stages.end(); ++i)
-               {
-                       string stage_src = Formatter().apply(*i);
-
-                       if(i->type==Stage::VERTEX)
-                       {
-                               program.attach_shader_owned(new VertexShader(stage_src));
-                               for(map<string, unsigned>::iterator j=i->locations.begin(); j!=i->locations.end(); ++j)
-                                       program.bind_attribute(j->second, j->first);
-                       }
-                       else if(i->type==Stage::GEOMETRY)
-                               program.attach_shader_owned(new GeometryShader(stage_src));
-                       else if(i->type==Stage::FRAGMENT)
-                       {
-                               program.attach_shader_owned(new FragmentShader(stage_src));
-                               if(EXT_gpu_shader4)
-                               {
-                                       for(map<string, unsigned>::iterator j=i->locations.begin(); j!=i->locations.end(); ++j)
-                                               program.bind_fragment_data(j->second, j->first);
-                               }
-                       }
-               }
-       }
-       catch(const compile_error &e)
+       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)
        {
-               throw compile_error(module->source_map.translate_errors(e.what()));
+               glsl += format("#pragma MSP stage(%s)\n", Stage::get_stage_name(i->type));
+               glsl += Formatter().apply(*i, MODULE);
+               glsl += '\n';
        }
+
+       return glsl;
+}
+
+vector<Stage::Type> Compiler::get_stages() const
+{
+       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);
+       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);
+       throw key_error(Stage::get_stage_name(stage_type));
+}
+
+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;
+       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;
+       throw invalid_operation("Compiler::get_fragment_outputs");
+}
+
+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);
+       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)
+                       append(combined, "\n", format("%s:%d: %s", module->source_map.get_name(j->source), j->line, j->message));
+       return combined;
 }
 
 void Compiler::append_module(Module &mod, DataFile::Collection *res)
@@ -143,8 +206,8 @@ void Compiler::append_stage(Stage &stage)
                target = &*i;
        }
 
-       if(stage.required_version>target->required_version)
-               target->required_version = stage.required_version;
+       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);
@@ -164,39 +227,105 @@ 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)
+void Compiler::generate(Stage &stage, Mode mode)
 {
-       if(module->shared.required_version>stage.required_version)
-               stage.required_version = module->shared.required_version;
+       stage.required_features.gl_api = features.gl_api;
+       if(module->shared.required_features.glsl_version>stage.required_features.glsl_version)
+               stage.required_features.glsl_version = module->shared.required_features.glsl_version;
+
        inject_block(stage.content, module->shared.content);
+       if(const Stage *builtins = get_builtins(stage.type))
+               inject_block(stage.content, builtins->content);
+       if(const Stage *builtins = get_builtins(Stage::SHARED))
+               inject_block(stage.content, builtins->content);
+
+       // Initial resolving pass
+       resolve(stage);
 
-       DeclarationReorderer().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);
-       LegacyConverter().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>
+bool Compiler::resolve(Stage &stage, unsigned &flags, unsigned bit)
+{
+       if(!(flags&bit))
+               return false;
+
+       flags &= ~bit;
+       return T().apply(stage);
 }
 
-bool Compiler::optimize(Stage &stage)
+void Compiler::resolve(Stage &stage, unsigned flags)
+{
+       while(flags)
+       {
+               if(resolve<BlockHierarchyResolver>(stage, flags, RESOLVE_BLOCKS))
+                       ;
+               else if(resolve<TypeResolver>(stage, flags, RESOLVE_TYPES))
+                       flags |= 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;
+       }
+}
+
+bool Compiler::validate(Stage &stage)
+{
+       TypeValidator().apply(stage);
+       DeclarationValidator().apply(stage);
+       ReferenceValidator().apply(stage);
+       ExpressionValidator().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);
+       bool any_inlined = false;
+       if(FunctionInliner().apply(stage))
+       {
+               resolve(stage, RESOLVE_TYPES|RESOLVE_VARIABLES|RESOLVE_EXPRESSIONS);
+               any_inlined = true;
+       }
+       if(ExpressionInliner().apply(stage))
+       {
+               resolve(stage, RESOLVE_VARIABLES|RESOLVE_EXPRESSIONS);
+               any_inlined = true;
+       }
 
-       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);
+       any_removed |= UnusedTypeRemover().apply(stage);
 
-       return result;
+       return any_removed ? REDO_PREVIOUS : any_inlined ? REDO_STAGE : NEXT_STAGE;
 }
 
-void Compiler::finalize(Stage &stage)
+void Compiler::finalize(Stage &stage, Mode mode)
 {
-       if(get_gl_api()==OPENGL_ES2)
+       if(get_gl_api()==OPENGL_ES2 && mode==PROGRAM)
                DefaultPrecisionGenerator().apply(stage);
-       else
+       else if(mode==MODULE)
                PrecisionRemover().apply(stage);
 }