X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fprogramdata.cpp;h=01927063377b693b72c9ede4cabdb050ecd91067;hb=3b159edbe4e80a2bc19c4c2fcd42cb996b9fbfe0;hp=d0de3c05565d182663e099f2fde904afa32ed4b8;hpb=9afdf8a0813de5c4d5277b0ccbfe86051af5624e;p=libs%2Fgl.git

diff --git a/source/programdata.cpp b/source/programdata.cpp
index d0de3c05..01927063 100644
--- a/source/programdata.cpp
+++ b/source/programdata.cpp
@@ -1,3 +1,4 @@
+#include <msp/gl/extensions/arb_direct_state_access.h>
 #include "buffer.h"
 #include "color.h"
 #include "error.h"
@@ -99,17 +100,34 @@ void ProgramData::uniform(const string &name, float v)
 	uniform(name, new Uniform1f(v));
 }
 
+void ProgramData::uniform(const string &name, int v0, int v1)
+{
+	int va[2] = { v0, v1 };
+	uniform2(name, va);
+}
+
 void ProgramData::uniform(const string &name, float v0, float v1)
 {
 	float va[2] = { v0, v1 };
 	uniform2(name, va);
 }
 
+void ProgramData::uniform2(const string &name, const int *v)
+{
+	uniform(name, new Uniform2i(v));
+}
+
 void ProgramData::uniform2(const string &name, const float *v)
 {
 	uniform(name, new Uniform2f(v));
 }
 
+void ProgramData::uniform(const string &name, int v0, int v1, int v2)
+{
+	int va[3] = { v0, v1, v2 };
+	uniform3(name, va);
+}
+
 void ProgramData::uniform(const string &name, float v0, float v1, float v2)
 {
 	float va[3] = { v0, v1, v2 };
@@ -121,11 +139,22 @@ void ProgramData::uniform(const string &name, const Vector3 &v)
 	uniform(name, v.x, v.y, v.z);
 }
 
+void ProgramData::uniform3(const string &name, const int *v)
+{
+	uniform(name, new Uniform3i(v));
+}
+
 void ProgramData::uniform3(const string &name, const float *v)
 {
 	uniform(name, new Uniform3f(v));
 }
 
+void ProgramData::uniform(const string &name, int v0, int v1, int v2, int v3)
+{
+	int va[4] = { v0, v1, v2, v3 };
+	uniform4(name, va);
+}
+
 void ProgramData::uniform(const string &name, float v0, float v1, float v2, float v3)
 {
 	float va[4] = { v0, v1, v2, v3 };
@@ -142,6 +171,11 @@ void ProgramData::uniform(const string &name, const Color &c)
 	uniform(name, c.r, c.g, c.b, c.a);
 }
 
+void ProgramData::uniform4(const string &name, const int *v)
+{
+	uniform(name, new Uniform4i(v));
+}
+
 void ProgramData::uniform4(const string &name, const float *v)
 {
 	uniform(name, new Uniform4f(v));
@@ -187,16 +221,31 @@ void ProgramData::uniform1_array(const string &name, unsigned n, const float *v)
 	uniform(name, new UniformArray<Uniform1f>(n, v));
 }
 
+void ProgramData::uniform2_array(const string &name, unsigned n, const int *v)
+{
+	uniform(name, new UniformArray<Uniform2i>(n, v));
+}
+
 void ProgramData::uniform2_array(const string &name, unsigned n, const float *v)
 {
 	uniform(name, new UniformArray<Uniform2f>(n, v));
 }
 
+void ProgramData::uniform3_array(const string &name, unsigned n, const int *v)
+{
+	uniform(name, new UniformArray<Uniform3i>(n, v));
+}
+
 void ProgramData::uniform3_array(const string &name, unsigned n, const float *v)
 {
 	uniform(name, new UniformArray<Uniform3f>(n, v));
 }
 
+void ProgramData::uniform4_array(const string &name, unsigned n, const int *v)
+{
+	uniform(name, new UniformArray<Uniform4i>(n, v));
+}
+
 void ProgramData::uniform4_array(const string &name, unsigned n, const float *v)
 {
 	uniform(name, new UniformArray<Uniform4f>(n, v));
@@ -327,7 +376,7 @@ void ProgramData::apply() const
 
 		/* If any blocks stored in the buffer were updated, bind the buffer here
 		to avoid state thrashing. */
-		if(buffered_blocks_updated)
+		if(buffered_blocks_updated && !ARB_direct_state_access)
 			buffer->bind();
 	}
 
@@ -370,10 +419,16 @@ ProgramData::Loader::Loader(ProgramData &pd):
 	add("uniform1i", &Loader::uniform1i);
 	add("uniform", &Loader::uniform1f);
 	add("uniform1f", &Loader::uniform1f);
+	add("uniform", &Loader::uniform2i);
+	add("uniform2i", &Loader::uniform2i);
 	add("uniform", &Loader::uniform2f);
 	add("uniform2f", &Loader::uniform2f);
+	add("uniform", &Loader::uniform3i);
+	add("uniform3i", &Loader::uniform3i);
 	add("uniform", &Loader::uniform3f);
 	add("uniform3f", &Loader::uniform3f);
+	add("uniform", &Loader::uniform4i);
+	add("uniform4i", &Loader::uniform4i);
 	add("uniform", &Loader::uniform4f);
 	add("uniform4f", &Loader::uniform4f);
 	add("uniform1i_array", &Loader::uniform1i_array);
@@ -394,16 +449,31 @@ void ProgramData::Loader::uniform1f(const string &n, float v)
 	obj.uniform(n, v);
 }
 
+void ProgramData::Loader::uniform2i(const string &n, int v0, int v1)
+{
+	obj.uniform(n, v0, v1);
+}
+
 void ProgramData::Loader::uniform2f(const string &n, float v0, float v1)
 {
 	obj.uniform(n, v0, v1);
 }
 
+void ProgramData::Loader::uniform3i(const string &n, int v0, int v1, int v2)
+{
+	obj.uniform(n, v0, v1, v2);
+}
+
 void ProgramData::Loader::uniform3f(const string &n, float v0, float v1, float v2)
 {
 	obj.uniform(n, v0, v1, v2);
 }
 
+void ProgramData::Loader::uniform4i(const string &n, int v0, int v1, int v2, int v3)
+{
+	obj.uniform(n, v0, v1, v2, v3);
+}
+
 void ProgramData::Loader::uniform4f(const string &n, float v0, float v1, float v2, float v3)
 {
 	obj.uniform(n, v0, v1, v2, v3);
@@ -424,6 +494,12 @@ void ProgramData::Loader::uniform_array_(const string &n, DataType t, unsigned e
 		const int *data = reinterpret_cast<const int *>(ldr.get_data());
 		if(elem_size==1)
 			obj.uniform1_array(n, size, data);
+		else if(elem_size==2)
+			obj.uniform2_array(n, size, data);
+		else if(elem_size==3)
+			obj.uniform3_array(n, size, data);
+		else if(elem_size==4)
+			obj.uniform4_array(n, size, data);
 		else
 			throw logic_error("unsupported combination of array type and element size");
 	}
@@ -455,16 +531,31 @@ void ProgramData::Loader::uniform1f_array(const string &n)
 	uniform_array_(n, FLOAT, 1);
 }
 
+void ProgramData::Loader::uniform2i_array(const string &n)
+{
+	uniform_array_(n, INT, 2);
+}
+
 void ProgramData::Loader::uniform2f_array(const string &n)
 {
 	uniform_array_(n, FLOAT, 2);
 }
 
+void ProgramData::Loader::uniform3i_array(const string &n)
+{
+	uniform_array_(n, INT, 3);
+}
+
 void ProgramData::Loader::uniform3f_array(const string &n)
 {
 	uniform_array_(n, FLOAT, 3);
 }
 
+void ProgramData::Loader::uniform4i_array(const string &n)
+{
+	uniform_array_(n, INT, 4);
+}
+
 void ProgramData::Loader::uniform4f_array(const string &n)
 {
 	uniform_array_(n, FLOAT, 4);
@@ -517,18 +608,36 @@ void ProgramData::ArrayLoader::uniform1f(float v)
 	uniform(FLOAT, 1, &v);
 }
 
+void ProgramData::ArrayLoader::uniform2i(int v0, int v1)
+{
+	int va[2] = { v0, v1 };
+	uniform(INT, 2, va);
+}
+
 void ProgramData::ArrayLoader::uniform2f(float v0, float v1)
 {
 	float va[2] = { v0, v1 };
 	uniform(FLOAT, 2, va);
 }
 
+void ProgramData::ArrayLoader::uniform3i(int v0, int v1, int v2)
+{
+	int va[3] = { v0, v1, v2 };
+	uniform(INT, 3, va);
+}
+
 void ProgramData::ArrayLoader::uniform3f(float v0, float v1, float v2)
 {
 	float va[3] = { v0, v1, v2 };
 	uniform(FLOAT, 3, va);
 }
 
+void ProgramData::ArrayLoader::uniform4i(int v0, int v1, int v2, int v3)
+{
+	int va[4] = { v0, v1, v2, v3 };
+	uniform(INT, 4, va);
+}
+
 void ProgramData::ArrayLoader::uniform4f(float v0, float v1, float v2, float v3)
 {
 	float va[4] = { v0, v1, v2, v3 };