Remove the deprecated ProgramBuilder class

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

diff --git a/source/programdata.h b/source/programdata.h
index bc2289b52965a4e29262c1754139bec7efdbd33c..e96a73acc651ba8ec9a1ab2b3af1cf77f337c4bc 100644 (file)
--- a/source/programdata.h
+++ b/source/programdata.h
@@ -2,6 +2,7 @@
 #define MSP_GL_PROGRAMDATA_H_
 
 #include <map>
+#include <stdexcept>
 #include <msp/datafile/objectloader.h>
 #include "datatype.h"
 #include "matrix.h"
@@ -11,6 +12,13 @@
 namespace Msp {
 namespace GL {
 
+class too_many_uniforms: public std::runtime_error
+{
+public:
+       too_many_uniforms(const std::string &w): std::runtime_error(w) { }
+       virtual ~too_many_uniforms() throw() { }
+};
+
 class Buffer;
 class Uniform;
 class UniformBlock;
@@ -161,6 +169,12 @@ public:
 
 private:
        void uniform(const std::string &, Uniform *);
+       template<typename T, typename V>
+       void uniform(const std::string &, V);
+       template<typename T, typename V>
+       void uniform_array(const std::string &, unsigned, V);
+       bool validate_name(const std::string &) const;
+       void add_uniform(const std::string &, Uniform *);
 public:
        void uniform(const std::string &, const Uniform &);
        void uniform(const std::string &, int);
@@ -219,6 +233,7 @@ public:
 
        std::vector<std::string> get_uniform_names() const;
        const Uniform &get_uniform(const std::string &) const;
+       const Uniform *find_uniform(const std::string &) const;
 
 private:
        static bool uniform_name_compare(const NamedUniform &, const std::string &);