Validate location overlap and type matching for GLSL interfaces

[libs/gl.git] / source / glsl / compiler.h

diff --git a/source/glsl/compiler.h b/source/glsl/compiler.h
index 6448ae6cfa6fe962dc5097ffcf2011f835ebbaf9..e30bd709bb2aadef5cd585e114f6fdb6bc7f5ac8 100644 (file)
--- 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;
 
@@ -121,7 +122,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 +132,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. */