+ obj.uniform(n, v0, v1, v2, v3);
+}
+
+void ProgramData::Loader::uniform_array_(const string &n, DataType t, unsigned e)
+{
+ ArrayLoader ldr(t, e);
+ load_sub_with(ldr);
+ unsigned size = ldr.get_size();
+ if(!size)
+ throw logic_error("empty uniform array");
+
+ DataType type = ldr.get_data_type();
+ unsigned elem_size = ldr.get_element_size();
+ if(type==INT)
+ {
+ 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");
+ }
+ else if(type==FLOAT)
+ {
+ const float *data = reinterpret_cast<const float *>(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");
+ }
+ else
+ throw logic_error("unsupported array type");
+}
+
+void ProgramData::Loader::uniform1i_array(const string &n)
+{
+ uniform_array_(n, INT, 1);
+}
+
+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);
+}
+
+void ProgramData::Loader::uniform_array(const string &n)
+{
+ uniform_array_(n, static_cast<DataType>(0), 0);
+}
+
+
+ProgramData::ArrayLoader::ArrayLoader(DataType t, unsigned e):
+ type(t),
+ element_size(e)
+{
+ add("uniform", &ArrayLoader::uniform1i);
+ add("uniform1i", &ArrayLoader::uniform1i);
+ add("uniform", &ArrayLoader::uniform1f);
+ add("uniform1f", &ArrayLoader::uniform1f);
+ add("uniform", &ArrayLoader::uniform2f);
+ add("uniform2f", &ArrayLoader::uniform2f);
+ add("uniform", &ArrayLoader::uniform3f);
+ add("uniform3f", &ArrayLoader::uniform3f);
+ add("uniform", &ArrayLoader::uniform4f);
+ add("uniform4f", &ArrayLoader::uniform4f);
+}
+
+void ProgramData::ArrayLoader::uniform(DataType t, unsigned e, const void *v)
+{
+ if(element_size && (t!=type || e!=element_size))
+ throw logic_error("heterogeneous array contents");
+
+ if(!element_size)
+ {
+ type = t;
+ element_size = e;
+ }
+
+ const char *cv = reinterpret_cast<const char *>(v);
+ data.insert(data.end(), cv, cv+element_size*4);
+}
+
+void ProgramData::ArrayLoader::uniform1i(int v)
+{
+ uniform(INT, 1, &v);
+}
+
+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 };
+ uniform(FLOAT, 4, va);