X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Fcore%2Funiform.h;h=8cdcdfda5aefea0a255533b189294e8496f7f745;hp=e12f65216c82b0bf572930c7cc33e4626d4a40ea;hb=8366f8951984aa436938b1bb18a57067ff2260c1;hpb=1a3eb3759708f41f0d57a271f2953e4de0506858

diff --git a/source/core/uniform.h b/source/core/uniform.h
index e12f6521..8cdcdfda 100644
--- a/source/core/uniform.h
+++ b/source/core/uniform.h
@@ -17,7 +17,6 @@ private:
 public:
 	virtual ~Uniform() { }
 
-	virtual void apply(int) const = 0;
 	virtual void store(const ReflectData::UniformInfo &, void *) const = 0;
 	virtual Uniform *clone() const = 0;
 };
@@ -40,11 +39,6 @@ public:
 
 	Type get() const { return value; }
 
-	virtual void apply(int index) const
-	{ apply(index, 1, &value); }
-
-	static void apply(int, unsigned, const T *);
-
 	virtual void store(const ReflectData::UniformInfo &info, void *buffer) const
 	{ store(info, buffer, &value); }
 
@@ -77,11 +71,6 @@ public:
 
 	BaseType get(unsigned i) const { return value[i]; }
 
-	virtual void apply(int index) const
-	{ apply(index, 1, value); }
-
-	static void apply(int index, unsigned size, const T *value);
-
 	virtual void store(const ReflectData::UniformInfo &info, void *buffer) const
 	{ store(info, buffer, value); }
 
@@ -116,11 +105,6 @@ public:
 	void set(const T *vp)
 	{ std::copy(vp, vp+rows*cols, value); }
 
-	virtual void apply(int index) const
-	{ apply(index, 1, value); }
-
-	static void apply(int index, unsigned size, const T *value);
-
 	virtual void store(const ReflectData::UniformInfo &info, void *buffer) const
 	{ store(info, buffer, value); }
 
@@ -174,9 +158,6 @@ public:
 	void set(const BaseType *vp)
 	{ std::copy(vp, vp+elemsize*size_, values); }
 
-	virtual void apply(int index) const
-	{ T::apply(index, size_, values); }
-
 	virtual void store(const ReflectData::UniformInfo &info, void *buffer) const
 	{
 		for(unsigned i=0; i<size_; ++i)