summaryrefslogtreecommitdiffstats
path: root/tests/auto
diff options
context:
space:
mode:
authorKevin Ottens <kevin.ottens@kdab.com>2015-02-02 09:50:44 +0100
committerKevin Ottens <kevin.ottens@kdab.com>2015-02-03 10:12:18 +0000
commitbb5041aa93682b10ff54f01915fe91a75673f4db (patch)
tree64b94568db2ba702d6813af9392766aab8807db8 /tests/auto
parent079c57a635504cd8ec3621def6f1bd77bc6347db (diff)
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 <sean.harmer@kdab.com>
Diffstat (limited to 'tests/auto')
-rw-r--r--tests/auto/render/renderrenderpass/tst_renderrenderpass.cpp10
1 files changed, 8 insertions, 2 deletions
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));