Fixed extern matrices

This commit is contained in:
Alex Szpakowski
2013-04-25 11:16:43 -07:00
parent 0130b726de
commit 97f7ad1a54
+6
View File
@@ -366,14 +366,17 @@ int Shader::getUniformTypeSize(GLenum type) const
return 1;
case GL_INT_VEC2:
case GL_FLOAT_VEC2:
case GL_FLOAT_MAT2:
case GL_BOOL_VEC2:
return 2;
case GL_INT_VEC3:
case GL_FLOAT_VEC3:
case GL_FLOAT_MAT3:
case GL_BOOL_VEC3:
return 3;
case GL_INT_VEC4:
case GL_FLOAT_VEC4:
case GL_FLOAT_MAT4:
case GL_BOOL_VEC4:
return 4;
default:
@@ -396,6 +399,9 @@ Shader::UniformType Shader::getUniformBaseType(GLenum type) const
case GL_FLOAT_VEC2:
case GL_FLOAT_VEC3:
case GL_FLOAT_VEC4:
case GL_FLOAT_MAT2:
case GL_FLOAT_MAT3:
case GL_FLOAT_MAT4:
return UNIFORM_FLOAT;
case GL_BOOL:
case GL_BOOL_VEC2: