diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2016-12-01 16:39:41 +0100 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2016-12-02 07:16:32 +0000 |
| commit | 69b9f0de3d805a32e08533502ca5503901a4c555 (patch) | |
| tree | 51291aca179d47a7bbc72e403c72fa32517ca1a3 /src | |
| parent | c8cf923ee5076db1b37fdd012994adf72ce6445e (diff) | |
Fix MSVC 64bit warnings about converting GLint to const GLvoid *
Cast via quintptr, fixing warnings:
glstatestore.cpp(487): warning C4312: 'reinterpret_cast': conversion from 'GLint' to 'const GLvoid *' of greater size
canvasrenderer.cpp(1166): warning C4312: 'reinterpret_cast': conversion from 'GLint' to 'GLvoid *' of greater size
canvasrenderer.cpp(1473): warning C4312: 'reinterpret_cast': conversion from 'GLint' to 'const GLvoid *' of greater size
Change-Id: I0085a5f09e137a28973a8e62afa0254fbe8f4bf3
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
Diffstat (limited to 'src')
| -rw-r--r-- | src/imports/qtcanvas3d/canvasrenderer.cpp | 4 | ||||
| -rw-r--r-- | src/imports/qtcanvas3d/glstatestore.cpp | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/imports/qtcanvas3d/canvasrenderer.cpp b/src/imports/qtcanvas3d/canvasrenderer.cpp index 69e7250..db16051 100644 --- a/src/imports/qtcanvas3d/canvasrenderer.cpp +++ b/src/imports/qtcanvas3d/canvasrenderer.cpp @@ -1163,7 +1163,7 @@ void CanvasRenderer::executeCommandQueue() } case CanvasGlCommandQueue::glDrawElements: { glDrawElements(GLenum(command.i1), GLsizei(command.i2), GLenum(command.i3), - reinterpret_cast<GLvoid *>(command.i4)); + reinterpret_cast<GLvoid *>(qintptr(command.i4))); break; } case CanvasGlCommandQueue::glEnable: { @@ -1470,7 +1470,7 @@ void CanvasRenderer::executeCommandQueue() case CanvasGlCommandQueue::glVertexAttribPointer: { glVertexAttribPointer(GLuint(command.i1), command.i2, GLenum(command.i3), GLboolean(command.i4), GLsizei(command.i5), - reinterpret_cast<const GLvoid *>(command.i6)); + reinterpret_cast<const GLvoid *>(qintptr(command.i6))); break; } case CanvasGlCommandQueue::glViewport: { diff --git a/src/imports/qtcanvas3d/glstatestore.cpp b/src/imports/qtcanvas3d/glstatestore.cpp index 2f68f76..3bfecdf 100644 --- a/src/imports/qtcanvas3d/glstatestore.cpp +++ b/src/imports/qtcanvas3d/glstatestore.cpp @@ -484,7 +484,7 @@ void GLStateStore::restoreStoredState() m_vertexAttribArrayTypes[i], m_vertexAttribArrayNormalized[i], m_vertexAttribArrayStrides[i], - reinterpret_cast<const GLvoid *>(m_vertexAttribArrayOffsets[i])); + reinterpret_cast<const GLvoid *>(qintptr(m_vertexAttribArrayOffsets[i]))); } glBindBuffer(GL_ARRAY_BUFFER, m_boundArrayBuffer); |