X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fglsl%2Fcompiler.h;h=51b4f00a683059579157297c1ca9803e7aff9994;hb=cc5483cc709fdf7b6966a3e69dabfcafebaaffa0;hp=0ae2ed4114924946f2fbc04ae33a34b7d84b4676;hpb=8c4d64c71df5c4dcab1838d81412d7a7244ada58;p=libs%2Fgl.git diff --git a/source/glsl/compiler.h b/source/glsl/compiler.h index 0ae2ed41..51b4f00a 100644 --- a/source/glsl/compiler.h +++ b/source/glsl/compiler.h @@ -17,7 +17,8 @@ public: enum Mode { MODULE, - PROGRAM + PROGRAM, + SPIRV }; private: @@ -88,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 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). */ @@ -98,6 +103,15 @@ public: GLSL soucre). */ const std::map &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 &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 &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; @@ -122,7 +136,7 @@ private: /** Generates any implicitly defines syntactic structures and resolves variables. */ - void generate(Stage &, Mode); + void generate(Stage &); template bool resolve(Stage &, unsigned &, unsigned); @@ -132,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 &);