X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Funiform.cpp;h=b183719fe339debaf55402b35cb2eeda15bb3d8a;hp=ac866cf5ddcdd9befbe6766750e0105149d3b756;hb=8bc776f177c7cf9d0c6fd9590273f086d38c23ca;hpb=0070eec93efbf27bcc70720141d8730b059eb964

diff --git a/source/uniform.cpp b/source/uniform.cpp
index ac866cf5..b183719f 100644
--- a/source/uniform.cpp
+++ b/source/uniform.cpp
@@ -1,4 +1,4 @@
-#include "arb_shader_objects.h"
+#include <msp/gl/extensions/arb_shader_objects.h>
 #include "uniform.h"
 
 namespace Msp {
@@ -7,39 +7,69 @@ namespace GL {
 template<>
 void UniformScalar<int>::apply(int index, unsigned size, const int *value)
 {
-	glUniform1ivARB(index, size, value);
+	glUniform1iv(index, size, value);
 }
 
 template<>
 void UniformScalar<float>::apply(int index, unsigned size, const float *value)
 {
-	glUniform1fvARB(index, size, value);
+	glUniform1fv(index, size, value);
 }
 
 
+template<>
+void UniformVector<int, 2>::apply(int index, unsigned size, const int *value)
+{
+	glUniform2iv(index, size, value);
+}
+
 template<>
 void UniformVector<float, 2>::apply(int index, unsigned size, const float *value)
 {
-	glUniform2fvARB(index, size, value);
+	glUniform2fv(index, size, value);
+}
+
+template<>
+void UniformVector<int, 3>::apply(int index, unsigned size, const int *value)
+{
+	glUniform3iv(index, size, value);
 }
 
 template<>
 void UniformVector<float, 3>::apply(int index, unsigned size, const float *value)
 {
-	glUniform3fvARB(index, size, 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)
 {
-	glUniform4fvARB(index, size, 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, unsigned size, const float *value)
 {
-	glUniformMatrix4fvARB(index, size, false, value);
+	glUniformMatrix4fv(index, size, false, value);
 }
 
 } // namespace GL