diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-08-31 03:00:17 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-08-31 03:00:17 +0200 |
| commit | a95a5e31dc9397dcf34a8391cdad66c3e1b332db (patch) | |
| tree | 399de9cf0f2ac8fde8d7af79a5900efbb7a05bba /src/render/renderers/opengl/renderer | |
| parent | dcd99cbfd756276194ab462df4b9e26b932097b6 (diff) | |
| parent | a802fd74e010a6d8ebfc2243232e0373d67f3df6 (diff) | |
Merge remote-tracking branch 'origin/5.12' into 5.13
Change-Id: Iae9a2903afd5da09cfd9288ff6cf74d7f069c83b
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 9bbf966c8..4bb3ba2f8 100644 --- a/src/render/renderers/opengl/renderer/renderview.cpp +++ b/src/render/renderers/opengl/renderer/renderview.cpp @@ -603,7 +603,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); @@ -728,7 +728,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 |