Restructure Program to remove linking from the public interface

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

diff --git a/source/core/program.h b/source/core/program.h
index b7f46ee4082a74a17ff68aa24328b6c5c01cf9f5..6301edbe2c6e23ded094519e38f30db842ebbb55 100644 (file)
--- a/source/core/program.h
+++ b/source/core/program.h
@@ -27,8 +27,6 @@ public:
                Loader(Program &, Collection &);
 
        private:
-               virtual void finish();
-
                void module(const std::string &);
        };
 
@@ -67,8 +65,6 @@ private:
 
        unsigned id;
        unsigned stage_ids[MAX_STAGES];
-       const Module *module;
-       TransientData *transient;
        bool linked;
        ReflectData reflect_data;
        std::string debug_name;
@@ -89,23 +85,19 @@ public:
 private:
        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> &);
+       void add_glsl_stages(const GlslModule &, const std::map<std::string, int> &, TransientData &);
+       void compile_glsl_stage(const GlslModule &, unsigned);
+       void add_spirv_stages(const SpirVModule &, const std::map<std::string, int> &, TransientData &);
 
-public:
-       void link();
-private:
+       void finalize(const Module &, const TransientData &);
        void query_uniforms();
        void query_uniform_blocks(const std::vector<ReflectData::UniformInfo *> &);
        void query_attributes();
-       void collect_uniforms();
-       void collect_block_uniforms(const SpirVModule::Structure &, const std::string &, unsigned, std::vector<std::string> &);
-       void collect_attributes();
+       void collect_uniforms(const SpirVModule &, const std::map<unsigned, int> &);
+       void collect_block_uniforms(const SpirVModule::Structure &, const std::string &, unsigned, const std::map<unsigned, int> &, std::vector<std::string> &);
+       void collect_attributes(const SpirVModule &);
 
 public:
-       bool is_linked() const { return linked; }
-
        ReflectData::LayoutHash get_uniform_layout_hash() const { return reflect_data.layout_hash; }
        const std::vector<ReflectData::UniformBlockInfo> &get_uniform_blocks() const { return reflect_data.uniform_blocks; }
        const ReflectData::UniformBlockInfo &get_uniform_block_info(const std::string &) const;