From 97f7ad1a54afb52715d26924413e1f6da95f8095 Mon Sep 17 00:00:00 2001 From: Alex Szpakowski Date: Thu, 25 Apr 2013 11:16:43 -0700 Subject: [PATCH] Fixed extern matrices --- src/modules/graphics/opengl/Shader.cpp | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/modules/graphics/opengl/Shader.cpp b/src/modules/graphics/opengl/Shader.cpp index 150d42719..b5dee7847 100644 --- a/src/modules/graphics/opengl/Shader.cpp +++ b/src/modules/graphics/opengl/Shader.cpp @@ -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: