Completely hide OpenGL from the public headers

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

diff --git a/source/core/program.h b/source/core/program.h
index ecfe1a1991232e0d686c68363d7f1f9b5e8b847c..fb7fdddef91c735cd50cf3375923b8613d417635 100644 (file)
--- a/source/core/program.h
+++ b/source/core/program.h
@@ -4,10 +4,8 @@
 #include <string>
 #include <vector>
 #include <msp/datafile/objectloader.h>
-#include "datatype.h"
-#include "gl.h"
 #include "module.h"
-#include "tag.h"
+#include "reflectdata.h"
 #include "vertexformat.h"
 
 namespace Msp {
@@ -19,6 +17,8 @@ generated with a set of standard features.
 */
 class Program
 {
+       friend class PipelineState;
+
 public:
        class Loader: public DataFile::CollectionObjectLoader<Program>
        {
@@ -26,8 +26,6 @@ public:
                Loader(Program &, Collection &);
 
        private:
-               virtual void finish();
-
                void module(const std::string &);
        };
 
@@ -49,51 +47,6 @@ private:
                void specialize_int(const std::string &, int);
        };
 
-public:
-       typedef unsigned LayoutHash;
-       struct UniformBlockInfo;
-
-       struct UniformInfo
-       {
-               std::string name;
-               const UniformBlockInfo *block;
-               union
-               {
-                       int location;
-                       unsigned offset;
-               };
-               unsigned array_size;
-               unsigned array_stride;
-               unsigned matrix_stride;
-               DataType type;
-               Tag tag;
-               int binding;
-
-               UniformInfo();
-       };
-
-       struct UniformBlockInfo
-       {
-               std::string name;
-               unsigned data_size;
-               int bind_point;
-               std::vector<const UniformInfo *> uniforms;
-               LayoutHash layout_hash;
-
-               UniformBlockInfo();
-       };
-
-       struct AttributeInfo
-       {
-               std::string name;
-               unsigned location;
-               unsigned array_size;
-               DataType type;
-
-               AttributeInfo();
-       };
-
-private:
        enum Stage
        {
                VERTEX,
@@ -109,15 +62,22 @@ private:
                std::map<unsigned, int> spec_values;
        };
 
+       struct UniformCall
+       {
+               using FuncPtr = void (*)(unsigned, unsigned, const void *);
+
+               unsigned location;
+               unsigned size;
+               FuncPtr func;
+
+               UniformCall(unsigned l, unsigned s, FuncPtr f): location(l), size(s), func(f) { }
+       };
+
        unsigned id;
        unsigned stage_ids[MAX_STAGES];
-       const Module *module;
-       TransientData *transient;
        bool linked;
-       std::vector<UniformBlockInfo> uniform_blocks;
-       std::vector<UniformInfo> uniforms;
-       LayoutHash uniform_layout_hash;
-       std::vector<AttributeInfo> attributes;
+       ReflectData reflect_data;
+       std::vector<UniformCall> uniform_calls;
        std::string debug_name;
 
 public:
@@ -136,40 +96,32 @@ 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<UniformInfo *> &);
+       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 update_layout_hash();
-       static LayoutHash compute_layout_hash(const std::vector<const UniformInfo *> &);
-       static bool uniform_location_compare(const UniformInfo *, const UniformInfo *);
+       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; }
-
-       LayoutHash get_uniform_layout_hash() const { return uniform_layout_hash; }
-       const std::vector<UniformBlockInfo> &get_uniform_blocks() const { return uniform_blocks; }
-       const UniformBlockInfo &get_uniform_block_info(const std::string &) const;
-       const std::vector<UniformInfo> &get_uniforms() const { return uniforms; }
-       const UniformInfo &get_uniform_info(const std::string &) const;
-       const UniformInfo &get_uniform_info(Tag) const;
+       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;
+       const std::vector<ReflectData::UniformInfo> &get_uniforms() const { return reflect_data.uniforms; }
+       const ReflectData::UniformInfo &get_uniform_info(const std::string &) const;
+       const ReflectData::UniformInfo &get_uniform_info(Tag) const;
        int get_uniform_location(const std::string &) const;
        int get_uniform_location(Tag) const;
        int get_uniform_binding(Tag) const;
-       const std::vector<AttributeInfo> &get_attributes() const { return attributes; }
-       const AttributeInfo &get_attribute_info(const std::string &) const;
+       const std::vector<ReflectData::AttributeInfo> &get_attributes() const { return reflect_data.attributes; }
+       const ReflectData::AttributeInfo &get_attribute_info(const std::string &) const;
        int get_attribute_location(const std::string &) const;
 
-       unsigned get_id() const { return id; }
-
        void set_debug_name(const std::string &);
 private:
        void set_stage_debug_name(unsigned, Stage);