diff options
author | Miikka Heikkinen <miikka.heikkinen@theqtcompany.com> | 2014-10-31 14:53:26 +0200 |
---|---|---|
committer | Miikka Heikkinen <miikka.heikkinen@theqtcompany.com> | 2014-11-03 10:20:40 +0200 |
commit | 0090db160242374d7ab6e3bedf064b366716f770 (patch) | |
tree | 508e1f3bd83ac4784b28b8adf6a20b3f84f13d1a /src | |
parent | 8a7c69cb943a1d0676549e7cee47863524e10fb6 (diff) |
Fix compiler warning on 64bit linux
Change-Id: I4ab8d595ac9f8b069057178079ad7714eaf6e13c
Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
Diffstat (limited to 'src')
-rw-r--r-- | src/datavisualizationqml2/glstatestore.cpp | 4 | ||||
-rw-r--r-- | src/datavisualizationqml2/glstatestore_p.h | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/datavisualizationqml2/glstatestore.cpp b/src/datavisualizationqml2/glstatestore.cpp index 973d5054..5775694d 100644 --- a/src/datavisualizationqml2/glstatestore.cpp +++ b/src/datavisualizationqml2/glstatestore.cpp @@ -57,7 +57,7 @@ GLStateStore::GLStateStore(QOpenGLContext *context, QObject *parent) : m_vertexAttribArrayTypes.reset(new GLint[maxVertexAttribs]); m_vertexAttribArrayNormalized.reset(new GLint[maxVertexAttribs]); m_vertexAttribArrayStrides.reset(new GLint[maxVertexAttribs]); - m_vertexAttribArrayOffsets.reset(new GLint[maxVertexAttribs]); + m_vertexAttribArrayOffsets.reset(new void *[maxVertexAttribs]); initGLDefaultState(); } @@ -336,7 +336,7 @@ void GLStateStore::restoreGLState() m_vertexAttribArrayTypes[i], m_vertexAttribArrayNormalized[i], m_vertexAttribArrayStrides[i], - (void *) m_vertexAttribArrayOffsets[i]); + m_vertexAttribArrayOffsets[i]); } glBindBuffer(GL_ARRAY_BUFFER, m_boundArrayBuffer); diff --git a/src/datavisualizationqml2/glstatestore_p.h b/src/datavisualizationqml2/glstatestore_p.h index 4add606b..48b30a15 100644 --- a/src/datavisualizationqml2/glstatestore_p.h +++ b/src/datavisualizationqml2/glstatestore_p.h @@ -71,7 +71,7 @@ public: QScopedArrayPointer<GLint> m_vertexAttribArrayTypes; QScopedArrayPointer<GLint> m_vertexAttribArrayNormalized; QScopedArrayPointer<GLint> m_vertexAttribArrayStrides; - QScopedArrayPointer<GLint> m_vertexAttribArrayOffsets; + QScopedArrayPointer<void *> m_vertexAttribArrayOffsets; GLint m_activeTexture; GLint m_texBinding2D; |