Refactor program stage management

[libs/gl.git] / source / core / program.h

diff --git a/source/core/program.h b/source/core/program.h
index 666cfd3eeda8f6a00449b9ab4d899ff64aa0af78..090d8ed5ebc5c4d191ab24d13f7cef402502cdc3 100644 (file)
--- a/source/core/program.h
+++ b/source/core/program.h
@@ -101,16 +101,25 @@ public:
        };
 
 private:
-       struct Bindings
+       enum Stage
+       {
+               VERTEX,
+               GEOMETRY,
+               FRAGMENT,
+               MAX_STAGES
+       };
+
+       struct TransientData
        {
                std::map<std::string, unsigned> textures;
                std::map<std::string, unsigned> blocks;
+               std::map<unsigned, int> spec_values;
        };
 
        unsigned id;
-       std::vector<unsigned> stage_ids;
+       unsigned stage_ids[MAX_STAGES];
        const Module *module;
-       Bindings *bindings;
+       TransientData *transient;
        bool linked;
        std::vector<UniformBlockInfo> uniform_blocks;
        std::vector<UniformInfo> uniforms;
@@ -137,7 +146,8 @@ public:
 
        void add_stages(const Module &, const std::map<std::string, int> & = std::map<std::string, int>());
 private:
-       unsigned add_stage(GLenum);
+       bool has_stages() const;
+       unsigned add_stage(Stage);
        void add_glsl_stages(const GlslModule &, const std::map<std::string, int> &);
        void compile_glsl_stage(unsigned);
        void add_spirv_stages(const SpirVModule &, const std::map<std::string, int> &);