Allow copying of Uniforms and ProgramData

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

diff --git a/source/uniform.h b/source/uniform.h
index 33b80e938287b5ea70017b1a67b0e5b1609ce34d..ac73e99db01347c6de3edcdabf048d9e3916bc47 100644 (file)
--- a/source/uniform.h
+++ b/source/uniform.h
@@ -17,8 +17,14 @@ class Uniform
 {
 protected:
        Uniform() { }
+private:
+       Uniform(const Uniform &);
+       Uniform &operator=(const Uniform &);
 public:
+       virtual ~Uniform() { }
+
        virtual void apply(int) const =0;
+       virtual Uniform *clone() const =0;
 };
 
 
@@ -29,7 +35,9 @@ private:
 
 public:
        Uniform1i(int v_);
+
        virtual void apply(int index) const;
+       virtual Uniform1i *clone() const;
 };
 
 
@@ -40,7 +48,9 @@ private:
 
 public:
        Uniform1f(float v_);
+
        virtual void apply(int index) const;
+       virtual Uniform1f *clone() const;
 };
 
 
@@ -51,7 +61,9 @@ private:
 
 public:
        Uniform2f(float v0, float v1);
+
        virtual void apply(int index) const;
+       virtual Uniform2f *clone() const;
 };
 
 
@@ -62,7 +74,9 @@ private:
 
 public:
        Uniform3f(float v0, float v1, float v2);
+
        virtual void apply(int index) const;
+       virtual Uniform3f *clone() const;
 };
 
 
@@ -73,7 +87,9 @@ private:
 
 public:
        Uniform4f(float v0, float v1, float v2, float v3);
+
        virtual void apply(int index) const;
+       virtual Uniform4f *clone() const;
 };
 
 } // namespace GL