X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;ds=sidebyside;f=source%2Fglsl%2Fcompiler.cpp;h=ca6c58057022b8b3a9f69373433c0f6c54a2e35d;hb=90c3973fcadf28e25797656154e42dd3d2915144;hp=89ffd7f3f0bb73cfa295a76ccac9b5f2776a099a;hpb=dccad64b2ec82249d850b9745614042171499972;p=libs%2Fgl.git

diff --git a/source/glsl/compiler.cpp b/source/glsl/compiler.cpp
index 89ffd7f3..ca6c5805 100644
--- a/source/glsl/compiler.cpp
+++ b/source/glsl/compiler.cpp
@@ -3,6 +3,7 @@
 #include <msp/strings/format.h>
 #include "compatibility.h"
 #include "compiler.h"
+#include "debug.h"
 #include "error.h"
 #include "generate.h"
 #include "optimize.h"
@@ -19,6 +20,12 @@ namespace GL {
 namespace SL {
 
 Compiler::Compiler():
+	features(Features::from_context()),
+	module(0)
+{ }
+
+Compiler::Compiler(const Features &f):
+	features(f),
 	module(0)
 { }
 
@@ -126,6 +133,14 @@ const SourceMap &Compiler::get_source_map() const
 	return module->source_map;
 }
 
+string Compiler::get_stage_debug(Stage::Type stage_type) const
+{
+	for(list<Stage>::iterator i=module->stages.begin(); i!=module->stages.end(); ++i)
+		if(i->type==stage_type)
+			return DumpTree().apply(*i);
+	throw key_error(Stage::get_stage_name(stage_type));
+}
+
 void Compiler::append_module(Module &mod, DataFile::Collection *res)
 {
 	module->source_map.merge_from(mod.source_map);
@@ -162,8 +177,8 @@ void Compiler::append_stage(Stage &stage)
 		target = &*i;
 	}
 
-	if(stage.required_version>target->required_version)
-		target->required_version = stage.required_version;
+	if(stage.required_features.glsl_version>target->required_features.glsl_version)
+		target->required_features.glsl_version = stage.required_features.glsl_version;
 	for(NodeList<Statement>::iterator i=stage.content.body.begin(); i!=stage.content.body.end(); ++i)
 		target->content.body.push_back(*i);
 	DeclarationCombiner().apply(*target);
@@ -185,8 +200,9 @@ void Compiler::import(DataFile::Collection *resources, const string &name)
 
 void Compiler::generate(Stage &stage, Mode mode)
 {
-	if(module->shared.required_version>stage.required_version)
-		stage.required_version = module->shared.required_version;
+	stage.required_features.gl_api = features.gl_api;
+	if(module->shared.required_features.glsl_version>stage.required_features.glsl_version)
+		stage.required_features.glsl_version = module->shared.required_features.glsl_version;
 	inject_block(stage.content, module->shared.content);
 
 	DeclarationReorderer().apply(stage);
@@ -198,7 +214,7 @@ void Compiler::generate(Stage &stage, Mode mode)
 	DeclarationReorderer().apply(stage);
 	FunctionResolver().apply(stage);
 	if(mode==PROGRAM)
-		LegacyConverter().apply(stage);
+		LegacyConverter().apply(stage, features);
 }
 
 bool Compiler::optimize(Stage &stage)