Use default member initializers for simple types

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

diff --git a/source/core/program.h b/source/core/program.h
index f318c60639012ea66f9da3c43139003cae519202..fd1c1ae09d10e12943ca13140339b96d59cd5ecf 100644 (file)
--- a/source/core/program.h
+++ b/source/core/program.h
@@ -1,25 +1,25 @@
 #ifndef MSP_GL_PROGRAM_H_
 #define MSP_GL_PROGRAM_H_
 
+#include <map>
 #include <string>
 #include <vector>
 #include <msp/datafile/objectloader.h>
-#include "bindable.h"
-#include "gl.h"
-#include "vertexformat.h"
+#include "module.h"
+#include "program_backend.h"
+#include "reflectdata.h"
 
 namespace Msp {
 namespace GL {
 
-class Module;
-class Shader;
-
 /**
 A complete shader program.  Programs can be assembled of individual Shaders or
 generated with a set of standard features.
 */
-class Program: public Bindable<Program>
+class Program: public ProgramBackend
 {
+       friend ProgramBackend;
+
 public:
        class Loader: public DataFile::CollectionObjectLoader<Program>
        {
@@ -27,13 +27,7 @@ public:
                Loader(Program &, Collection &);
 
        private:
-               virtual void finish();
-
-               void attribute(unsigned, const std::string &);
-               void fragment_shader(const std::string &);
-               void geometry_shader(const std::string &);
                void module(const std::string &);
-               void vertex_shader(const std::string &);
        };
 
 private:
@@ -54,105 +48,36 @@ private:
                void specialize_int(const std::string &, int);
        };
 
-public:
-       typedef unsigned LayoutHash;
-       struct UniformBlockInfo;
-
-       struct UniformInfo
-       {
-               std::string name;
-               const UniformBlockInfo *block;
-               unsigned location;
-               unsigned size;
-               unsigned array_stride;
-               unsigned matrix_stride;
-               GLenum type;
-       };
-
-       struct UniformBlockInfo
-       {
-               std::string name;
-               unsigned data_size;
-               int bind_point;
-               std::vector<const UniformInfo *> uniforms;
-               LayoutHash layout_hash;
-       };
-
-       struct AttributeInfo
-       {
-               std::string name;
-               unsigned location;
-               unsigned size;
-               GLenum type;
-       };
-
-       typedef std::map<std::string, UniformInfo> UniformMap;
-       typedef std::map<std::string, UniformBlockInfo> UniformBlockMap;
-       typedef std::map<std::string, AttributeInfo> AttributeMap;
-
-private:
-       unsigned id;
-       std::vector<unsigned> shader_ids;
-       const Module *module;
-       bool linked;
-       UniformBlockMap uniform_blocks;
-       UniformMap uniforms;
-       LayoutHash uniform_layout_hash;
-       AttributeMap attributes;
+       ReflectData reflect_data;
 
 public:
        /// Constructs an empty Program with no shader stages attached.
-       Program();
-
-       /// Constructs a Program from unified source code using ProgramCompiler.
-       DEPRECATED Program(const std::string &);
-
-       /// Constructs a Program from vertex and fragment shader source code.
-       DEPRECATED Program(const std::string &, const std::string &);
+       Program() = default;
 
        /// Constructs a Program from a Module, with specialization constants.
        Program(const Module &, const std::map<std::string, int> & = std::map<std::string, int>());
 
-private:
-       void init();
-public:
-       virtual ~Program();
-
        void add_stages(const Module &, const std::map<std::string, int> & = std::map<std::string, int>());
-
-       DEPRECATED void attach_shader(Shader &shader);
-       DEPRECATED void attach_shader_owned(Shader *shader);
-       DEPRECATED void detach_shader(Shader &shader);
-       DEPRECATED const std::vector<Shader *> &get_attached_shaders() const;
-
-       DEPRECATED void bind_attribute(unsigned, const std::string &);
-       DEPRECATED void bind_attribute(VertexAttribute, const std::string &);
-       DEPRECATED void bind_fragment_data(unsigned, const std::string &);
-
-       void link();
 private:
-       static void require_type(GLenum);
-       void query_uniforms();
-       void query_uniform_blocks(const std::vector<UniformInfo *> &);
-       void query_attributes();
-       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; }
-       DEPRECATED std::string get_info_log() const;
-
-       LayoutHash get_uniform_layout_hash() const { return uniform_layout_hash; }
-       const UniformBlockMap &get_uniform_blocks() const { return uniform_blocks; }
-       const UniformBlockInfo &get_uniform_block_info(const std::string &) const;
-       const UniformMap &get_uniforms() const { return uniforms; }
-       const UniformInfo &get_uniform_info(const std::string &) 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;
-       const AttributeMap &get_attributes() const { return attributes; }
-       const AttributeInfo &get_attribute_info(const std::string &) const;
+       int get_uniform_location(Tag) const;
+       int get_uniform_binding(Tag) 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 bind() const;
-       static void unbind();
+       using ProgramBackend::set_debug_name;
 };
 
 } // namespace GL