X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fglsl%2Fcompiler.cpp;h=4c8c1d03d893d277395b2f64b5def34aa7e55168;hb=77f6973f58167d94059d3f324c29ab2ca8de4544;hp=4f2080ab9c59afb8c8b6018aed6cac2d60c40d09;hpb=e9a898f315b5d1396f196d785913a283c30940f2;p=libs%2Fgl.git

diff --git a/source/glsl/compiler.cpp b/source/glsl/compiler.cpp
index 4f2080ab..4c8c1d03 100644
--- a/source/glsl/compiler.cpp
+++ b/source/glsl/compiler.cpp
@@ -23,18 +23,8 @@ namespace Msp {
 namespace GL {
 namespace SL {
 
-Compiler::Compiler():
-	features(Features::from_context()),
-	module(0),
-	compiled(false),
-	specialized(false)
-{ }
-
 Compiler::Compiler(const Features &f):
-	features(f),
-	module(0),
-	compiled(false),
-	specialized(false)
+	features(f)
 { }
 
 Compiler::~Compiler()
@@ -85,6 +75,7 @@ void Compiler::compile(Mode mode)
 	for(Stage &s: module->stages)
 		generate(s);
 	ConstantIdAssigner().apply(*module, features);
+	LocationAllocator().apply(*module, features, false);
 
 	for(Stage &s: module->stages)
 		validate(s);
@@ -102,6 +93,11 @@ void Compiler::compile(Mode mode)
 		for(Stage &s: module->stages)
 			ConstantSpecializer().apply(s, spec_values);
 	}
+	if(mode==PROGRAM)
+	{
+		for(Stage &s: module->stages)
+			DepthRangeConverter().apply(s, features);
+	}
 	for(auto i=module->stages.begin(); i!=module->stages.end(); )
 	{
 		OptimizeResult result = optimize(*i);
@@ -111,6 +107,11 @@ void Compiler::compile(Mode mode)
 			++i;
 	}
 
+	for(Stage &s: module->stages)
+	{
+		StructuralFeatureConverter().apply(s, features);
+		resolve(s, RESOLVE_VARIABLES|RESOLVE_FUNCTIONS);
+	}
 	LocationAllocator().apply(*module, features);
 	for(Stage &s: module->stages)
 		finalize(s, mode);
@@ -157,12 +158,12 @@ 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
+vector<uint32_t> Compiler::get_combined_spirv() const
 {
 	if(!compiled)
 		throw invalid_operation("Compiler::get_combined_spirv");
 	SpirVGenerator gen;
-	gen.apply(*module);
+	gen.apply(*module, features);
 	return gen.get_code();
 }
 
@@ -200,16 +201,24 @@ const map<string, unsigned> &Compiler::get_uniform_block_bindings() const
 	return module->shared.uniform_block_bindings;
 }
 
+unsigned Compiler::get_n_clip_distances() const
+{
+	if(!compiled)
+		throw invalid_operation("Compiler::get_n_clip_distances");
+	auto i = find_member(module->stages, Stage::VERTEX, &Stage::type);
+	return (i!=module->stages.end() ? i->n_clip_distances : 0);
+}
+
 const SourceMap &Compiler::get_source_map() const
 {
 	return module->source_map;
 }
 
-string Compiler::get_stage_debug(Stage::Type stage_type) const
+string Compiler::get_stage_debug(Stage::Type stage_type, bool use_colors) const
 {
 	auto i = find_member(module->stages, stage_type, &Stage::type);
 	if(i!=module->stages.end())
-		return DumpTree().apply(*i);
+		return DumpTree(use_colors).apply(*i);
 	throw key_error(Stage::get_stage_name(stage_type));
 }
 
@@ -278,7 +287,7 @@ void Compiler::import(ModuleCache &mod_cache, const string &name)
 
 void Compiler::generate(Stage &stage)
 {
-	stage.required_features.gl_api = features.gl_api;
+	stage.required_features.target_api = features.target_api;
 	if(module->shared.required_features.glsl_version>stage.required_features.glsl_version)
 		stage.required_features.glsl_version = module->shared.required_features.glsl_version;
 
@@ -295,6 +304,9 @@ void Compiler::generate(Stage &stage)
 	variables through interfaces. */
 	InterfaceGenerator().apply(stage);
 	resolve(stage, RESOLVE_BLOCKS|RESOLVE_TYPES|RESOLVE_VARIABLES);
+
+	ArraySizer().apply(stage);
+	resolve(stage, RESOLVE_EXPRESSIONS);
 }
 
 template<typename T>
@@ -326,7 +338,7 @@ void Compiler::resolve(Stage &stage, unsigned flags)
 
 void Compiler::validate(Stage &stage)
 {
-	DeclarationValidator().apply(stage);
+	DeclarationValidator().apply(stage, features);
 	IdentifierValidator().apply(stage);
 	ReferenceValidator().apply(stage);
 	ExpressionValidator().apply(stage);
@@ -360,7 +372,8 @@ Compiler::OptimizeResult Compiler::optimize(Stage &stage)
 {
 	if(ConstantFolder().apply(stage))
 		resolve(stage, RESOLVE_EXPRESSIONS);
-	ConstantConditionEliminator().apply(stage);
+	if(ConstantConditionEliminator().apply(stage))
+		resolve(stage, RESOLVE_VARIABLES);
 
 	bool any_inlined = false;
 	if(FunctionInliner().apply(stage))
@@ -368,6 +381,11 @@ Compiler::OptimizeResult Compiler::optimize(Stage &stage)
 		resolve(stage, RESOLVE_TYPES|RESOLVE_VARIABLES|RESOLVE_FUNCTIONS|RESOLVE_EXPRESSIONS);
 		any_inlined = true;
 	}
+	if(AggregateDismantler().apply(stage))
+	{
+		resolve(stage, RESOLVE_TYPES|RESOLVE_VARIABLES|RESOLVE_FUNCTIONS|RESOLVE_EXPRESSIONS);
+		any_inlined = true;
+	}
 	if(ExpressionInliner().apply(stage))
 	{
 		resolve(stage, RESOLVE_VARIABLES|RESOLVE_FUNCTIONS|RESOLVE_EXPRESSIONS);
@@ -386,13 +404,9 @@ Compiler::OptimizeResult Compiler::optimize(Stage &stage)
 
 void Compiler::finalize(Stage &stage, Mode mode)
 {
-	if(mode==PROGRAM)
-	{
-		LegacyConverter().apply(stage, features);
-		resolve(stage, RESOLVE_VARIABLES|RESOLVE_FUNCTIONS);
-		PrecisionConverter().apply(stage);
-	}
-	else if(mode==SPIRV)
+	QualifierConverter().apply(stage, features);
+	PrecisionConverter().apply(stage);
+	if(mode==SPIRV)
 		StructOrganizer().apply(stage);
 
 	// Collect bindings from all stages into the shared stage's maps