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

diff --git a/source/glsl/compiler.h b/source/glsl/compiler.h
index a1ab51f2..f9e0e3fe 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<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). */
@@ -121,13 +126,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. */