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 b7f46ee4082a74a17ff68aa24328b6c5c01cf9f5..fd1c1ae09d10e12943ca13140339b96d59cd5ecf 100644 (file)
--- a/source/core/program.h
+++ b/source/core/program.h
@@ -1,13 +1,13 @@
 #ifndef MSP_GL_PROGRAM_H_
 #define MSP_GL_PROGRAM_H_
 
+#include <map>
 #include <string>
 #include <vector>
 #include <msp/datafile/objectloader.h>
-#include "gl.h"
 #include "module.h"
+#include "program_backend.h"
 #include "reflectdata.h"
-#include "vertexformat.h"
 
 namespace Msp {
 namespace GL {
@@ -16,9 +16,9 @@ namespace GL {
 A complete shader program.  Programs can be assembled of individual Shaders or
 generated with a set of standard features.
 */
-class Program
+class Program: public ProgramBackend
 {
-       friend class PipelineState;
+       friend ProgramBackend;
 
 public:
        class Loader: public DataFile::CollectionObjectLoader<Program>
@@ -27,8 +27,6 @@ public:
                Loader(Program &, Collection &);
 
        private:
-               virtual void finish();
-
                void module(const std::string &);
        };
 
@@ -50,62 +48,22 @@ private:
                void specialize_int(const std::string &, int);
        };
 
-       enum Stage
-       {
-               VERTEX,
-               GEOMETRY,
-               FRAGMENT,
-               MAX_STAGES
-       };
-
-       struct TransientData
-       {
-               std::map<std::string, unsigned> textures;
-               std::map<std::string, unsigned> blocks;
-               std::map<unsigned, int> spec_values;
-       };
-
-       unsigned id;
-       unsigned stage_ids[MAX_STAGES];
-       const Module *module;
-       TransientData *transient;
-       bool linked;
        ReflectData reflect_data;
-       std::string debug_name;
 
 public:
        /// Constructs an empty Program with no shader stages attached.
-       Program();
+       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>());
 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 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:
-       void link();
-private:
-       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();
-
-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;
@@ -119,9 +77,7 @@ public:
        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 &);
-private:
-       void set_stage_debug_name(unsigned, Stage);
+       using ProgramBackend::set_debug_name;
 };
 
 } // namespace GL