Check the flat qualifier from the correct member

[libs/gl.git] / tools / glslcompiler.cpp

diff --git a/tools/glslcompiler.cpp b/tools/glslcompiler.cpp
index 4fe6bc8bd636d75e00cb3f76bd1ee0d6a9fc277e..f7bb2de9af1b8b090341d34383e0cde66cb7a204 100644 (file)
--- a/tools/glslcompiler.cpp
+++ b/tools/glslcompiler.cpp
@@ -1,5 +1,9 @@
 #include <msp/core/application.h>
 #include <msp/core/getopt.h>
+#include <msp/datafile/collection.h>
+#include <msp/datafile/directorysource.h>
+#include <msp/fs/dir.h>
+#include <msp/fs/stat.h>
 #include <msp/gl/glsl/compiler.h>
 #include <msp/gl/glsl/glsl_error.h>
 #include <msp/io/print.h>
@@ -8,7 +12,19 @@
 class GlslCompiler: public Msp::RegisteredApplication<GlslCompiler>
 {
 private:
+       class Resources: public Msp::DataFile::Collection
+       {
+       private:
+               Msp::DataFile::DirectorySource source;
+
+       public:
+               Resources();
+
+               void add_include_path(const Msp::FS::Path &);
+       };
+
        std::string source_fn;
+       std::vector<std::string> include_paths;
        Msp::GL::SL::Features features;
        Msp::GL::SL::Compiler::Mode compile_mode;
        std::map<std::string, int> spec_values;
@@ -28,7 +44,7 @@ using namespace std;
 using namespace Msp;
 
 GlslCompiler::GlslCompiler(int argc, char **argv):
-       features(GL::SL::Features::latest()),
+       features(GL::SL::Features::latest(GL::OPENGL)),
        compile_mode(GL::SL::Compiler::PROGRAM),
        parse_only(false),
        combined(false),
@@ -39,6 +55,7 @@ GlslCompiler::GlslCompiler(int argc, char **argv):
        vector<string> spec_values_in;
        unsigned as_module = 0;
        string module_type = "glsl";
+       bool vulkan = false;
        unsigned target_version = 0;
 
        GetOpt getopt;
@@ -48,13 +65,21 @@ GlslCompiler::GlslCompiler(int argc, char **argv):
        getopt.add_option('e', "specialize", spec_values_in, GetOpt::REQUIRED_ARG).set_help("Set specialization constant", "NAME:VALUE");
        getopt.add_option('s', "stage", stage_str, GetOpt::REQUIRED_ARG).set_help("Output GLSL for STAGE", "STAGE");
        getopt.add_option('m', "module", module_type, GetOpt::OPTIONAL_ARG).bind_seen_count(as_module).set_help("Compile as unspecialized module");
+       getopt.add_option("vulkan", vulkan, GetOpt::NO_ARG).set_help("Compile for Vulkan target");
        getopt.add_option('t', "target-version", target_version, GetOpt::REQUIRED_ARG).set_help("Specify target GLSL version", "VER");
        getopt.add_option('o', "out-file", out_filename, GetOpt::REQUIRED_ARG).set_help("Write output to file instead of stdout", "FILE");
+       getopt.add_option('I', "include", include_paths, GetOpt::REQUIRED_ARG).set_help("Add a directory to look for imported files", "DIR");
        getopt.add_argument("source", source_fn, GetOpt::REQUIRED_ARG).set_help("GLSL file to compile");
        getopt(argc, argv);
 
-       if(target_version)
-               features = GL::SL::Features::from_version(GL::Version(target_version/100, target_version%100));
+       if(vulkan)
+       {
+               features = GL::SL::Features::latest(GL::VULKAN);
+               as_module = 1;
+               module_type = "spirv";
+       }
+       else if(target_version)
+               features = GL::SL::Features::from_api_version(GL::OPENGL, GL::Version(target_version/100, target_version%100));
 
        if(as_module)
        {
@@ -107,9 +132,16 @@ GlslCompiler::GlslCompiler(int argc, char **argv):
 
 int GlslCompiler::main()
 {
+       Resources resources;
+       for(const string &p: include_paths)
+               resources.add_include_path(p);
+       FS::Path shaderlib_path = FS::get_sys_data_dir()/"shaderlib";
+       if(FS::exists(shaderlib_path))
+               resources.add_include_path(shaderlib_path);
+
        GL::SL::Compiler compiler(features);
        IO::File file(source_fn);
-       compiler.load_source(file, source_fn);
+       compiler.load_source(file, &resources, source_fn);
        if(compile_mode==GL::SL::Compiler::PROGRAM)
                compiler.specialize(spec_values);
        if(!parse_only)
@@ -136,7 +168,7 @@ int GlslCompiler::main()
        {
                vector<GL::SL::Stage::Type> stages = compiler.get_stages();
                for(vector<GL::SL::Stage::Type>::const_iterator i=stages.begin(); i!=stages.end(); ++i)
-                       IO::print("%s\n", compiler.get_stage_debug(*i));
+                       IO::print("%s\n", compiler.get_stage_debug(*i, true));
        }
 
        IO::Base *out = &IO::cout;
@@ -149,7 +181,7 @@ int GlslCompiler::main()
 
        if(compile_mode==GL::SL::Compiler::SPIRV)
        {
-               vector<UInt32> code = compiler.get_combined_spirv();
+               vector<uint32_t> code = compiler.get_combined_spirv();
                out->write(reinterpret_cast<char *>(&code.front()), code.size()*4);
        }
        else if(combined)
@@ -159,3 +191,14 @@ int GlslCompiler::main()
 
        return 0;
 }
+
+
+GlslCompiler::Resources::Resources()
+{
+       add_source(source);
+}
+
+void GlslCompiler::Resources::add_include_path(const FS::Path &p)
+{
+       source.add_directory(p);
+}