Merge branch 'main' of ssh://github.com/Kode/krafix

Kode · Oct 4, 2023 · 8db42c5 · 8db42c5
2 parents 7b0d8ff + 97fe1c4
commit 8db42c5
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/Sources/MetalStageInTranslator.h b/Sources/MetalStageInTranslator.h
@@ -8,6 +8,7 @@
 #include <unordered_map>
 #include <string>
 #include <sstream>
+#include <cstdint>
 
 
 namespace krafix {

diff --git a/Sources/SpirVTranslator.h b/Sources/SpirVTranslator.h
@@ -2,6 +2,8 @@
 
 #include "Translator.h"
 
+#include <cstdint>
+
 namespace krafix {
 	class SpirVTranslator : public Translator {
 	public:

diff --git a/Sources/krafix.cpp b/Sources/krafix.cpp
@@ -1240,15 +1240,15 @@ int compileWithTextureUnits(const char* targetlang, const char* from, std::strin
 	return errors;
 }
 
-extern "C" int krafix_compile(const char* source, char* output, int* length, const char* targetlang, const char* system, const char* shadertype) {
+extern "C" int krafix_compile(const char* source, char* output, int* length, const char* targetlang, const char* system, const char* shadertype, int version) {
 	// Reset fail states
 	CompileFailed = false;
 	LinkFailed = false;
-	
+
 	std::string defines;
 	std::vector<int> textureUnitCounts;
 	bool instancedoptional = false;
-	int version = -1;
+	// int version = -1;
 	bool getversion = false;
 	bool relax = false;