Remove the deprecated ProgramBuilder class

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

diff --git a/source/program.h b/source/program.h
index 734d665b3d5e21c5ec6e1efe8a7106980c5da003..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 &);
        };
 
@@ -86,9 +84,6 @@ 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 &);
 
@@ -111,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();