X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fglsl%2Fcompiler.h;h=0db1ca400de7f017b2991e414dd3c0c331bc8a3d;hb=77f6973f58167d94059d3f324c29ab2ca8de4544;hp=a1ab51f254a771566c337f7b392484a3984a4157;hpb=c6b29fbf9927467b21dca65539a1fa2c98f96e0e;p=libs%2Fgl.git

diff --git a/source/glsl/compiler.h b/source/glsl/compiler.h
index a1ab51f2..0db1ca40 100644
--- a/source/glsl/compiler.h
+++ b/source/glsl/compiler.h
@@ -17,7 +17,8 @@ public:
 	enum Mode
 	{
 		MODULE,
-		PROGRAM
+		PROGRAM,
+		SPIRV
 	};
 
 private:
@@ -39,16 +40,13 @@ private:
 	};
 
 	Features features;
-	Module *module;
+	Module *module = 0;
 	std::vector<std::string> imported_names;
-	bool compiled;
-	bool specialized;
+	bool compiled = false;
+	bool specialized = false;
 	std::map<std::string, int> spec_values;
 
 public:
-	/** Creates a compiler using features from the current OpenGL context. */
-	Compiler();
-
 	/** Creates a compiler targeting a specific set of features. */
 	Compiler(const Features &);
 
@@ -88,6 +86,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). */
@@ -107,13 +109,15 @@ public:
 	source). */
 	const std::map<std::string, unsigned> &get_uniform_block_bindings() const;
 
+	unsigned get_n_clip_distances() const;
+
 	/** Returns the mapping of source indices to filenames.  Can be used to
 	translate error messages. */
 	const SourceMap &get_source_map() const;
 
 	/** Returns a textual representation of the syntax tree for a shader stage.
 	Intended for debugging purposes. */
-	std::string get_stage_debug(Stage::Type) const;
+	std::string get_stage_debug(Stage::Type, bool = false) const;
 
 	/** Returns diagnostics from compilation.  The output is intended to be
 	viewed by humans. */
@@ -121,13 +125,13 @@ 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. */