qiurui
/
qtdatavis3d
mirror of https://github.com/qt/qtdatavis3d.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix compiler warning on 64bit linux 

Change-Id: I4ab8d595ac9f8b069057178079ad7714eaf6e13c
Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
This commit is contained in:
Miikka Heikkinen 2014-10-31 14:53:26 +02:00
parent 8a7c69cb94
commit 0090db1602
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/datavisualizationqml2/glstatestore.cpp
View File

@ -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);

2
src/datavisualizationqml2/glstatestore_p.h
View File

@ -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;