X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fglsl%2Fcompiler.cpp;h=f1ab6d088e4e1bdedd5d4188685ef2f6a55f02e0;hb=6211e1556df8345ad1c4e7edbd635bccdd7f54f0;hp=e676fcc87233764cc529fe98203bc5d8b666df0f;hpb=25629675e83449d986ef8896e830db562a8ae64e;p=libs%2Fgl.git

diff --git a/source/glsl/compiler.cpp b/source/glsl/compiler.cpp
index e676fcc8..f1ab6d08 100644
--- a/source/glsl/compiler.cpp
+++ b/source/glsl/compiler.cpp
@@ -75,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);
@@ -157,7 +158,7 @@ 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();
 }
 
@@ -208,11 +209,11 @@ 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));
 }
 
@@ -298,6 +299,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>
@@ -363,7 +367,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))