X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Fglsl%2Fcompiler.h;h=f9e0e3fe2aa554f623b1d9c85f8f284e5808f58f;hp=51b4f00a683059579157297c1ca9803e7aff9994;hb=3a1b9cbe2441ae670a97541dc8ccb0a2860c8302;hpb=cc5483cc709fdf7b6966a3e69dabfcafebaaffa0

diff --git a/source/glsl/compiler.h b/source/glsl/compiler.h
index 51b4f00a..f9e0e3fe 100644
--- a/source/glsl/compiler.h
+++ b/source/glsl/compiler.h
@@ -91,7 +91,7 @@ public:
 
 	/** Returns a combined SPIR-V binary for all shader stages.  The result is
 	suitable for use with OpenGL or Vulkan. */
-	std::vector<UInt32> get_combined_spirv() const;
+	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
@@ -126,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. */