X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Fglsl%2Fcompiler.h;h=1c07f3250d9bc4d964168a7fd868a16346e5cd06;hp=1f3cbee4698c466a7b88b562d56373f7f9b0fb6e;hb=38712d8ecc57d043a2419ffbaeeb57f7a6586f14;hpb=30465dd3b9f55ec42c4b19c3c2077eede7237a26

diff --git a/source/glsl/compiler.h b/source/glsl/compiler.h
index 1f3cbee4..1c07f325 100644
--- a/source/glsl/compiler.h
+++ b/source/glsl/compiler.h
@@ -17,14 +17,33 @@ public:
 	enum Mode
 	{
 		MODULE,
-		PROGRAM
+		PROGRAM,
+		SPIRV
 	};
 
 private:
+	enum OptimizeResult
+	{
+		NEXT_STAGE,
+		REDO_STAGE,
+		REDO_PREVIOUS
+	};
+
+	enum ResolveFlags
+	{
+		RESOLVE_BLOCKS = 1,
+		RESOLVE_TYPES = 2,
+		RESOLVE_VARIABLES = 4,
+		RESOLVE_EXPRESSIONS = 8,
+		RESOLVE_FUNCTIONS = 16,
+		RESOLVE_ALL = 31
+	};
+
 	Features features;
-	Module *module;
+	Module *module = 0;
 	std::vector<std::string> imported_names;
-	bool specialized;
+	bool compiled = false;
+	bool specialized = false;
 	std::map<std::string, int> spec_values;
 
 public:
@@ -70,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). */
@@ -80,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;
@@ -88,23 +120,45 @@ public:
 	Intended for debugging purposes. */
 	std::string get_stage_debug(Stage::Type) const;
 
+	/** Returns diagnostics from compilation.  The output is intended to be
+	viewed by humans. */
+	std::string get_diagnostics() const;
+
 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);
+
+	/** Resolves various references between nodes.  Flags can be specified to
+	request resolving particular aspects.  Resolving may ripple into other
+	aspects as necessary. */
+	void resolve(Stage &, unsigned = RESOLVE_ALL);
+
+	/** 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 &);
 
-	/** Applies optimizations to a stage.  The return value indicates if the
-	preceding stage should be processed again. */
-	bool optimize(Stage &);
+	/** Applies optimizations to a stage.  The return value indicates which
+	stage should be optimized next. */
+	OptimizeResult optimize(Stage &);
 
 	/** Performs final adjustments on a stage after compilation. */
 	void finalize(Stage &, Mode);