Remove remaining deprecated things from the core classes

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

diff --git a/source/core/program.h b/source/core/program.h
index 377c3eee0f1fcfa3349af8efd4754a0aaa43b042..ecfe1a1991232e0d686c68363d7f1f9b5e8b847c 100644 (file)
--- a/source/core/program.h
+++ b/source/core/program.h
@@ -4,7 +4,6 @@
 #include <string>
 #include <vector>
 #include <msp/datafile/objectloader.h>
-#include "bindable.h"
 #include "datatype.h"
 #include "gl.h"
 #include "module.h"
@@ -14,13 +13,11 @@
 namespace Msp {
 namespace GL {
 
-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:
        class Loader: public DataFile::CollectionObjectLoader<Program>
@@ -31,11 +28,7 @@ public:
        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:
@@ -74,6 +67,7 @@ public:
                unsigned matrix_stride;
                DataType type;
                Tag tag;
+               int binding;
 
                UniformInfo();
        };
@@ -100,32 +94,36 @@ public:
        };
 
 private:
-       struct Bindings
+       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;
-       std::vector<unsigned> stage_ids;
+       unsigned stage_ids[MAX_STAGES];
        const Module *module;
-       Bindings *bindings;
+       TransientData *transient;
        bool linked;
        std::vector<UniformBlockInfo> uniform_blocks;
        std::vector<UniformInfo> uniforms;
        LayoutHash uniform_layout_hash;
        std::vector<AttributeInfo> attributes;
+       std::string debug_name;
 
 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 &);
-
        /// Constructs a Program from a Module, with specialization constants.
        Program(const Module &, const std::map<std::string, int> & = std::map<std::string, int>());
 
@@ -136,21 +134,13 @@ public:
 
        void add_stages(const Module &, const std::map<std::string, int> & = std::map<std::string, int>());
 private:
-       unsigned add_stage(GLenum);
+       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> &);
 
 public:
-       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:
        void query_uniforms();
@@ -164,7 +154,6 @@ private:
        static bool uniform_location_compare(const UniformInfo *, const UniformInfo *);
 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 std::vector<UniformBlockInfo> &get_uniform_blocks() const { return uniform_blocks; }
@@ -174,12 +163,16 @@ public:
        const 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;
        int get_attribute_location(const std::string &) const;
 
-       void bind() const;
-       static void unbind();
+       unsigned get_id() const { return id; }
+
+       void set_debug_name(const std::string &);
+private:
+       void set_stage_debug_name(unsigned, Stage);
 };
 
 } // namespace GL