diff options
author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-12-04 03:04:11 +0100 |
---|---|---|
committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-12-04 03:04:11 +0100 |
commit | bcd0640360cbacb0880ee067423aac6727b42e8d (patch) | |
tree | 47dbd4f71bd1a4b6b722c55d0db81d81edf61f20 /src/render/renderers/opengl | |
parent | 21a1469fb6df237ac1475d1b8c973bb601548f68 (diff) | |
parent | 9745006dadf5685f4ff82c6234938e19b9402801 (diff) |
Merge remote-tracking branch 'origin/5.11' into 5.12
Change-Id: I9f4dd807f0179d7bd95a5263e57c37198e7432f4
Diffstat (limited to 'src/render/renderers/opengl')
-rw-r--r-- | src/render/renderers/opengl/renderer/renderer.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/render/renderers/opengl/renderer/renderer.cpp b/src/render/renderers/opengl/renderer/renderer.cpp index 743c9a6a8..a1781d1b0 100644 --- a/src/render/renderers/opengl/renderer/renderer.cpp +++ b/src/render/renderers/opengl/renderer/renderer.cpp @@ -1875,14 +1875,14 @@ void Renderer::performDraw(RenderCommand *command) reinterpret_cast<void*>(quintptr(command->m_indexAttributeByteOffset)), command->m_instanceCount, command->m_indexOffset, - command->m_firstVertex); + command->m_firstInstance); } else { Profiling::GLTimeRecorder recorder(Profiling::DrawArray); m_submissionContext->drawArraysInstancedBaseInstance(command->m_primitiveType, - command->m_firstInstance, + command->m_firstVertex, command->m_primitiveCount, command->m_instanceCount, - command->m_firstVertex); + command->m_firstInstance); } } |