Make the Vulkan-optimizations work

Author: RobDangerous

SPIRV-Tools

@@ -8,7 +8,7 @@
 #include <sstream>
 #include <strstream>
 
-//#include <spirv-tools/optimizer.hpp>
+#include <spirv-tools/optimizer.hpp>
 
 using namespace krafix;
 
@@ -1017,10 +1017,10 @@ void SpirVTranslator::outputCode(const Target& target, const char* sourcefilenam
 
 	bound = currentId + 1;
 
-	outputLength = writeInstructions(filename, output, instructions);
+	//outputLength = writeInstructions(filename, output, newinstructions);
 
-	/*std::vector<uint32_t> spirv;
-	outputLength = writeInstructions(spirv, instructions);
+	std::vector<uint32_t> spirv;
+	outputLength = writeInstructions(spirv, newinstructions);
 
 	spvtools::Optimizer optimizer(SPV_ENV_VULKAN_1_0);
 	optimizer.RegisterPerformancePasses();
@@ -1029,5 +1029,5 @@ void SpirVTranslator::outputCode(const Target& target, const char* sourcefilenam
 
 	FILE* file = fopen(filename, "wb");
 	fwrite(optimizedSpirv.data(), 4, optimizedSpirv.size(), file);
-	fclose(file);*/
+	fclose(file);
 }

Sources/SpirVTranslator.cpp

@@ -55,14 +55,14 @@ project.addIncludeDir('glslang/glslang/MachineIndependent');
 project.addIncludeDir('glslang/glslang/Include');
 project.addIncludeDir('glslang/OGLCompilersDLL');
 
-/*project.addFiles('SPIRV-Tools/source/*');
+project.addFiles('SPIRV-Tools/source/*');
 project.addFiles('SPIRV-Tools/source/opt/*');
 project.addFiles('SPIRV-Tools/source/util/*');
 project.addFiles('SPIRV-Tools/source/val/*');
 project.addIncludeDir('SPIRV-Tools');
 project.addIncludeDir('SPIRV-Tools/include');
 project.addIncludeDir('SPIRV-Tools/generated');
-project.addIncludeDir('SPIRV-Headers/include');*/
+project.addIncludeDir('SPIRV-Headers/include');
 
 if (platform === Platform.Windows) {
 	project.addFile('glslang/glslang/OSDependent/Windows/**');