diff options
| author | Sean Harmer <sean.harmer@kdab.com> | 2018-01-26 11:25:36 +0000 |
|---|---|---|
| committer | Sean Harmer <sean.harmer@kdab.com> | 2018-01-26 11:52:26 +0000 |
| commit | 6d56b53bb949caa3e592070794b3010e4801e0ca (patch) | |
| tree | 7b68a96c5a43da03f9126a2d30d5c7d05fe7793b /src/render/graphicshelpers | |
| parent | e1b0e10340cf0a9c233774647cf316a7519a2093 (diff) | |
| parent | 1360f39aa811df96c2762cf081702f7a86a782cd (diff) | |
Merge branch '5.10' into dev
Change-Id: I4728b29c349a16867951a781c9417054c798e04a
Diffstat (limited to 'src/render/graphicshelpers')
| -rw-r--r-- | src/render/graphicshelpers/graphicshelpergl3_3.cpp | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/src/render/graphicshelpers/graphicshelpergl3_3.cpp b/src/render/graphicshelpers/graphicshelpergl3_3.cpp index 40c2bafeb..b2512d84a 100644 --- a/src/render/graphicshelpers/graphicshelpergl3_3.cpp +++ b/src/render/graphicshelpers/graphicshelpergl3_3.cpp @@ -292,6 +292,15 @@ void GraphicsHelperGL3_3::vertexAttributePointer(GLenum shaderDataType, case GL_FLOAT_VEC2: case GL_FLOAT_VEC3: case GL_FLOAT_VEC4: + case GL_FLOAT_MAT2: + case GL_FLOAT_MAT2x3: + case GL_FLOAT_MAT2x4: + case GL_FLOAT_MAT3: + case GL_FLOAT_MAT3x2: + case GL_FLOAT_MAT3x4: + case GL_FLOAT_MAT4x2: + case GL_FLOAT_MAT4x3: + case GL_FLOAT_MAT4: m_funcs->glVertexAttribPointer(index, size, type, normalized, stride, pointer); break; |