diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-09-11 18:47:39 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-09-11 18:47:39 +0200 |
| commit | 96c714e3794f992c26632664d5b028e0ca2a919e (patch) | |
| tree | d0eb4373cb1be4a0c35025f19346087fcaa811dd /src/render/renderers/opengl/renderer | |
| parent | a79c34fe6ef7e47582de9188e284644e9665f31b (diff) | |
| parent | a5b02c4f78b0bc7d0c48143e83d8d222f153be52 (diff) | |
Merge remote-tracking branch 'origin/5.13' into 5.14
Change-Id: I4e73060c1941773efcc568f010f5b073ebb10d4a
Diffstat (limited to 'src/render/renderers/opengl/renderer')
| -rw-r--r-- | src/render/renderers/opengl/renderer/renderview.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/render/renderers/opengl/renderer/renderview.cpp b/src/render/renderers/opengl/renderer/renderview.cpp index 378cb02ab..b00f2c473 100644 --- a/src/render/renderers/opengl/renderer/renderview.cpp +++ b/src/render/renderers/opengl/renderer/renderview.cpp @@ -655,7 +655,7 @@ QVector<RenderCommand *> RenderView::buildDrawRenderCommands(const QVector<Entit RenderPass *pass = passData.pass; if (pass->hasRenderStates()) { command->m_stateSet = new RenderStateSet(); - addUniqueStatesToRenderStateSet(command->m_stateSet, pass->renderStates(), m_manager->renderStateManager()); + addStatesToRenderStateSet(command->m_stateSet, pass->renderStates(), m_manager->renderStateManager()); if (m_stateSet != nullptr) command->m_stateSet->merge(m_stateSet); command->m_changeCost = m_renderer->defaultRenderState()->changeCost(command->m_stateSet); @@ -780,7 +780,7 @@ QVector<RenderCommand *> RenderView::buildComputeRenderCommands(const QVector<En if (pass->hasRenderStates()) { command->m_stateSet = new RenderStateSet(); - addUniqueStatesToRenderStateSet(command->m_stateSet, pass->renderStates(), m_manager->renderStateManager()); + addStatesToRenderStateSet(command->m_stateSet, pass->renderStates(), m_manager->renderStateManager()); // Merge per pass stateset with global stateset // so that the local stateset only overrides |