Refactor resolution of declarations for MemberAccess

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

diff --git a/source/glsl/compiler.h b/source/glsl/compiler.h
index 1f3cbee4698c466a7b88b562d56373f7f9b0fb6e..9891293af303e5552c1d970977f7ac528c4af6a7 100644 (file)
--- a/source/glsl/compiler.h
+++ b/source/glsl/compiler.h
@@ -21,6 +21,13 @@ public:
        };
 
 private:
+       enum OptimizeResult
+       {
+               NEXT_STAGE,
+               REDO_STAGE,
+               REDO_PREVIOUS
+       };
+
        Features features;
        Module *module;
        std::vector<std::string> imported_names;
@@ -88,6 +95,10 @@ public:
        Intended for debugging purposes. */
        std::string get_stage_debug(Stage::Type) const;
 
+       /** Returns diagnostics from compilation.  The output is intended to be
+       viewed by humans. */
+       std::string get_diagnostics() const;
+
 private:
        /** Appends a module to the target, processing any imports found in it. */
        void append_module(Module &, DataFile::Collection *);
@@ -102,9 +113,14 @@ private:
        variables. */
        void generate(Stage &, Mode);
 
-       /** Applies optimizations to a stage.  The return value indicates if the
-       preceding stage should be processed again. */
-       bool optimize(Stage &);
+       /** Resolves references and expression types. */
+       void resolve(Stage &);
+
+       bool validate(Stage &);
+
+       /** Applies optimizations to a stage.  The return value indicates which
+       stage should be optimized next. */
+       OptimizeResult optimize(Stage &);
 
        /** Performs final adjustments on a stage after compilation. */
        void finalize(Stage &, Mode);