Remove the deprecated ProgramBuilder class

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

diff --git a/source/program.h b/source/program.h
index d2032a5cd46843e36def08c91f8a95d699025bd1..fc60db46fcc2265af0b1ad9282eec1b5b19f6dcb 100644 (file)
--- a/source/program.h
+++ b/source/program.h
@@ -6,7 +6,6 @@
 #include <msp/datafile/objectloader.h>
 #include "bindable.h"
 #include "gl.h"
-#include "programbuilder.h"
 #include "vertexformat.h"
 
 namespace Msp {
@@ -32,7 +31,6 @@ public:
                void attribute(unsigned, const std::string &);
                void fragment_shader(const std::string &);
                void geometry_shader(const std::string &);
-               void standard();
                void vertex_shader(const std::string &);
        };
 
@@ -81,15 +79,11 @@ private:
        UniformMap uniforms;
        LayoutHash uniform_layout_hash;
        AttributeMap attributes;
-       bool legacy_vars;
 
 public:
        /// Constructs an empty Program with no Shaders attached.
        Program();
 
-       /// Constructs a Program with standard features.
-       Program(const ProgramBuilder::StandardFeatures &);
-
        /// Constructs a Program from unified source code using ProgramCompiler.
        Program(const std::string &);
 
@@ -112,6 +106,7 @@ public:
 
        void link();
 private:
+       static void require_type(GLenum);
        void query_uniforms();
        void query_uniform_blocks(const std::vector<UniformInfo *> &);
        void query_attributes();
@@ -131,8 +126,6 @@ public:
        const AttributeInfo &get_attribute_info(const std::string &) const;
        int get_attribute_location(const std::string &) const;
 
-       bool uses_legacy_variables() const { return legacy_vars; }
-
        void bind() const;
        static void unbind();
 };