X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fglsl%2Fcompiler.cpp;h=b810e52bef5e0af758379f4c12a086a13d22a8e5;hb=bbe2fb7bc1384d7683f1795b5cfa9168df18c580;hp=40dfede3a68688e5ec9ef7a9fb23576af28d393e;hpb=7a62eb7f7550df161656616f2ece5a094b754392;p=libs%2Fgl.git

diff --git a/source/glsl/compiler.cpp b/source/glsl/compiler.cpp
index 40dfede3..b810e52b 100644
--- a/source/glsl/compiler.cpp
+++ b/source/glsl/compiler.cpp
@@ -2,14 +2,15 @@
 #include <msp/strings/format.h>
 #include <msp/strings/utils.h>
 #include "builtin.h"
-#include "compatibility.h"
 #include "compiler.h"
 #include "debug.h"
 #include "error.h"
+#include "finalize.h"
 #include "generate.h"
 #include "glsl_error.h"
 #include "optimize.h"
 #include "output.h"
+#include "resolve.h"
 #include "resources.h"
 #include "validate.h"
 
@@ -264,11 +265,6 @@ void Compiler::generate(Stage &stage, Mode mode)
 	resolve(stage, RESOLVE_BLOCKS|RESOLVE_TYPES|RESOLVE_VARIABLES);
 
 	ConstantSpecializer().apply(stage, (mode==PROGRAM && specialized ? &spec_values : 0));
-	if(mode==PROGRAM)
-	{
-		LegacyConverter().apply(stage, features);
-		resolve(stage, RESOLVE_VARIABLES|RESOLVE_FUNCTIONS);
-	}
 }
 
 template<typename T>
@@ -300,7 +296,7 @@ void Compiler::resolve(Stage &stage, unsigned flags)
 
 bool Compiler::validate(Stage &stage)
 {
-	TypeValidator().apply(stage);
+	DeclarationValidator().apply(stage);
 	IdentifierValidator().apply(stage);
 	ReferenceValidator().apply(stage);
 	ExpressionValidator().apply(stage);
@@ -358,10 +354,12 @@ Compiler::OptimizeResult Compiler::optimize(Stage &stage)
 
 void Compiler::finalize(Stage &stage, Mode mode)
 {
-	if(get_gl_api()==OPENGL_ES2 && mode==PROGRAM)
-		DefaultPrecisionGenerator().apply(stage);
-	else if(mode==MODULE)
-		PrecisionRemover().apply(stage);
+	if(mode==PROGRAM)
+	{
+		LegacyConverter().apply(stage, features);
+		resolve(stage, RESOLVE_VARIABLES|RESOLVE_FUNCTIONS);
+		PrecisionConverter().apply(stage);
+	}
 }
 
 void Compiler::inject_block(Block &target, const Block &source)