diff options
Diffstat (limited to 'tests')
6 files changed, 89 insertions, 89 deletions
diff --git a/tests/auto/render/qmaterial/tst_qmaterial.cpp b/tests/auto/render/qmaterial/tst_qmaterial.cpp index 804c22112..98902d3ea 100644 --- a/tests/auto/render/qmaterial/tst_qmaterial.cpp +++ b/tests/auto/render/qmaterial/tst_qmaterial.cpp @@ -129,7 +129,7 @@ private: compareParameters(original->parameters(), clone->parameters()); compareRenderStates(original->renderStates(), clone->renderStates()); - compareAnnotations(original->annotations(), clone->annotations()); + compareFilterKeys(original->filterKeys(), clone->filterKeys()); compareShaderPrograms(original->shaderProgram(), clone->shaderProgram()); } @@ -146,14 +146,14 @@ private: } } - void compareAnnotations(const QList<Qt3DRender::QAnnotation *> &original, const QList<Qt3DRender::QAnnotation *> &clone) + void compareFilterKeys(const QList<Qt3DRender::QFilterKey *> &original, const QList<Qt3DRender::QFilterKey *> &clone) { const int annotationsCount = original.size(); QCOMPARE(annotationsCount, clone.size()); for (int i = 0; i < annotationsCount; ++i) { - const Qt3DRender::QAnnotation *origAnnotation = original.at(i); - const Qt3DRender::QAnnotation *cloneAnnotation = clone.at(i); + const Qt3DRender::QFilterKey *origAnnotation = original.at(i); + const Qt3DRender::QFilterKey *cloneAnnotation = clone.at(i); QCOMPARE(origAnnotation->id(), cloneAnnotation->id()); QCOMPARE(origAnnotation->name(), cloneAnnotation->name()); QCOMPARE(origAnnotation->value(), cloneAnnotation->value()); diff --git a/tests/auto/render/qrenderpassfilter/tst_qrenderpassfilter.cpp b/tests/auto/render/qrenderpassfilter/tst_qrenderpassfilter.cpp index 7f99bd37e..fd429208f 100644 --- a/tests/auto/render/qrenderpassfilter/tst_qrenderpassfilter.cpp +++ b/tests/auto/render/qrenderpassfilter/tst_qrenderpassfilter.cpp @@ -33,7 +33,7 @@ #include <Qt3DRender/qrenderpassfilter.h> #include <Qt3DRender/qparameter.h> -#include <Qt3DRender/qannotation.h> +#include <Qt3DRender/qfilterkey.h> #include "testpostmanarbiter.h" @@ -62,10 +62,10 @@ private Q_SLOTS: { QTest::addColumn<Qt3DRender::QRenderPassFilter *>("renderPassFilter"); QTest::addColumn<QList<Qt3DRender::QParameter *> >("parameters"); - QTest::addColumn<QList<Qt3DRender::QAnnotation *> >("annotations"); + QTest::addColumn<QList<Qt3DRender::QFilterKey *> >("filterKeys"); Qt3DRender::QRenderPassFilter *defaultConstructed = new Qt3DRender::QRenderPassFilter(); - QTest::newRow("defaultConstructed") << defaultConstructed << QList<Qt3DRender::QParameter *>() << QList<Qt3DRender::QAnnotation *>(); + QTest::newRow("defaultConstructed") << defaultConstructed << QList<Qt3DRender::QParameter *>() << QList<Qt3DRender::QFilterKey *>(); Qt3DRender::QRenderPassFilter *renderPassFilterWithParams = new Qt3DRender::QRenderPassFilter(); Qt3DRender::QParameter *parameter1 = new Qt3DRender::QParameter(QStringLiteral("displacement"), 454.0f); @@ -73,36 +73,36 @@ private Q_SLOTS: QList<Qt3DRender::QParameter *> params1 = QList<Qt3DRender::QParameter *>() << parameter1 << parameter2; renderPassFilterWithParams->addParameter(parameter1); renderPassFilterWithParams->addParameter(parameter2); - QTest::newRow("renderPassFilterWithParams") << renderPassFilterWithParams << params1 << QList<Qt3DRender::QAnnotation *>(); + QTest::newRow("renderPassFilterWithParams") << renderPassFilterWithParams << params1 << QList<Qt3DRender::QFilterKey *>(); Qt3DRender::QRenderPassFilter *renderPassFilterWithAnnotations = new Qt3DRender::QRenderPassFilter(); - Qt3DRender::QAnnotation *annotation1 = new Qt3DRender::QAnnotation(); - Qt3DRender::QAnnotation *annotation2 = new Qt3DRender::QAnnotation(); - annotation1->setName(QStringLiteral("hasSuperCharger")); - annotation1->setValue(true); - annotation1->setName(QStringLiteral("hasNitroKit")); - annotation1->setValue(false); - QList<Qt3DRender::QAnnotation *> annotations1 = QList<Qt3DRender::QAnnotation *>() << annotation1 << annotation2; - renderPassFilterWithAnnotations->addInclude(annotation1); - renderPassFilterWithAnnotations->addInclude(annotation2); - QTest::newRow("renderPassFilterWithAnnotations") << renderPassFilterWithAnnotations << QList<Qt3DRender::QParameter *>() << annotations1; + Qt3DRender::QFilterKey *filterKey1 = new Qt3DRender::QFilterKey(); + Qt3DRender::QFilterKey *filterKey2 = new Qt3DRender::QFilterKey(); + filterKey1->setName(QStringLiteral("hasSuperCharger")); + filterKey1->setValue(true); + filterKey1->setName(QStringLiteral("hasNitroKit")); + filterKey1->setValue(false); + QList<Qt3DRender::QFilterKey *> filterKeys1 = QList<Qt3DRender::QFilterKey *>() << filterKey1 << filterKey2; + renderPassFilterWithAnnotations->addInclude(filterKey1); + renderPassFilterWithAnnotations->addInclude(filterKey2); + QTest::newRow("renderPassFilterWithAnnotations") << renderPassFilterWithAnnotations << QList<Qt3DRender::QParameter *>() << filterKeys1; Qt3DRender::QRenderPassFilter *renderPassFilterWithParamsAndAnnotations = new Qt3DRender::QRenderPassFilter(); Qt3DRender::QParameter *parameter3 = new Qt3DRender::QParameter(QStringLiteral("displacement"), 383.0f); Qt3DRender::QParameter *parameter4 = new Qt3DRender::QParameter(QStringLiteral("torque"), 555); - Qt3DRender::QAnnotation *annotation3 = new Qt3DRender::QAnnotation(); - Qt3DRender::QAnnotation *annotation4 = new Qt3DRender::QAnnotation(); - annotation3->setName(QStringLiteral("hasSuperCharger")); - annotation3->setValue(false); - annotation4->setName(QStringLiteral("hasNitroKit")); - annotation4->setValue(true); + Qt3DRender::QFilterKey *filterKey3 = new Qt3DRender::QFilterKey(); + Qt3DRender::QFilterKey *filterKey4 = new Qt3DRender::QFilterKey(); + filterKey3->setName(QStringLiteral("hasSuperCharger")); + filterKey3->setValue(false); + filterKey4->setName(QStringLiteral("hasNitroKit")); + filterKey4->setValue(true); QList<Qt3DRender::QParameter *> params2 = QList<Qt3DRender::QParameter *>() << parameter3 << parameter4; - QList<Qt3DRender::QAnnotation *> annotations2 = QList<Qt3DRender::QAnnotation *>() << annotation3 << annotation4; + QList<Qt3DRender::QFilterKey *> filterKeys2 = QList<Qt3DRender::QFilterKey *>() << filterKey3 << filterKey4; renderPassFilterWithParamsAndAnnotations->addParameter(parameter3); renderPassFilterWithParamsAndAnnotations->addParameter(parameter4); - renderPassFilterWithParamsAndAnnotations->addInclude(annotation3); - renderPassFilterWithParamsAndAnnotations->addInclude(annotation4); - QTest::newRow("renderPassFilterWithParamsAndAnnotations") << renderPassFilterWithParamsAndAnnotations << params2 << annotations2; + renderPassFilterWithParamsAndAnnotations->addInclude(filterKey3); + renderPassFilterWithParamsAndAnnotations->addInclude(filterKey4); + QTest::newRow("renderPassFilterWithParamsAndAnnotations") << renderPassFilterWithParamsAndAnnotations << params2 << filterKeys2 ; } void checkCloning() @@ -110,11 +110,11 @@ private Q_SLOTS: // GIVEN QFETCH(Qt3DRender::QRenderPassFilter*, renderPassFilter); QFETCH(QList<Qt3DRender::QParameter *>, parameters); - QFETCH(QList<Qt3DRender::QAnnotation *>, annotations); + QFETCH(QList<Qt3DRender::QFilterKey *>, filterKeys); // THEN QCOMPARE(renderPassFilter->parameters(), parameters); - QCOMPARE(renderPassFilter->includes(), annotations); + QCOMPARE(renderPassFilter->includes(), filterKeys); // WHEN Qt3DRender::QRenderPassFilter *clone = static_cast<Qt3DRender::QRenderPassFilter *>(QNode::clone(renderPassFilter)); @@ -136,9 +136,9 @@ private Q_SLOTS: QVERIFY(pOrig->parent() == renderPassFilter); } - for (int i = 0, m = annotations.count(); i < m; ++i) { - Qt3DRender::QAnnotation *aClone = clone->includes().at(i); - Qt3DRender::QAnnotation *aOrig = annotations.at(i); + for (int i = 0, m = filterKeys.count(); i < m; ++i) { + Qt3DRender::QFilterKey *aClone = clone->includes().at(i); + Qt3DRender::QFilterKey *aOrig = filterKeys.at(i); QCOMPARE(aOrig->id(),aClone->id()); QCOMPARE(aOrig->name(), aClone->name()); QCOMPARE(aOrig->value(), aClone->value()); @@ -193,8 +193,8 @@ private Q_SLOTS: arbiter.events.clear(); // WHEN - Qt3DRender::QAnnotation *annotation1 = new Qt3DRender::QAnnotation(); - renderPassFilter->addInclude(annotation1); + Qt3DRender::QFilterKey *filterKey1 = new Qt3DRender::QFilterKey(); + renderPassFilter->addInclude(filterKey1); QCoreApplication::processEvents(); // THEN @@ -202,20 +202,20 @@ private Q_SLOTS: change = arbiter.events.first().staticCast<Qt3DCore::QScenePropertyChange>(); QCOMPARE(change->propertyName(), "include"); QCOMPARE(change->subjectId(),renderPassFilter->id()); - QCOMPARE(change->value().value<Qt3DCore::QNodeId>(), annotation1->id()); + QCOMPARE(change->value().value<Qt3DCore::QNodeId>(), filterKey1->id()); QCOMPARE(change->type(), Qt3DCore::NodeAdded); arbiter.events.clear(); // WHEN - renderPassFilter->addInclude(annotation1); + renderPassFilter->addInclude(filterKey1); QCoreApplication::processEvents(); // THEN QCOMPARE(arbiter.events.size(), 0); // WHEN - renderPassFilter->removeInclude(annotation1); + renderPassFilter->removeInclude(filterKey1); QCoreApplication::processEvents(); // THEN @@ -223,7 +223,7 @@ private Q_SLOTS: change = arbiter.events.first().staticCast<Qt3DCore::QScenePropertyChange>(); QCOMPARE(change->propertyName(), "include"); QCOMPARE(change->subjectId(), renderPassFilter->id()); - QCOMPARE(change->value().value<Qt3DCore::QNodeId>(), annotation1->id()); + QCOMPARE(change->value().value<Qt3DCore::QNodeId>(), filterKey1->id()); QCOMPARE(change->type(), Qt3DCore::NodeRemoved); arbiter.events.clear(); diff --git a/tests/auto/render/qtechniquefilter/tst_qtechniquefilter.cpp b/tests/auto/render/qtechniquefilter/tst_qtechniquefilter.cpp index 24a5ba781..f4a475c64 100644 --- a/tests/auto/render/qtechniquefilter/tst_qtechniquefilter.cpp +++ b/tests/auto/render/qtechniquefilter/tst_qtechniquefilter.cpp @@ -33,7 +33,7 @@ #include <Qt3DRender/qtechniquefilter.h> #include <Qt3DRender/qparameter.h> -#include <Qt3DRender/qannotation.h> +#include <Qt3DRender/qfilterkey.h> #include "testpostmanarbiter.h" @@ -62,10 +62,10 @@ private Q_SLOTS: { QTest::addColumn<Qt3DRender::QTechniqueFilter *>("techniqueFilter"); QTest::addColumn<QList<Qt3DRender::QParameter *> >("parameters"); - QTest::addColumn<QList<Qt3DRender::QAnnotation *> >("annotations"); + QTest::addColumn<QList<Qt3DRender::QFilterKey *> >("filterKeys"); Qt3DRender::QTechniqueFilter *defaultConstructed = new Qt3DRender::QTechniqueFilter(); - QTest::newRow("defaultConstructed") << defaultConstructed << QList<Qt3DRender::QParameter *>() << QList<Qt3DRender::QAnnotation *>(); + QTest::newRow("defaultConstructed") << defaultConstructed << QList<Qt3DRender::QParameter *>() << QList<Qt3DRender::QFilterKey *>(); Qt3DRender::QTechniqueFilter *techniqueFilterWithParams = new Qt3DRender::QTechniqueFilter(); Qt3DRender::QParameter *parameter1 = new Qt3DRender::QParameter(QStringLiteral("displacement"), 454.0f); @@ -73,36 +73,36 @@ private Q_SLOTS: QList<Qt3DRender::QParameter *> params1 = QList<Qt3DRender::QParameter *>() << parameter1 << parameter2; techniqueFilterWithParams->addParameter(parameter1); techniqueFilterWithParams->addParameter(parameter2); - QTest::newRow("techniqueFilterWithParams") << techniqueFilterWithParams << params1 << QList<Qt3DRender::QAnnotation *>(); + QTest::newRow("techniqueFilterWithParams") << techniqueFilterWithParams << params1 << QList<Qt3DRender::QFilterKey *>(); Qt3DRender::QTechniqueFilter *techniqueFilterWithAnnotations = new Qt3DRender::QTechniqueFilter(); - Qt3DRender::QAnnotation *annotation1 = new Qt3DRender::QAnnotation(); - Qt3DRender::QAnnotation *annotation2 = new Qt3DRender::QAnnotation(); - annotation1->setName(QStringLiteral("hasSuperCharger")); - annotation1->setValue(true); - annotation1->setName(QStringLiteral("hasNitroKit")); - annotation1->setValue(false); - QList<Qt3DRender::QAnnotation *> annotations1 = QList<Qt3DRender::QAnnotation *>() << annotation1 << annotation2; - techniqueFilterWithAnnotations->addMatch(annotation1); - techniqueFilterWithAnnotations->addMatch(annotation2); - QTest::newRow("techniqueFilterWithAnnotations") << techniqueFilterWithAnnotations << QList<Qt3DRender::QParameter *>() << annotations1; + Qt3DRender::QFilterKey *filterKey1 = new Qt3DRender::QFilterKey(); + Qt3DRender::QFilterKey *filterKey2 = new Qt3DRender::QFilterKey(); + filterKey1->setName(QStringLiteral("hasSuperCharger")); + filterKey1->setValue(true); + filterKey1->setName(QStringLiteral("hasNitroKit")); + filterKey1->setValue(false); + QList<Qt3DRender::QFilterKey *> filterKeys1 = QList<Qt3DRender::QFilterKey *>() << filterKey1 << filterKey2; + techniqueFilterWithAnnotations->addMatch(filterKey1); + techniqueFilterWithAnnotations->addMatch(filterKey2); + QTest::newRow("techniqueFilterWithAnnotations") << techniqueFilterWithAnnotations << QList<Qt3DRender::QParameter *>() << filterKeys1; Qt3DRender::QTechniqueFilter *techniqueFilterWithParamsAndAnnotations = new Qt3DRender::QTechniqueFilter(); Qt3DRender::QParameter *parameter3 = new Qt3DRender::QParameter(QStringLiteral("displacement"), 383.0f); Qt3DRender::QParameter *parameter4 = new Qt3DRender::QParameter(QStringLiteral("torque"), 555); - Qt3DRender::QAnnotation *annotation3 = new Qt3DRender::QAnnotation(); - Qt3DRender::QAnnotation *annotation4 = new Qt3DRender::QAnnotation(); - annotation3->setName(QStringLiteral("hasSuperCharger")); - annotation3->setValue(false); - annotation4->setName(QStringLiteral("hasNitroKit")); - annotation4->setValue(true); + Qt3DRender::QFilterKey *filterKey3 = new Qt3DRender::QFilterKey(); + Qt3DRender::QFilterKey *filterKey4 = new Qt3DRender::QFilterKey(); + filterKey3->setName(QStringLiteral("hasSuperCharger")); + filterKey3->setValue(false); + filterKey4->setName(QStringLiteral("hasNitroKit")); + filterKey4->setValue(true); QList<Qt3DRender::QParameter *> params2 = QList<Qt3DRender::QParameter *>() << parameter3 << parameter4; - QList<Qt3DRender::QAnnotation *> annotations2 = QList<Qt3DRender::QAnnotation *>() << annotation3 << annotation4; + QList<Qt3DRender::QFilterKey *> filterKeys2 = QList<Qt3DRender::QFilterKey *>() << filterKey3 << filterKey4; techniqueFilterWithParamsAndAnnotations->addParameter(parameter3); techniqueFilterWithParamsAndAnnotations->addParameter(parameter4); - techniqueFilterWithParamsAndAnnotations->addMatch(annotation3); - techniqueFilterWithParamsAndAnnotations->addMatch(annotation4); - QTest::newRow("techniqueFilterWithParamsAndAnnotations") << techniqueFilterWithParamsAndAnnotations << params2 << annotations2; + techniqueFilterWithParamsAndAnnotations->addMatch(filterKey3); + techniqueFilterWithParamsAndAnnotations->addMatch(filterKey4); + QTest::newRow("techniqueFilterWithParamsAndAnnotations") << techniqueFilterWithParamsAndAnnotations << params2 << filterKeys2; } void checkCloning() @@ -110,11 +110,11 @@ private Q_SLOTS: // GIVEN QFETCH(Qt3DRender::QTechniqueFilter*, techniqueFilter); QFETCH(QList<Qt3DRender::QParameter *>, parameters); - QFETCH(QList<Qt3DRender::QAnnotation *>, annotations); + QFETCH(QList<Qt3DRender::QFilterKey *>, filterKeys); // THEN QCOMPARE(techniqueFilter->parameters(), parameters); - QCOMPARE(techniqueFilter->criteria(), annotations); + QCOMPARE(techniqueFilter->criteria(), filterKeys); // WHEN Qt3DRender::QTechniqueFilter *clone = static_cast<Qt3DRender::QTechniqueFilter *>(QNode::clone(techniqueFilter)); @@ -136,9 +136,9 @@ private Q_SLOTS: QVERIFY(pOrig->parent() == techniqueFilter); } - for (int i = 0, m = annotations.count(); i < m; ++i) { - Qt3DRender::QAnnotation *aClone = clone->criteria().at(i); - Qt3DRender::QAnnotation *aOrig = annotations.at(i); + for (int i = 0, m = filterKeys.count(); i < m; ++i) { + Qt3DRender::QFilterKey *aClone = clone->criteria().at(i); + Qt3DRender::QFilterKey *aOrig = filterKeys.at(i); QCOMPARE(aOrig->id(),aClone->id()); QCOMPARE(aOrig->name(), aClone->name()); QCOMPARE(aOrig->value(), aClone->value()); @@ -193,8 +193,8 @@ private Q_SLOTS: arbiter.events.clear(); // WHEN - Qt3DRender::QAnnotation *annotation1 = new Qt3DRender::QAnnotation(); - techniqueFilter->addMatch(annotation1); + Qt3DRender::QFilterKey *filterKey1 = new Qt3DRender::QFilterKey(); + techniqueFilter->addMatch(filterKey1); QCoreApplication::processEvents(); // THEN @@ -202,20 +202,20 @@ private Q_SLOTS: change = arbiter.events.first().staticCast<Qt3DCore::QScenePropertyChange>(); QCOMPARE(change->propertyName(), "require"); QCOMPARE(change->subjectId(),techniqueFilter->id()); - QCOMPARE(change->value().value<Qt3DCore::QNodeId>(), annotation1->id()); + QCOMPARE(change->value().value<Qt3DCore::QNodeId>(), filterKey1->id()); QCOMPARE(change->type(), Qt3DCore::NodeAdded); arbiter.events.clear(); // WHEN - techniqueFilter->addMatch(annotation1); + techniqueFilter->addMatch(filterKey1); QCoreApplication::processEvents(); // THEN QCOMPARE(arbiter.events.size(), 0); // WHEN - techniqueFilter->removeMatch(annotation1); + techniqueFilter->removeMatch(filterKey1); QCoreApplication::processEvents(); // THEN @@ -223,7 +223,7 @@ private Q_SLOTS: change = arbiter.events.first().staticCast<Qt3DCore::QScenePropertyChange>(); QCOMPARE(change->propertyName(), "require"); QCOMPARE(change->subjectId(), techniqueFilter->id()); - QCOMPARE(change->value().value<Qt3DCore::QNodeId>(), annotation1->id()); + QCOMPARE(change->value().value<Qt3DCore::QNodeId>(), filterKey1->id()); QCOMPARE(change->type(), Qt3DCore::NodeRemoved); arbiter.events.clear(); diff --git a/tests/auto/render/renderpass/tst_renderpass.cpp b/tests/auto/render/renderpass/tst_renderpass.cpp index ac56acfc4..b42f765a2 100644 --- a/tests/auto/render/renderpass/tst_renderpass.cpp +++ b/tests/auto/render/renderpass/tst_renderpass.cpp @@ -31,7 +31,7 @@ #include <Qt3DCore/QScenePropertyChange> -#include <Qt3DRender/QAnnotation> +#include <Qt3DRender/QFilterKey> #include <Qt3DRender/QRenderPass> #include <Qt3DRender/QShaderProgram> #include <Qt3DRender/QParameter> @@ -82,7 +82,7 @@ private slots: // THEN QVERIFY(backend.shaderProgram().isNull()); - QVERIFY(backend.annotations().isEmpty()); + QVERIFY(backend.filterKeys().isEmpty()); QVERIFY(backend.renderStates(m_renderStateManager).isEmpty()); QVERIFY(backend.parameters().isEmpty()); } @@ -93,7 +93,7 @@ private slots: QRenderPass frontend; frontend.setShaderProgram(new QShaderProgram(&frontend)); - frontend.addAnnotation(new QAnnotation(&frontend)); + frontend.addFilterKey(new QFilterKey(&frontend)); frontend.addParameter(new QParameter(&frontend)); @@ -112,8 +112,8 @@ private slots: // THEN QCOMPARE(backend.shaderProgram(), frontend.shaderProgram()->id()); - QCOMPARE(backend.annotations().size(), 1); - QCOMPARE(backend.annotations().first(), frontend.annotations().first()->id()); + QCOMPARE(backend.filterKeys().size(), 1); + QCOMPARE(backend.filterKeys().first(), frontend.filterKeys().first()->id()); QCOMPARE(backend.parameters().size(), 1); QCOMPARE(backend.parameters().first(), frontend.parameters().first()->id()); @@ -154,7 +154,7 @@ private slots: void shouldHandleAnnotationsPropertyChangeEvents() { // GIVEN - QScopedPointer<QAnnotation> annotation(new QAnnotation); + QScopedPointer<QFilterKey> annotation(new QFilterKey); RenderPass backend; TestRenderer renderer; @@ -163,22 +163,22 @@ private slots: // WHEN QScenePropertyChangePtr addChange(new QScenePropertyChange(NodeAdded, QSceneChange::Node, annotation->id())); addChange->setValue(QVariant::fromValue(annotation->id())); - addChange->setPropertyName("annotation"); + addChange->setPropertyName("filterKeys"); backend.sceneChangeEvent(addChange); // THEN - QCOMPARE(backend.annotations().size(), 1); - QCOMPARE(backend.annotations().first(), annotation->id()); + QCOMPARE(backend.filterKeys().size(), 1); + QCOMPARE(backend.filterKeys().first(), annotation->id()); QVERIFY(renderer.dirtyBits() != 0); // WHEN QScenePropertyChangePtr removeChange(new QScenePropertyChange(NodeRemoved, QSceneChange::Node, annotation->id())); removeChange->setValue(QVariant::fromValue(annotation->id())); - removeChange->setPropertyName("annotation"); + removeChange->setPropertyName("filterKeys"); backend.sceneChangeEvent(removeChange); // THEN - QVERIFY(backend.annotations().isEmpty()); + QVERIFY(backend.filterKeys().isEmpty()); } void shouldHandleParametersPropertyChangeEvents() diff --git a/tests/benchmarks/Qt3DBench/Qt3DBenchFrameGraph.qml b/tests/benchmarks/Qt3DBench/Qt3DBenchFrameGraph.qml index 23cf77940..7963f4360 100644 --- a/tests/benchmarks/Qt3DBench/Qt3DBenchFrameGraph.qml +++ b/tests/benchmarks/Qt3DBench/Qt3DBenchFrameGraph.qml @@ -42,7 +42,7 @@ FrameGraph { clearColor: Qt.rgba(0.0, 0.0, 0.0, 1.0) RenderPassFilter { - includes: [ Annotation { name: "pass"; value: "shadowmap" } ] + includes: [ FilterKey { name: "pass"; value: "shadowmap" } ] RenderTargetSelector { target: RenderTarget { @@ -80,7 +80,7 @@ FrameGraph { } RenderPassFilter { - includes: [ Annotation { name: "pass"; value: "forward" } ] + includes: [ FilterKey { name: "pass"; value: "forward" } ] ClearBuffer { buffers : ClearBuffer.ColorDepthBuffer diff --git a/tests/benchmarks/Qt3DBench/ShadowEffect.qml b/tests/benchmarks/Qt3DBench/ShadowEffect.qml index 12d69d4ae..f1f39cfb4 100644 --- a/tests/benchmarks/Qt3DBench/ShadowEffect.qml +++ b/tests/benchmarks/Qt3DBench/ShadowEffect.qml @@ -47,7 +47,7 @@ Effect { Technique { renderPasses: [ RenderPass { - annotations: [ Annotation { name: "pass"; value: "shadowmap" } ] + filterKeys: [ FilterKey { name: "pass"; value: "shadowmap" } ] shaderProgram: ShaderProgram { vertexShaderCode: loadSource("qrc:/shaders/shadowmap.vert") @@ -61,7 +61,7 @@ Effect { }, RenderPass { - annotations: [ Annotation { name: "pass"; value: "forward" } ] + filterKeys: [ FilterKey { name: "pass"; value: "forward" } ] bindings: [ ParameterMapping { parameterName: "ambient"; shaderVariableName: "ka"; bindingType: ParameterMapping.Uniform }, |