X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fglsl%2Fcompiler.cpp;h=a18b8e8c2c3df57e0f26c2d126719edbaced8fb5;hb=6288c42adde9ee7d39a47de51fa2856cf965dccc;hp=4a7a19e29759770966db8ae105c0967bdd5c4f9b;hpb=c0be4e4ae1a8b6ac31ff6b7080e2242c13d947ff;p=libs%2Fgl.git

diff --git a/source/glsl/compiler.cpp b/source/glsl/compiler.cpp
index 4a7a19e2..a18b8e8c 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"
@@ -20,12 +21,14 @@ namespace SL {
 
 Compiler::Compiler():
 	features(Features::from_context()),
-	module(0)
+	module(0),
+	specialized(false)
 { }
 
 Compiler::Compiler(const Features &f):
 	features(f),
-	module(0)
+	module(0),
+	specialized(false)
 { }
 
 Compiler::~Compiler()
@@ -62,6 +65,12 @@ void Compiler::load_source(IO::Base &io, const string &src_name)
 	load_source(io, 0, src_name);
 }
 
+void Compiler::specialize(const map<string, int> &sv)
+{
+	specialized = true;
+	spec_values = sv;
+}
+
 void Compiler::compile(Mode mode)
 {
 	for(list<Stage>::iterator i=module->stages.begin(); i!=module->stages.end(); ++i)
@@ -132,6 +141,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);
@@ -204,6 +221,7 @@ void Compiler::generate(Stage &stage, Mode mode)
 	VariableResolver().apply(stage);
 	DeclarationReorderer().apply(stage);
 	FunctionResolver().apply(stage);
+	ConstantSpecializer().apply(stage, (mode==PROGRAM && specialized ? &spec_values : 0));
 	if(mode==PROGRAM)
 		LegacyConverter().apply(stage, features);
 }