X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Funiform.cpp;h=b183719fe339debaf55402b35cb2eeda15bb3d8a;hp=af49c047f71be82f5c635a66560a40d7f27d549d;hb=49f1812b3e5ad73748015df52d0e4dee17246036;hpb=f14435e58bfa0fa697a06ba9a454bb30cd37d9d8

diff --git a/source/uniform.cpp b/source/uniform.cpp
index af49c047..b183719f 100644
--- a/source/uniform.cpp
+++ b/source/uniform.cpp
@@ -1,107 +1,75 @@
-#include <algorithm>
-#include "arb_shader_objects.h"
+#include <msp/gl/extensions/arb_shader_objects.h>
 #include "uniform.h"
 
 namespace Msp {
 namespace GL {
 
-Uniform1i::Uniform1i(int v_):
-	v(v_)
-{ }
-
-void Uniform1i::apply(int index) const
-{
-	glUniform1iARB(index, v);
-}
-
-Uniform1i *Uniform1i::clone() const
-{
-	return new Uniform1i(v);
-}
-
-
-Uniform1f::Uniform1f(float v_):
-	v(v_)
-{ }
-
-void Uniform1f::apply(int index) const
-{
-	glUniform1fARB(index, v);
-}
-
-Uniform1f *Uniform1f::clone() const
-{
-	return new Uniform1f(v);
-}
-
-
-Uniform2f::Uniform2f(float v0, float v1)
+template<>
+void UniformScalar<int>::apply(int index, unsigned size, const int *value)
 {
-	v[0] = v0;
-	v[1] = v1;
+	glUniform1iv(index, size, value);
 }
 
-void Uniform2f::apply(int index) const
+template<>
+void UniformScalar<float>::apply(int index, unsigned size, const float *value)
 {
-	glUniform2fvARB(index, 1, v);
+	glUniform1fv(index, size, value);
 }
 
-Uniform2f *Uniform2f::clone() const
-{
-	return new Uniform2f(v[0], v[1]);
-}
 
-
-Uniform3f::Uniform3f(float v0, float v1, float v2)
+template<>
+void UniformVector<int, 2>::apply(int index, unsigned size, const int *value)
 {
-	v[0] = v0;
-	v[1] = v1;
-	v[2] = v2;
+	glUniform2iv(index, size, value);
 }
 
-void Uniform3f::apply(int index) const
+template<>
+void UniformVector<float, 2>::apply(int index, unsigned size, const float *value)
 {
-	glUniform3fvARB(index, 1, v);
+	glUniform2fv(index, size, value);
 }
 
-Uniform3f *Uniform3f::clone() const
+template<>
+void UniformVector<int, 3>::apply(int index, unsigned size, const int *value)
 {
-	return new Uniform3f(v[0], v[1], v[2]);
+	glUniform3iv(index, size, value);
 }
 
-
-Uniform4f::Uniform4f(float v0, float v1, float v2, float v3)
+template<>
+void UniformVector<float, 3>::apply(int index, unsigned size, const float *value)
 {
-	v[0] = v0;
-	v[1] = v1;
-	v[2] = v2;
-	v[3] = v3;
+	glUniform3fv(index, size, value);
 }
 
-void Uniform4f::apply(int index) const
+template<>
+void UniformVector<int, 4>::apply(int index, unsigned size, const int *value)
 {
-	glUniform4fvARB(index, 1, v);
+	glUniform4iv(index, size, value);
 }
 
-Uniform4f *Uniform4f::clone() const
+template<>
+void UniformVector<float, 4>::apply(int index, unsigned size, const float *value)
 {
-	return new Uniform4f(v[0], v[1], v[2], v[3]);
+	glUniform4fv(index, size, value);
 }
 
 
-UniformMatrix4x4f::UniformMatrix4x4f(const float *vp)
+template<>
+void UniformMatrix<float, 2, 2>::apply(int index, unsigned size, const float *value)
 {
-	std::copy(vp, vp+16, v);
+	glUniformMatrix2fv(index, size, false, value);
 }
 
-void UniformMatrix4x4f::apply(int index) const
+template<>
+void UniformMatrix<float, 3, 3>::apply(int index, unsigned size, const float *value)
 {
-	glUniformMatrix4fvARB(index, 1, false, v);
+	glUniformMatrix3fv(index, size, false, value);
 }
 
-UniformMatrix4x4f *UniformMatrix4x4f::clone() const
+template<>
+void UniformMatrix<float, 4, 4>::apply(int index, unsigned size, const float *value)
 {
-	return new UniformMatrix4x4f(v);
+	glUniformMatrix4fv(index, size, false, value);
 }
 
 } // namespace GL