From bb5041aa93682b10ff54f01915fe91a75673f4db Mon Sep 17 00:00:00 2001 From: Kevin Ottens Date: Mon, 2 Feb 2015 09:50:44 +0100 Subject: Don't keep pointers to QParameterMapping The backend is not supposed to keep pointers on frontend objects it doesn't own. Instead store the data in RenderParameterMapping instances as soon as possible. Change-Id: I5f0ff04f06c54c2ad0fbe483051db9974f4aedf8 Reviewed-by: Sean Harmer --- tests/auto/render/renderrenderpass/tst_renderrenderpass.cpp | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) (limited to 'tests/auto') diff --git a/tests/auto/render/renderrenderpass/tst_renderrenderpass.cpp b/tests/auto/render/renderrenderpass/tst_renderrenderpass.cpp index bd5c33043..72cfbc304 100644 --- a/tests/auto/render/renderrenderpass/tst_renderrenderpass.cpp +++ b/tests/auto/render/renderrenderpass/tst_renderrenderpass.cpp @@ -158,7 +158,10 @@ private slots: QCOMPARE(backend.annotations().first(), frontend.annotations().first()->id()); QCOMPARE(backend.bindings().size(), 1); - QCOMPARE(backend.bindings().first(), frontend.bindings().first()); + 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.renderStates().size(), 1); QCOMPARE(backend.renderStates().first(), state); @@ -235,7 +238,10 @@ private slots: // THEN QCOMPARE(backend.bindings().size(), 1); - QCOMPARE(backend.bindings().first(), binding.data()); + 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()); // WHEN QScenePropertyChangePtr removeChange(new QScenePropertyChange(NodeRemoved, node)); -- cgit v1.2.3