X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fglsl%2Fcompiler.h;h=e30bd709bb2aadef5cd585e114f6fdb6bc7f5ac8;hb=20a86c5905e1f7527d3c9edc3f56f6b7679c268a;hp=9891293af303e5552c1d970977f7ac528c4af6a7;hpb=6d11ee7d6137117f441951615cd4cde4d59bf968;p=libs%2Fgl.git

diff --git a/source/glsl/compiler.h b/source/glsl/compiler.h
index 9891293a..e30bd709 100644
--- a/source/glsl/compiler.h
+++ b/source/glsl/compiler.h
@@ -28,9 +28,20 @@ private:
 		REDO_PREVIOUS
 	};
 
+	enum ResolveFlags
+	{
+		RESOLVE_BLOCKS = 1,
+		RESOLVE_TYPES = 2,
+		RESOLVE_VARIABLES = 4,
+		RESOLVE_EXPRESSIONS = 8,
+		RESOLVE_FUNCTIONS = 16,
+		RESOLVE_ALL = 31
+	};
+
 	Features features;
 	Module *module;
 	std::vector<std::string> imported_names;
+	bool compiled;
 	bool specialized;
 	std::map<std::string, int> spec_values;
 
@@ -111,12 +122,25 @@ private:
 
 	/** Generates any implicitly defines syntactic structures and resolves
 	variables. */
-	void generate(Stage &, Mode);
+	void generate(Stage &);
+
+	template<typename T>
+	bool resolve(Stage &, unsigned &, unsigned);
+
+	/** Resolves various references between nodes.  Flags can be specified to
+	request resolving particular aspects.  Resolving may ripple into other
+	aspects as necessary. */
+	void resolve(Stage &, unsigned = RESOLVE_ALL);
+
+	/** Runs validators on a stage.  Diagnostic messages are recorded in the
+	stage for later inspection. */
+	void validate(Stage &);
 
-	/** Resolves references and expression types. */
-	void resolve(Stage &);
+	/** Checks a stage's recorded diagnostics for errors.  If any are found,
+	returns true. */
+	bool check_errors(Stage &);
 
-	bool validate(Stage &);
+	static bool diagnostic_line_order(const Diagnostic &, const Diagnostic &);
 
 	/** Applies optimizations to a stage.  The return value indicates which
 	stage should be optimized next. */