Remove the specialized setters from UniformBlock

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

diff --git a/source/uniformblock.h b/source/uniformblock.h
index 815f49b1db20cc045bcd7adba81388c621e73c73..3a1cdb959d06e77106024aa1f264f648836664bb 100644 (file)
--- a/source/uniformblock.h
+++ b/source/uniformblock.h
@@ -15,31 +15,14 @@ class Vector4;
 class UniformBlock
 {
 private:
-       std::map<int, Uniform *> uniforms;
+       std::map<int, const Uniform *> uniforms;
 
        UniformBlock(const UniformBlock &);
        UniformBlock &operator=(const UniformBlock &);
 public:
        UniformBlock() { }
-       ~UniformBlock();
 
-private:
-       void uniform(int, Uniform *);
-public:
-       void uniform(int, const Uniform &);
-       void uniform(int, int);
-       void uniform(int, float);
-       void uniform(int, float, float);
-       void uniform2(int, const float *);
-       void uniform(int, float, float, float);
-       void uniform(int, const Vector3 &);
-       void uniform3(int, const float *);
-       void uniform(int, float, float, float, float);
-       void uniform(int, const Vector4 &);
-       void uniform(int, const Color &);
-       void uniform4(int, const float *);
-       void uniform_matrix4(int, const float *);
-       void uniform_matrix4(int, const Matrix &);
+       void attach(int, const Uniform &);
 
        void apply(int) const;
 };