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 f2d7d07672643edb8c83dd4a214bd45a7594be4b..ecfe1a1991232e0d686c68363d7f1f9b5e8b847c 100644 (file)
--- a/source/core/program.h
+++ b/source/core/program.h
@@ -13,8 +13,6 @@
 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.
@@ -30,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:
@@ -130,12 +124,6 @@ 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>());
 
@@ -153,15 +141,6 @@ private:
        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();
@@ -175,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; }