Split reflection data from Program to a separate struct

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

diff --git a/source/core/program.h b/source/core/program.h
index 1ca146f1e998c0fd0d05221a4dab0b66a6da31e6..b7f46ee4082a74a17ff68aa24328b6c5c01cf9f5 100644 (file)
--- a/source/core/program.h
+++ b/source/core/program.h
@@ -4,10 +4,9 @@
 #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 {
@@ -51,51 +50,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,
@@ -116,10 +70,7 @@ private:
        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::string debug_name;
 
 public:
@@ -146,28 +97,26 @@ public:
        void link();
 private:
        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 *);
+
 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;
 
        void set_debug_name(const std::string &);