X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Fglsl%2Fcompiler.cpp;h=4b1d4edf11d0e6e29c8410ab123521b440826128;hp=8d96cc4270b5b1566f75e37f26e1e35fa04c0352;hb=e2ed3de4cbbc682ff490a3b0b760b8a45260f611;hpb=3a1b9cbe2441ae670a97541dc8ccb0a2860c8302

diff --git a/source/glsl/compiler.cpp b/source/glsl/compiler.cpp
index 8d96cc42..4b1d4edf 100644
--- a/source/glsl/compiler.cpp
+++ b/source/glsl/compiler.cpp
@@ -4,6 +4,7 @@
 #include "builtin.h"
 #include "compiler.h"
 #include "debug.h"
+#include "deviceinfo.h"
 #include "error.h"
 #include "finalize.h"
 #include "generate.h"
@@ -24,17 +25,11 @@ namespace GL {
 namespace SL {
 
 Compiler::Compiler():
-	features(Features::from_context()),
-	module(0),
-	compiled(false),
-	specialized(false)
+	features(DeviceInfo::get_global().glsl_features)
 { }
 
 Compiler::Compiler(const Features &f):
-	features(f),
-	module(0),
-	compiled(false),
-	specialized(false)
+	features(f)
 { }
 
 Compiler::~Compiler()
@@ -278,7 +273,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;
 
@@ -368,6 +363,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);