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

diff --git a/source/core/program.cpp b/source/core/program.cpp
index c41976ed..dd22033e 100644
--- a/source/core/program.cpp
+++ b/source/core/program.cpp
@@ -254,21 +254,6 @@ void Program::link()
 		require_type(i->second.type);
 }
 
-void Program::require_type(GLenum t)
-{
-	switch(t)
-	{
-	case GL_FLOAT_MAT2x3:
-	case GL_FLOAT_MAT2x4:
-	case GL_FLOAT_MAT3x2:
-	case GL_FLOAT_MAT3x4:
-	case GL_FLOAT_MAT4x2:
-	case GL_FLOAT_MAT4x3:
-		{ static Require _req(NV_non_square_matrices); }
-		break;
-	}
-}
-
 void Program::query_uniforms()
 {
 	unsigned count = get_program_i(id, GL_ACTIVE_UNIFORMS);
@@ -290,10 +275,10 @@ 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 = type;
+			info.type = from_gl_type(type);
 			uniforms_by_index[i] = &info;
 		}
 	}
@@ -358,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())
 		{
@@ -370,10 +355,8 @@ void Program::query_uniform_blocks(const vector<UniformInfo *> &uniforms_by_inde
 		indices2.clear();
 		for(vector<int>::iterator j=indices.begin(); j!=indices.end(); ++j)
 		{
-			GLenum t = uniforms_by_index[*j]->type;
-			if(t==GL_FLOAT_MAT4 || t==GL_FLOAT_MAT3 || t==GL_FLOAT_MAT2 ||
-				t==GL_FLOAT_MAT2x3 || t==GL_FLOAT_MAT2x4 || t==GL_FLOAT_MAT3x2 ||
-				t==GL_FLOAT_MAT3x4 || t==GL_FLOAT_MAT4x2 || t==GL_FLOAT_MAT4x3)
+			DataType t = uniforms_by_index[*j]->type;
+			if(is_matrix(t))
 				indices2.push_back(*j);
 		}
 		if(!indices2.empty())
@@ -412,8 +395,8 @@ void Program::query_attributes()
 			AttributeInfo &info = attributes[name];
 			info.name = name;
 			info.location = glGetAttribLocation(id, name);
-			info.size = size;
-			info.type = type;
+			info.array_size = size;
+			info.type = from_gl_type(type);
 		}
 	}
 }
@@ -422,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);
 }