X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fglsl%2Fcompiler.cpp;h=e676fcc87233764cc529fe98203bc5d8b666df0f;hb=3fe1aab63922eec99d8bf6fd4fd60bec10df173c;hp=506fba1c417c62657ee98292febc5102a5a752cd;hpb=38712d8ecc57d043a2419ffbaeeb57f7a6586f14;p=libs%2Fgl.git

diff --git a/source/glsl/compiler.cpp b/source/glsl/compiler.cpp
index 506fba1c..e676fcc8 100644
--- a/source/glsl/compiler.cpp
+++ b/source/glsl/compiler.cpp
@@ -4,7 +4,6 @@
 #include "builtin.h"
 #include "compiler.h"
 #include "debug.h"
-#include "deviceinfo.h"
 #include "error.h"
 #include "finalize.h"
 #include "generate.h"
@@ -24,10 +23,6 @@ namespace Msp {
 namespace GL {
 namespace SL {
 
-Compiler::Compiler():
-	features(DeviceInfo::get_global().glsl_features)
-{ }
-
 Compiler::Compiler(const Features &f):
 	features(f)
 { }
@@ -106,6 +101,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);
@@ -195,6 +195,14 @@ 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;
@@ -321,7 +329,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);
@@ -363,6 +371,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);
@@ -381,13 +394,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