Keep track of which components have been set in Transform

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

diff --git a/source/uniform.cpp b/source/uniform.cpp
index 688052ff16d0ae3b8fdebc5fafe99e1025c118d9..b183719fe339debaf55402b35cb2eeda15bb3d8a 100644 (file)
--- a/source/uniform.cpp
+++ b/source/uniform.cpp
@@ -1,45 +1,75 @@
-#include "arb_shader_objects.h"
+#include <msp/gl/extensions/arb_shader_objects.h>
 #include "uniform.h"
 
 namespace Msp {
 namespace GL {
 
 template<>
-void UniformScalar<int>::apply(int index) const
+void UniformScalar<int>::apply(int index, unsigned size, const int *value)
 {
-       glUniform1iARB(index, value);
+       glUniform1iv(index, size, value);
 }
 
 template<>
-void UniformScalar<float>::apply(int index) const
+void UniformScalar<float>::apply(int index, unsigned size, const float *value)
 {
-       glUniform1fARB(index, value);
+       glUniform1fv(index, size, value);
 }
 
 
 template<>
-void UniformVector<float, 2>::apply(int index) const
+void UniformVector<int, 2>::apply(int index, unsigned size, const int *value)
 {
-       glUniform2fvARB(index, 1, value);
+       glUniform2iv(index, size, value);
 }
 
 template<>
-void UniformVector<float, 3>::apply(int index) const
+void UniformVector<float, 2>::apply(int index, unsigned size, const float *value)
 {
-       glUniform3fvARB(index, 1, value);
+       glUniform2fv(index, size, value);
 }
 
 template<>
-void UniformVector<float, 4>::apply(int index) const
+void UniformVector<int, 3>::apply(int index, unsigned size, const int *value)
 {
-       glUniform4fvARB(index, 1, value);
+       glUniform3iv(index, size, value);
 }
 
+template<>
+void UniformVector<float, 3>::apply(int index, unsigned size, const float *value)
+{
+       glUniform3fv(index, size, value);
+}
+
+template<>
+void UniformVector<int, 4>::apply(int index, unsigned size, const int *value)
+{
+       glUniform4iv(index, size, value);
+}
+
+template<>
+void UniformVector<float, 4>::apply(int index, unsigned size, const float *value)
+{
+       glUniform4fv(index, size, value);
+}
+
+
+template<>
+void UniformMatrix<float, 2, 2>::apply(int index, unsigned size, const float *value)
+{
+       glUniformMatrix2fv(index, size, false, value);
+}
+
+template<>
+void UniformMatrix<float, 3, 3>::apply(int index, unsigned size, const float *value)
+{
+       glUniformMatrix3fv(index, size, false, value);
+}
 
 template<>
-void UniformMatrix<float, 4, 4>::apply(int index) const
+void UniformMatrix<float, 4, 4>::apply(int index, unsigned size, const float *value)
 {
-       glUniformMatrix4fvARB(index, 1, false, value);
+       glUniformMatrix4fv(index, size, false, value);
 }
 
 } // namespace GL