X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;ds=sidebyside;f=source%2Fcore%2Fprogram.cpp;h=dd22033e7e4369df1fa7818dbc59f70f29436bb1;hb=7c069241318b7133ac2df65ee13cb1d2968c5974;hp=dd155d5c5c9ed4c3296591bd1ea645b7018e46b8;hpb=f157c4fa40d3f771f00fcb20ba128a37d61c6970;p=libs%2Fgl.git

diff --git a/source/core/program.cpp b/source/core/program.cpp
index dd155d5c..dd22033e 100644
--- a/source/core/program.cpp
+++ b/source/core/program.cpp
@@ -275,7 +275,7 @@ void Program::query_uniforms()
 			UniformInfo &info = uniforms[name];
 			info.block = 0;
 			info.name = name;
-			info.size = size;
+			info.array_size = size;
 			info.array_stride = 0;
 			info.matrix_stride = 0;
 			info.type = from_gl_type(type);
@@ -343,7 +343,7 @@ void Program::query_uniform_blocks(const vector<UniformInfo *> &uniforms_by_inde
 
 		indices2.clear();
 		for(vector<int>::iterator j=indices.begin(); j!=indices.end(); ++j)
-			if(uniforms_by_index[*j]->size>1)
+			if(uniforms_by_index[*j]->array_size>1)
 				indices2.push_back(*j);
 		if(!indices2.empty())
 		{
@@ -395,7 +395,7 @@ void Program::query_attributes()
 			AttributeInfo &info = attributes[name];
 			info.name = name;
 			info.location = glGetAttribLocation(id, name);
-			info.size = size;
+			info.array_size = size;
 			info.type = from_gl_type(type);
 		}
 	}
@@ -405,7 +405,7 @@ Program::LayoutHash Program::compute_layout_hash(const vector<const UniformInfo
 {
 	string layout_descriptor;
 	for(vector<const UniformInfo *>::const_iterator i = uniforms.begin(); i!=uniforms.end(); ++i)
-		layout_descriptor += format("%d:%s:%x:%d\n", (*i)->location, (*i)->name, (*i)->type, (*i)->size);
+		layout_descriptor += format("%d:%s:%x:%d\n", (*i)->location, (*i)->name, (*i)->type, (*i)->array_size);
 	return hash32(layout_descriptor);
 }