X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Fglsl%2Fcompiler.cpp;h=74eec856d86a154561669ab9a1745793236e945e;hp=b2c4f9ba2cbed88dee8b4e70f00d8a6c4afb5739;hb=cc5483cc709fdf7b6966a3e69dabfcafebaaffa0;hpb=577a93f39f9b4d0f5101cd2f539fc774e7b06825

diff --git a/source/glsl/compiler.cpp b/source/glsl/compiler.cpp
index b2c4f9ba..74eec856 100644
--- a/source/glsl/compiler.cpp
+++ b/source/glsl/compiler.cpp
@@ -12,6 +12,7 @@
 #include "output.h"
 #include "resolve.h"
 #include "resources.h"
+#include "spirv.h"
 #include "validate.h"
 
 #undef interface
@@ -156,6 +157,15 @@ string Compiler::get_stage_glsl(Stage::Type stage_type) const
 	throw key_error(Stage::get_stage_name(stage_type));
 }
 
+vector<UInt32> Compiler::get_combined_spirv() const
+{
+	if(!compiled)
+		throw invalid_operation("Compiler::get_combined_spirv");
+	SpirVGenerator gen;
+	gen.apply(*module);
+	return gen.get_code();
+}
+
 const map<string, unsigned> &Compiler::get_vertex_attributes() const
 {
 	if(!compiled)
@@ -392,6 +402,8 @@ void Compiler::finalize(Stage &stage, Mode mode)
 		resolve(stage, RESOLVE_VARIABLES|RESOLVE_FUNCTIONS);
 		PrecisionConverter().apply(stage);
 	}
+	else if(mode==SPIRV)
+		StructOrganizer().apply(stage);
 
 	// Collect bindings from all stages into the shared stage's maps
 	module->shared.texture_bindings.insert(stage.texture_bindings.begin(), stage.texture_bindings.end());