Rename some things in Program

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

diff --git a/source/core/program.h b/source/core/program.h
index f318c60639012ea66f9da3c43139003cae519202..48c18d0f56333371130710942a4dbdc9076e9f45 100644 (file)
--- a/source/core/program.h
+++ b/source/core/program.h
@@ -5,13 +5,14 @@
 #include <vector>
 #include <msp/datafile/objectloader.h>
 #include "bindable.h"
+#include "datatype.h"
 #include "gl.h"
+#include "module.h"
 #include "vertexformat.h"
 
 namespace Msp {
 namespace GL {
 
-class Module;
 class Shader;
 
 /**
@@ -62,11 +63,17 @@ public:
        {
                std::string name;
                const UniformBlockInfo *block;
-               unsigned location;
-               unsigned size;
+               union
+               {
+                       int location;
+                       unsigned offset;
+               };
+               unsigned array_size;
                unsigned array_stride;
                unsigned matrix_stride;
-               GLenum type;
+               DataType type;
+
+               UniformInfo();
        };
 
        struct UniformBlockInfo
@@ -76,14 +83,18 @@ public:
                int bind_point;
                std::vector<const UniformInfo *> uniforms;
                LayoutHash layout_hash;
+
+               UniformBlockInfo();
        };
 
        struct AttributeInfo
        {
                std::string name;
                unsigned location;
-               unsigned size;
-               GLenum type;
+               unsigned array_size;
+               DataType type;
+
+               AttributeInfo();
        };
 
        typedef std::map<std::string, UniformInfo> UniformMap;
@@ -92,7 +103,7 @@ public:
 
 private:
        unsigned id;
-       std::vector<unsigned> shader_ids;
+       std::vector<unsigned> stage_ids;
        const Module *module;
        bool linked;
        UniformBlockMap uniform_blocks;
@@ -119,7 +130,13 @@ public:
        virtual ~Program();
 
        void add_stages(const Module &, const std::map<std::string, int> & = std::map<std::string, int>());
+private:
+       unsigned add_stage(GLenum);
+       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> &);
 
+public:
        DEPRECATED void attach_shader(Shader &shader);
        DEPRECATED void attach_shader_owned(Shader *shader);
        DEPRECATED void detach_shader(Shader &shader);
@@ -131,10 +148,13 @@ public:
 
        void link();
 private:
-       static void require_type(GLenum);
        void query_uniforms();
        void query_uniform_blocks(const std::vector<UniformInfo *> &);
        void query_attributes();
+       void collect_uniforms();
+       void collect_block_uniforms(UniformBlockInfo &, const SpirVModule::Structure &, const std::string &, unsigned);
+       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: