X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Fglsl%2Fspirvwriter.h;h=8456389a48b5df36363b1b6f69bba370168edf6c;hp=94f44e8883971299e73bc0649791f0a52ef6f3a5;hb=76cc18518fc8b0b4fa11fda153e7d9b3899ed112;hpb=cc5483cc709fdf7b6966a3e69dabfcafebaaffa0

diff --git a/source/glsl/spirvwriter.h b/source/glsl/spirvwriter.h
index 94f44e88..8456389a 100644
--- a/source/glsl/spirvwriter.h
+++ b/source/glsl/spirvwriter.h
@@ -3,7 +3,7 @@
 
 #include <string>
 #include <vector>
-#include <msp/core/inttypes.h>
+#include <cstdint>
 #include "spirvconstants.h"
 
 namespace Msp {
@@ -12,7 +12,7 @@ namespace SL {
 
 struct SpirVContent
 {
-	typedef UInt32 Word;
+	typedef std::uint32_t Word;
 
 	std::vector<Word> code;
 	std::vector<Word> capabilities;
@@ -61,10 +61,10 @@ public:
 	void write_op_member_decorate(Id, unsigned, Decoration);
 	void write_op_member_decorate(Id, unsigned, Decoration, Word);
 	void write_op_label(Id);
-	bool has_current_block() const { return current_block_id; }
+	Id get_current_block() const { return current_block_id; }
 	void begin_function_body(Id);
 	void end_function_body();
-	void finalize(Id);
+	void finalize(unsigned, Id);
 };
 
 } // namespace SL