X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fglsl%2Fcompiler.h;h=a1ab51f254a771566c337f7b392484a3984a4157;hb=fdf2d162b21f55ad60bfeec2ad98c58356a083c0;hp=6448ae6cfa6fe962dc5097ffcf2011f835ebbaf9;hpb=c1d3a1d7c1997bc71a30af2e2c25cb4a2b66784b;p=libs%2Fgl.git

diff --git a/source/glsl/compiler.h b/source/glsl/compiler.h
index 6448ae6c..a1ab51f2 100644
--- a/source/glsl/compiler.h
+++ b/source/glsl/compiler.h
@@ -41,6 +41,7 @@ private:
 	Features features;
 	Module *module;
 	std::vector<std::string> imported_names;
+	bool compiled;
 	bool specialized;
 	std::map<std::string, int> spec_values;
 
@@ -97,6 +98,15 @@ public:
 	GLSL soucre). */
 	const std::map<std::string, unsigned> &get_fragment_outputs() const;
 
+	/** Returns a map of texture bindings.  If the target GLSL version supports
+	bindings, the map is empty (bindings are included in the GLSL source). */
+	const std::map<std::string, unsigned> &get_texture_bindings() const;
+
+	/** Returns a map of uniform block bindings.  If the target GLSL version
+	supports bindings, the map is empty (bindings are included in the GLSL
+	source). */
+	const std::map<std::string, unsigned> &get_uniform_block_bindings() const;
+
 	/** Returns the mapping of source indices to filenames.  Can be used to
 	translate error messages. */
 	const SourceMap &get_source_map() const;
@@ -121,7 +131,7 @@ 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);
@@ -131,7 +141,15 @@ private:
 	aspects as necessary. */
 	void resolve(Stage &, unsigned = RESOLVE_ALL);
 
-	bool validate(Stage &);
+	/** Runs validators on a stage.  Diagnostic messages are recorded in the
+	stage for later inspection. */
+	void validate(Stage &);
+
+	/** Checks a stage's recorded diagnostics for errors.  If any are found,
+	returns true. */
+	bool check_errors(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. */