diff options
| author | Paul Lemire <paul.lemire@kdab.com> | 2016-07-04 08:42:31 +0200 |
|---|---|---|
| committer | Paul Lemire <paul.lemire@kdab.com> | 2016-07-17 21:29:12 +0000 |
| commit | f993bd915a7d61677e6887932abeea026aa74553 (patch) | |
| tree | 4380a0fb4bb6906468a48a23b563c75e40d1c041 /tests/auto/render/renderpass/tst_renderpass.cpp | |
| parent | 2b4bb4fdce0630c71bc84c70f66e3c7943589602 (diff) | |
RenderStates: remove RenderStateCollection
Removes the multiple inheritance scheme it included and simplify the way
render states get added removed.
Change-Id: I20ede340f3bf6fcfb95dc84d7d0588d681331b54
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Diffstat (limited to 'tests/auto/render/renderpass/tst_renderpass.cpp')
| -rw-r--r-- | tests/auto/render/renderpass/tst_renderpass.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/tests/auto/render/renderpass/tst_renderpass.cpp b/tests/auto/render/renderpass/tst_renderpass.cpp index 42233f574..8b178eca7 100644 --- a/tests/auto/render/renderpass/tst_renderpass.cpp +++ b/tests/auto/render/renderpass/tst_renderpass.cpp @@ -87,7 +87,7 @@ private slots: // THEN QVERIFY(backend.shaderProgram().isNull()); QVERIFY(backend.filterKeys().isEmpty()); - QVERIFY(backend.renderStates(m_renderStateManager).isEmpty()); + QVERIFY(backend.renderStates().isEmpty()); QVERIFY(backend.parameters().isEmpty()); } @@ -122,8 +122,8 @@ private slots: QCOMPARE(backend.parameters().size(), 1); QCOMPARE(backend.parameters().first(), frontend.parameters().first()->id()); - QCOMPARE(backend.renderStates(m_renderStateManager).size(), 1); - QCOMPARE(backend.renderStates(m_renderStateManager).first(), backendState); + QCOMPARE(backend.renderStates().size(), 1); + QCOMPARE(backend.renderStates().first(), backendState->peerId()); } void shouldHandleShaderPropertyChangeEvents() @@ -227,8 +227,8 @@ private slots: backend.sceneChangeEvent(addChange); // THEN - QCOMPARE(backend.renderStates(m_renderStateManager).size(), 1); - QCOMPARE(backend.renderStates(m_renderStateManager).first(), backendState); + QCOMPARE(backend.renderStates().size(), 1); + QCOMPARE(backend.renderStates().first(), backendState->peerId()); QVERIFY(renderer.dirtyBits() != 0); // WHEN @@ -237,7 +237,7 @@ private slots: backend.sceneChangeEvent(removeChange); // THEN - QVERIFY(backend.renderStates(m_renderStateManager).isEmpty()); + QVERIFY(backend.renderStates().isEmpty()); } private: |