X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fglsl%2Fcompiler.cpp;h=0f608d6d600313682577df96a3c7e2cccd2e5226;hb=9bec9da4ec633a541cf6048beed99629fefae2b9;hp=d5ee6691ff83cd3d877c845431ab9a29698c1edb;hpb=0febee9a8fdf1f9b03d3f2e23e72f8194b3698c7;p=libs%2Fgl.git

diff --git a/source/glsl/compiler.cpp b/source/glsl/compiler.cpp
index d5ee6691..0f608d6d 100644
--- a/source/glsl/compiler.cpp
+++ b/source/glsl/compiler.cpp
@@ -206,13 +206,6 @@ void Compiler::append_stage(Stage &stage)
 		target = &*i;
 	}
 
-	if(target->content.body.empty())
-	{
-		Stage *builtins = get_builtins(stage.type);
-		if(builtins && builtins!=&stage)
-			append_stage(*builtins);
-	}
-
 	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)
@@ -239,16 +232,23 @@ void Compiler::generate(Stage &stage, Mode mode)
 	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);
+	if(const Stage *builtins = get_builtins(stage.type))
+		inject_block(stage.content, builtins->content);
+	if(const Stage *builtins = get_builtins(Stage::SHARED))
+		inject_block(stage.content, builtins->content);
 
 	// Initial resolving pass
 	BlockHierarchyResolver().apply(stage);
+	TypeResolver().apply(stage);
 	FunctionResolver().apply(stage);
 	VariableResolver().apply(stage);
 
 	/* All variables local to a stage have been resolved.  Resolve non-local
 	variables through interfaces. */
 	InterfaceGenerator().apply(stage);
+	TypeResolver().apply(stage);
 	VariableResolver().apply(stage);
 
 	FunctionResolver().apply(stage);
@@ -260,6 +260,7 @@ void Compiler::generate(Stage &stage, Mode mode)
 bool Compiler::validate(Stage &stage)
 {
 	DeclarationValidator().apply(stage);
+	ReferenceValidator().apply(stage);
 
 	for(vector<Diagnostic>::const_iterator i=stage.diagnostics.begin(); i!=stage.diagnostics.end(); ++i)
 		if(i->severity==Diagnostic::ERR)
@@ -276,6 +277,7 @@ Compiler::OptimizeResult Compiler::optimize(Stage &stage)
 	any_inlined |= ExpressionInliner().apply(stage);
 	if(any_inlined)
 	{
+		TypeResolver().apply(stage);
 		VariableResolver().apply(stage);
 		FunctionResolver().apply(stage);
 	}