From 7e2f9d42eebe13182918d832577c4f5ed96ab87b Mon Sep 17 00:00:00 2001 From: Paul Lemire Date: Thu, 25 Feb 2016 15:09:03 +0100 Subject: Remove ParameterMapping * Bindings are now entirely deduced from shader introspection * Modified the BackendNodeDirtyFlags to remove the class at this prevents the operator~() to be called * Make the Renderer loop check for the ComputeDirty flag and don't unset it if set Note: uses a hack to reset m_changeSet in performCompute as right know we are sometimes missing the markDirty(ComputeDirty) set by the ComputeJob nodes. Will be sorted out later. Change-Id: Ic4fa71ecf01b625e885a58a66278387bf5b36339 Reviewed-by: Sean Harmer --- tests/auto/render/renderpass/tst_renderpass.cpp | 43 ------------------------- 1 file changed, 43 deletions(-) (limited to 'tests/auto/render/renderpass/tst_renderpass.cpp') diff --git a/tests/auto/render/renderpass/tst_renderpass.cpp b/tests/auto/render/renderpass/tst_renderpass.cpp index 603cfb2a2..390946042 100644 --- a/tests/auto/render/renderpass/tst_renderpass.cpp +++ b/tests/auto/render/renderpass/tst_renderpass.cpp @@ -32,7 +32,6 @@ #include #include -#include #include #include #include @@ -84,7 +83,6 @@ private slots: // THEN QVERIFY(backend.shaderProgram().isNull()); QVERIFY(backend.annotations().isEmpty()); - QVERIFY(backend.bindings().isEmpty()); QVERIFY(backend.renderStates(m_renderStateManager).isEmpty()); QVERIFY(backend.parameters().isEmpty()); } @@ -97,8 +95,6 @@ private slots: frontend.addAnnotation(new QAnnotation(&frontend)); - frontend.addBinding(new QParameterMapping(&frontend)); - frontend.addParameter(new QParameter(&frontend)); QRenderState *frontendState = new QBlendState(); @@ -119,12 +115,6 @@ private slots: QCOMPARE(backend.annotations().size(), 1); QCOMPARE(backend.annotations().first(), frontend.annotations().first()->id()); - QCOMPARE(backend.bindings().size(), 1); - QCOMPARE(backend.bindings().first().id(), frontend.bindings().first()->id()); - QCOMPARE(backend.bindings().first().bindingType(), frontend.bindings().first()->bindingType()); - QCOMPARE(backend.bindings().first().parameterName(), frontend.bindings().first()->parameterName()); - QCOMPARE(backend.bindings().first().shaderVariableName(), frontend.bindings().first()->shaderVariableName()); - QCOMPARE(backend.parameters().size(), 1); QCOMPARE(backend.parameters().first(), frontend.parameters().first()->id()); @@ -191,39 +181,6 @@ private slots: QVERIFY(backend.annotations().isEmpty()); } - void shouldHandleBindingsPropertyChangeEvents() - { - // GIVEN - QScopedPointer binding(new QParameterMapping); - - RenderPass backend; - TestRenderer renderer; - backend.setRenderer(&renderer); - - // WHEN - QScenePropertyChangePtr addChange(new QScenePropertyChange(NodeAdded, QSceneChange::Node, binding->id())); - addChange->setValue(QVariant::fromValue(binding.data())); - addChange->setPropertyName("binding"); - backend.sceneChangeEvent(addChange); - - // THEN - QCOMPARE(backend.bindings().size(), 1); - QCOMPARE(backend.bindings().first().id(), binding->id()); - QCOMPARE(backend.bindings().first().bindingType(), binding->bindingType()); - QCOMPARE(backend.bindings().first().parameterName(), binding->parameterName()); - QCOMPARE(backend.bindings().first().shaderVariableName(), binding->shaderVariableName()); - QVERIFY(renderer.dirtyBits() != 0); - - // WHEN - QScenePropertyChangePtr removeChange(new QScenePropertyChange(NodeRemoved, QSceneChange::Node, binding->id())); - removeChange->setValue(QVariant::fromValue(binding->id())); - removeChange->setPropertyName("binding"); - backend.sceneChangeEvent(removeChange); - - // THEN - QVERIFY(backend.bindings().isEmpty()); - } - void shouldHandleParametersPropertyChangeEvents() { // GIVEN -- cgit v1.2.3