Make things compile again

Author: RobDangerous

Sources/GlslTranslator2.cpp

@@ -6,7 +6,7 @@ using namespace krafix;
 
 void GlslTranslator2::outputCode(const Target& target, const char* sourcefilename, const char* filename, char* output, std::map<std::string, int>& attributes) {
 	std::vector<unsigned> spirv;
-	
+
 	spirv.push_back(magicNumber);
 	spirv.push_back(version);
 	spirv.push_back(generator);
@@ -23,8 +23,8 @@ void GlslTranslator2::outputCode(const Target& target, const char* sourcefilenam
 
 	spirv_cross::CompilerGLSL* compiler = new spirv_cross::CompilerGLSL(spirv);
 
-	compiler->set_entry_point("main");
-	spirv_cross::CompilerGLSL::Options opts = compiler->get_options();
+	compiler->set_entry_point("main", executionModel());
+	spirv_cross::CompilerGLSL::Options opts = compiler->get_common_options();
 	opts.vertex.fixup_clipspace = false;
 	opts.version = target.version;
 	opts.es = target.es;
@@ -42,7 +42,7 @@ void GlslTranslator2::outputCode(const Target& target, const char* sourcefilenam
 		opts.relax_everything = true;
 #endif
 	}
-	compiler->set_options(opts);
+	compiler->set_common_options(opts);
 
 	std::string glsl = compiler->compile();
 	if (output) {

Sources/HlslTranslator2.cpp

@@ -7,7 +7,7 @@ using namespace krafix;
 
 void HlslTranslator2::outputCode(const Target& target, const char* sourcefilename, const char* filename, char* output, std::map<std::string, int>& attributes) {
 	std::vector<unsigned> spirv;
-	
+
 	spirv.push_back(magicNumber);
 	spirv.push_back(version);
 	spirv.push_back(generator);
@@ -24,20 +24,20 @@ void HlslTranslator2::outputCode(const Target& target, const char* sourcefilenam
 
 	spirv_cross::CompilerHLSL* compiler = new spirv_cross::CompilerHLSL(spirv);
 
-	compiler->set_entry_point("main");
+	compiler->set_entry_point("main", executionModel());
 
-	spirv_cross::CompilerGLSL::Options glslOpts = compiler->CompilerGLSL::get_options();
+	spirv_cross::CompilerGLSL::Options glslOpts = compiler->CompilerGLSL::get_common_options();
 	glslOpts.vertex.fixup_clipspace = true;
-	compiler->CompilerGLSL::set_options(glslOpts);
-	
-	spirv_cross::CompilerHLSL::Options opts = compiler->get_options();
+	compiler->CompilerGLSL::set_common_options(glslOpts);
+
+	spirv_cross::CompilerHLSL::Options opts = compiler->get_hlsl_options();
 	if (target.version > 9) {
 		opts.shader_model = 40;
 	}
 	else {
 		opts.shader_model = 30;
 	}
-	compiler->set_options(opts);
+	compiler->set_hlsl_options(opts);
 
 	std::string hlsl = compiler->compile();
 	if (output) {

Sources/MetalTranslator2.cpp

@@ -15,7 +15,7 @@ namespace {
 		}
 		return path.substr(i, std::string::npos);
 	}
-	
+
 	std::string replace(std::string str, char c1, char c2) {
 		std::string ret = str;
 		for (unsigned i = 0; i < str.length(); ++i) {
@@ -40,7 +40,7 @@ namespace {
 
 void MetalTranslator2::outputCode(const Target& target, const char* sourcefilename, const char* filename, char* output, std::map<std::string, int>& attributes) {
 	std::vector<unsigned> spirv;
-	
+
 	spirv.push_back(magicNumber);
 	spirv.push_back(version);
 	spirv.push_back(generator);
@@ -56,7 +56,7 @@ void MetalTranslator2::outputCode(const Target& target, const char* sourcefilena
 	}
 
 	spirv_cross::CompilerMSL* compiler = new spirv_cross::CompilerMSL(spirv);
-	
+
 	std::string name = extractFilename(sourcefilename);
 	name = name.substr(0, name.find_last_of("."));
 	name = replace(name, '-', '_');
@@ -86,8 +86,8 @@ void MetalTranslator2::outputCode(const Target& target, const char* sourcefilena
 	mslBinding.stage = convert(stage);
 	mslBinding.msl_buffer = stage == StageVertex ? 1 : 0;
 	p_res_bindings.push_back(mslBinding);
-	
-	std::string metal = compiler->compile(nullptr, &p_res_bindings);
+
+	std::string metal = compiler->compile(); // nullptr, & p_res_bindings); // TODO?
 	if (output) {
 		strcpy(output, metal.c_str());
 	}

Sources/Translator.cpp

@@ -38,7 +38,7 @@ Instruction::Instruction(std::vector<unsigned>& spirv, unsigned& index) {
 }
 
 Instruction::Instruction(int opcode, unsigned* operands, unsigned length) : opcode(opcode), operands(operands), length(length), string(NULL) {
-	
+
 }
 
 Translator::Translator(std::vector<unsigned>& spirv, ShaderStage stage) : stage(stage), spirv(spirv) {
@@ -57,3 +57,22 @@ Translator::Translator(std::vector<unsigned>& spirv, ShaderStage stage) : stage(
 
 	//printf("Read %i instructions.\n", instructions.size());
 }
+
+spv::ExecutionModel Translator::executionModel() {
+	switch (stage) {
+	case StageVertex:
+		return spv::ExecutionModelVertex;
+	case StageTessControl:
+		return spv::ExecutionModelTessellationControl;
+	case StageTessEvaluation:
+		return spv::ExecutionModelTessellationEvaluation;
+	case StageGeometry:
+		return spv::ExecutionModelGeometry;
+	case StageFragment:
+		return spv::ExecutionModelFragment;
+	case StageCompute:
+		return spv::ExecutionModelKernel;
+	default:
+		throw "Unknown shader stage";
+	}
+}

Sources/Translator.h

@@ -5,6 +5,8 @@
 #include <sstream>
 #include <vector>
 
+#include <SPIRV/spirv.hpp>
+
 namespace krafix {
 	enum TargetLanguage {
 		SpirV,
@@ -61,7 +63,7 @@ namespace krafix {
 				stream << version;
 				return stream.str();
 			}
-				
+
 			case Metal:
 				return "Metal";
 			case AGAL:
@@ -96,6 +98,7 @@ namespace krafix {
 		std::vector<unsigned>& spirv;
 		std::vector<Instruction> instructions;
 		ShaderStage stage;
+		spv::ExecutionModel executionModel();
 
 		unsigned magicNumber;
 		unsigned version;