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

diff --git a/source/glsl/compiler.cpp b/source/glsl/compiler.cpp
index 1948722a..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
@@ -78,6 +79,9 @@ void Compiler::specialize(const map<string, int> &sv)
 
 void Compiler::compile(Mode mode)
 {
+	if(specialized && mode!=PROGRAM)
+		throw invalid_operation("Compiler::compile");
+
 	for(list<Stage>::iterator i=module->stages.begin(); i!=module->stages.end(); ++i)
 		generate(*i);
 	ConstantIdAssigner().apply(*module, features);
@@ -93,7 +97,7 @@ void Compiler::compile(Mode mode)
 	if(!valid)
 		throw invalid_shader_source(get_diagnostics());
 
-	if(mode==PROGRAM && specialized)
+	if(specialized)
 	{
 		for(list<Stage>::iterator i=module->stages.begin(); i!=module->stages.end(); ++i)
 			ConstantSpecializer().apply(*i, spec_values);
@@ -107,7 +111,7 @@ void Compiler::compile(Mode mode)
 			++i;
 	}
 
-	LocationAllocator().apply(*module);
+	LocationAllocator().apply(*module, features);
 	for(list<Stage>::iterator i=module->stages.begin(); i!=module->stages.end(); ++i)
 		finalize(*i, mode);
 
@@ -153,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)
@@ -173,6 +186,20 @@ const map<string, unsigned> &Compiler::get_fragment_outputs() const
 	throw invalid_operation("Compiler::get_fragment_outputs");
 }
 
+const map<string, unsigned> &Compiler::get_texture_bindings() const
+{
+	if(!compiled)
+		throw invalid_operation("Compiler::get_texture_bindings");
+	return module->shared.texture_bindings;
+}
+
+const map<string, unsigned> &Compiler::get_uniform_block_bindings() const
+{
+	if(!compiled)
+		throw invalid_operation("Compiler::get_uniform_block_bindings");
+	return module->shared.uniform_block_bindings;
+}
+
 const SourceMap &Compiler::get_source_map() const
 {
 	return module->source_map;
@@ -309,6 +336,7 @@ void Compiler::validate(Stage &stage)
 	IdentifierValidator().apply(stage);
 	ReferenceValidator().apply(stage);
 	ExpressionValidator().apply(stage);
+	FlowControlValidator().apply(stage);
 	StageInterfaceValidator().apply(stage);
 }
 
@@ -358,7 +386,8 @@ Compiler::OptimizeResult Compiler::optimize(Stage &stage)
 
 	/* Removing variables or functions may cause things from the previous stage
 	to become unused. */
-	bool any_removed = UnusedVariableRemover().apply(stage);
+	bool any_removed = UnreachableCodeRemover().apply(stage);
+	any_removed |= UnusedVariableRemover().apply(stage);
 	any_removed |= UnusedFunctionRemover().apply(stage);
 	any_removed |= UnusedTypeRemover().apply(stage);
 
@@ -373,6 +402,12 @@ 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());
+	module->shared.uniform_block_bindings.insert(stage.uniform_block_bindings.begin(), stage.uniform_block_bindings.end());
 }
 
 void Compiler::inject_block(Block &target, const Block &source)