X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fglsl%2Fcompiler.cpp;h=7021c62d9a2949c9459e6fa183955829bf04f469;hb=9d9e008291a447b5d192e724e9022180503c8c3e;hp=03bde487075d3d67f37d1a0f52b9095eae36f4fd;hpb=e3ebc204edbcce7b66dcf4c6e34f46a0c44b20f8;p=libs%2Fgl.git

diff --git a/source/glsl/compiler.cpp b/source/glsl/compiler.cpp
index 03bde487..7021c62d 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"
 
@@ -78,17 +79,26 @@ void Compiler::specialize(const map<string, int> &sv)
 void Compiler::compile(Mode mode)
 {
 	for(list<Stage>::iterator i=module->stages.begin(); i!=module->stages.end(); ++i)
-		generate(*i, mode);
+		generate(*i);
+	ConstantIdAssigner().apply(*module, features);
+
+	for(list<Stage>::iterator i=module->stages.begin(); i!=module->stages.end(); ++i)
+		validate(*i);
+	GlobalInterfaceValidator().apply(*module);
 
 	bool valid = true;
 	for(list<Stage>::iterator i=module->stages.begin(); i!=module->stages.end(); ++i)
-		if(!validate(*i))
+		if(!check_errors(*i))
 			valid = false;
 	if(!valid)
 		throw invalid_shader_source(get_diagnostics());
 
-	unsigned n = 0;
-	for(list<Stage>::iterator i=module->stages.begin(); i!=module->stages.end(); ++n)
+	if(mode==PROGRAM && specialized)
+	{
+		for(list<Stage>::iterator i=module->stages.begin(); i!=module->stages.end(); ++i)
+			ConstantSpecializer().apply(*i, spec_values);
+	}
+	for(list<Stage>::iterator i=module->stages.begin(); i!=module->stages.end(); )
 	{
 		OptimizeResult result = optimize(*i);
 		if(result==REDO_PREVIOUS)
@@ -96,6 +106,8 @@ void Compiler::compile(Mode mode)
 		else if(result!=REDO_STAGE)
 			++i;
 	}
+
+	LocationAllocator().apply(*module, features);
 	for(list<Stage>::iterator i=module->stages.begin(); i!=module->stages.end(); ++i)
 		finalize(*i, mode);
 
@@ -161,6 +173,20 @@ const map<string, unsigned> &Compiler::get_fragment_outputs() const
 	throw invalid_operation("Compiler::get_fragment_outputs");
 }
 
+const map<string, unsigned> &Compiler::get_texture_bindings() const
+{
+	if(!compiled)
+		throw invalid_operation("Compiler::get_texture_bindings");
+	return module->shared.texture_bindings;
+}
+
+const map<string, unsigned> &Compiler::get_uniform_block_bindings() const
+{
+	if(!compiled)
+		throw invalid_operation("Compiler::get_uniform_block_bindings");
+	return module->shared.uniform_block_bindings;
+}
+
 const SourceMap &Compiler::get_source_map() const
 {
 	return module->source_map;
@@ -243,7 +269,7 @@ void Compiler::import(DataFile::Collection *resources, const string &name)
 	append_module(import_parser.parse(*io, fn, module->source_map.get_count()), resources);
 }
 
-void Compiler::generate(Stage &stage, Mode mode)
+void Compiler::generate(Stage &stage)
 {
 	stage.required_features.gl_api = features.gl_api;
 	if(module->shared.required_features.glsl_version>stage.required_features.glsl_version)
@@ -262,8 +288,6 @@ void Compiler::generate(Stage &stage, Mode mode)
 	variables through interfaces. */
 	InterfaceGenerator().apply(stage);
 	resolve(stage, RESOLVE_BLOCKS|RESOLVE_TYPES|RESOLVE_VARIABLES);
-
-	ConstantSpecializer().apply(stage, (mode==PROGRAM && specialized ? &spec_values : 0));
 }
 
 template<typename T>
@@ -293,13 +317,18 @@ void Compiler::resolve(Stage &stage, unsigned flags)
 	}
 }
 
-bool Compiler::validate(Stage &stage)
+void Compiler::validate(Stage &stage)
 {
 	DeclarationValidator().apply(stage);
 	IdentifierValidator().apply(stage);
 	ReferenceValidator().apply(stage);
 	ExpressionValidator().apply(stage);
+	FlowControlValidator().apply(stage);
+	StageInterfaceValidator().apply(stage);
+}
 
+bool Compiler::check_errors(Stage &stage)
+{
 	stable_sort(stage.diagnostics, &diagnostic_line_order);
 
 	for(vector<Diagnostic>::const_iterator i=stage.diagnostics.begin(); i!=stage.diagnostics.end(); ++i)
@@ -344,7 +373,8 @@ Compiler::OptimizeResult Compiler::optimize(Stage &stage)
 
 	/* Removing variables or functions may cause things from the previous stage
 	to become unused. */
-	bool any_removed = UnusedVariableRemover().apply(stage);
+	bool any_removed = UnreachableCodeRemover().apply(stage);
+	any_removed |= UnusedVariableRemover().apply(stage);
 	any_removed |= UnusedFunctionRemover().apply(stage);
 	any_removed |= UnusedTypeRemover().apply(stage);
 
@@ -357,12 +387,12 @@ void Compiler::finalize(Stage &stage, Mode mode)
 	{
 		LegacyConverter().apply(stage, features);
 		resolve(stage, RESOLVE_VARIABLES|RESOLVE_FUNCTIONS);
+		PrecisionConverter().apply(stage);
 	}
 
-	if(get_gl_api()==OPENGL_ES2 && mode==PROGRAM)
-		DefaultPrecisionGenerator().apply(stage);
-	else if(mode==MODULE)
-		PrecisionRemover().apply(stage);
+	// Collect bindings from all stages into the shared stage's maps
+	module->shared.texture_bindings.insert(stage.texture_bindings.begin(), stage.texture_bindings.end());
+	module->shared.uniform_block_bindings.insert(stage.uniform_block_bindings.begin(), stage.uniform_block_bindings.end());
 }
 
 void Compiler::inject_block(Block &target, const Block &source)