Use standard fixed-size integer types

[libs/gl.git] / source / glsl / compiler.h

diff --git a/source/glsl/compiler.h b/source/glsl/compiler.h
index a515a326f2b10b21ce866fd4591e65b38558263d..f9e0e3fe2aa554f623b1d9c85f8f284e5808f58f 100644 (file)
--- a/source/glsl/compiler.h
+++ b/source/glsl/compiler.h
@@ -17,7 +17,8 @@ public:
        enum Mode
        {
                MODULE,
-               PROGRAM
+               PROGRAM,
+               SPIRV
        };
 
 private:
@@ -41,6 +42,7 @@ private:
        Features features;
        Module *module;
        std::vector<std::string> imported_names;
+       bool compiled;
        bool specialized;
        std::map<std::string, int> spec_values;
 
@@ -87,6 +89,10 @@ public:
        GLSL suitable for OpenGL or an external GLSL compiler. */
        std::string get_stage_glsl(Stage::Type) const;
 
+       /** Returns a combined SPIR-V binary for all shader stages.  The result is
+       suitable for use with OpenGL or Vulkan. */
+       std::vector<std::uint32_t> get_combined_spirv() const;
+
        /** Returns a map of vertex attribute locations.  If the target GLSL version
        supports interface layouts, the map is empty (locations are included in the
        GLSL soucre). */
@@ -97,6 +103,15 @@ public:
        GLSL soucre). */
        const std::map<std::string, unsigned> &get_fragment_outputs() const;
 
+       /** Returns a map of texture bindings.  If the target GLSL version supports
+       bindings, the map is empty (bindings are included in the GLSL source). */
+       const std::map<std::string, unsigned> &get_texture_bindings() const;
+
+       /** Returns a map of uniform block bindings.  If the target GLSL version
+       supports bindings, the map is empty (bindings are included in the GLSL
+       source). */
+       const std::map<std::string, unsigned> &get_uniform_block_bindings() const;
+
        /** Returns the mapping of source indices to filenames.  Can be used to
        translate error messages. */
        const SourceMap &get_source_map() const;
@@ -111,17 +126,17 @@ public:
 
 private:
        /** Appends a module to the target, processing any imports found in it. */
-       void append_module(Module &, DataFile::Collection *);
+       void append_module(const Module &, ModuleCache &);
 
        /** Appends a single stage to the matching stage of the target. */
-       void append_stage(Stage &);
+       void append_stage(const Stage &);
 
        /// Imports a module by name and appends it to the target. */
-       void import(DataFile::Collection *, const std::string &);
+       void import(ModuleCache &, const std::string &);
 
        /** Generates any implicitly defines syntactic structures and resolves
        variables. */
-       void generate(Stage &, Mode);
+       void generate(Stage &);
 
        template<typename T>
        bool resolve(Stage &, unsigned &, unsigned);
@@ -131,9 +146,13 @@ private:
        aspects as necessary. */
        void resolve(Stage &, unsigned = RESOLVE_ALL);
 
-       /** Checks the validity of the module.  If the return value is false, the
-       module's diagnostics list will contain additional information of errors. */
-       bool validate(Stage &);
+       /** Runs validators on a stage.  Diagnostic messages are recorded in the
+       stage for later inspection. */
+       void validate(Stage &);
+
+       /** Checks a stage's recorded diagnostics for errors.  If any are found,
+       returns true. */
+       bool check_errors(Stage &);
 
        static bool diagnostic_line_order(const Diagnostic &, const Diagnostic &);