diff options
| author | Paul Lemire <paul.lemire350@gmail.com> | 2015-09-19 16:57:27 +0200 |
|---|---|---|
| committer | Paul Lemire <paul.lemire@kdab.com> | 2015-10-14 13:27:08 +0000 |
| commit | 55c260448e4c62edc97262fb0e6c28985f5ae38f (patch) | |
| tree | 3e250fe07e556db27e9a3b182fab81b8c089c957 /src/render/graphicshelpers/graphicshelpergl3_3.cpp | |
| parent | d75d7903f94479a3148c232a5c96016820c38dbc (diff) | |
GL3 helpers fix: use QByteArray left to avoid trash characters
When retrieving UBO block names
Change-Id: I3b3c4622491d17f53f2a972623eead9c998925df
Reviewed-by: Andy Nichols <andy.nichols@theqtcompany.com>
Diffstat (limited to 'src/render/graphicshelpers/graphicshelpergl3_3.cpp')
| -rw-r--r-- | src/render/graphicshelpers/graphicshelpergl3_3.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/render/graphicshelpers/graphicshelpergl3_3.cpp b/src/render/graphicshelpers/graphicshelpergl3_3.cpp index 45e593e07..fcb7bf883 100644 --- a/src/render/graphicshelpers/graphicshelpergl3_3.cpp +++ b/src/render/graphicshelpers/graphicshelpergl3_3.cpp @@ -204,9 +204,10 @@ QVector<ShaderUniformBlock> GraphicsHelperGL3_3::programUniformBlocks(GLuint pro blocks.reserve(nbrActiveUniformsBlocks); for (GLint i = 0; i < nbrActiveUniformsBlocks; i++) { QByteArray uniformBlockName(256, '\0'); + GLsizei length = 0; ShaderUniformBlock uniformBlock; - m_funcs->glGetActiveUniformBlockName(programId, i, 256, NULL, uniformBlockName.data()); - uniformBlock.m_name = QString::fromUtf8(uniformBlockName); + m_funcs->glGetActiveUniformBlockName(programId, i, 256, &length, uniformBlockName.data()); + uniformBlock.m_name = QString::fromUtf8(uniformBlockName.left(length)); uniformBlock.m_index = i; m_funcs->glGetActiveUniformBlockiv(programId, i, GL_UNIFORM_BLOCK_ACTIVE_UNIFORMS, &uniformBlock.m_activeUniformsCount); m_funcs->glGetActiveUniformBlockiv(programId, i, GL_UNIFORM_BLOCK_BINDING, &uniformBlock.m_binding); |