summaryrefslogtreecommitdiffstats
path: root/tests/benchmarks/render
diff options
context:
space:
mode:
Diffstat (limited to 'tests/benchmarks/render')
-rw-r--r--tests/benchmarks/render/jobs/jobs.pro13
-rw-r--r--tests/benchmarks/render/jobs/tst_bench_jobs.cpp2
-rw-r--r--tests/benchmarks/render/layerfiltering/layerfiltering.pro14
-rw-r--r--tests/benchmarks/render/layerfiltering/tst_bench_layerfiltering.cpp2
-rw-r--r--tests/benchmarks/render/materialparametergathering/materialparametergathering.pro17
-rw-r--r--tests/benchmarks/render/materialparametergathering/tst_bench_materialparametergathering.cpp2
-rw-r--r--tests/benchmarks/render/opengl/opengl.pro4
-rw-r--r--tests/benchmarks/render/opengl/opengl_render_plugin.pri18
-rw-r--r--tests/benchmarks/render/opengl/shaderparameterpack/shaderparameterpack.pro17
-rw-r--r--tests/benchmarks/render/opengl/shaderparameterpack/tst_bench_shaderparameterpack.cpp2
-rw-r--r--tests/benchmarks/render/render.pro10
11 files changed, 4 insertions, 97 deletions
diff --git a/tests/benchmarks/render/jobs/jobs.pro b/tests/benchmarks/render/jobs/jobs.pro
deleted file mode 100644
index 71b0ef409..000000000
--- a/tests/benchmarks/render/jobs/jobs.pro
+++ /dev/null
@@ -1,13 +0,0 @@
-TARGET = tst_bench_jobs
-
-TEMPLATE = app
-
-QT += testlib core core-private 3dcore 3dcore-private 3drender 3drender-private 3dquick qml 3dextras
-
-SOURCES += tst_bench_jobs.cpp
-
-DEFINES += QT3D_RENDER_UNIT_TESTS
-DEFINES += QT_BUILD_INTERNAL
-
-# Link Against OpenGL Renderer Plugin
-include(../../../auto/render/opengl/opengl_render_plugin.pri)
diff --git a/tests/benchmarks/render/jobs/tst_bench_jobs.cpp b/tests/benchmarks/render/jobs/tst_bench_jobs.cpp
index 759469a47..e910c1905 100644
--- a/tests/benchmarks/render/jobs/tst_bench_jobs.cpp
+++ b/tests/benchmarks/render/jobs/tst_bench_jobs.cpp
@@ -1,5 +1,5 @@
// Copyright (C) 2014 Klaralvdalens Datakonsult AB (KDAB).
-// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only
#include <QtTest/QtTest>
#include <QMatrix4x4>
diff --git a/tests/benchmarks/render/layerfiltering/layerfiltering.pro b/tests/benchmarks/render/layerfiltering/layerfiltering.pro
deleted file mode 100644
index 08b2b7165..000000000
--- a/tests/benchmarks/render/layerfiltering/layerfiltering.pro
+++ /dev/null
@@ -1,14 +0,0 @@
-TEMPLATE = app
-
-TARGET = tst_bench_layerfiltering
-
-QT += core-private 3dcore 3dcore-private 3drender 3drender-private testlib
-
-CONFIG += testcase
-
-SOURCES += tst_bench_layerfiltering.cpp
-
-include(../../../auto/render/commons/commons.pri)
-
-# Needed to use the TestAspect
-DEFINES += QT_BUILD_INTERNAL
diff --git a/tests/benchmarks/render/layerfiltering/tst_bench_layerfiltering.cpp b/tests/benchmarks/render/layerfiltering/tst_bench_layerfiltering.cpp
index 3b31fef64..4bf6d0716 100644
--- a/tests/benchmarks/render/layerfiltering/tst_bench_layerfiltering.cpp
+++ b/tests/benchmarks/render/layerfiltering/tst_bench_layerfiltering.cpp
@@ -1,5 +1,5 @@
// Copyright (C) 2016 Paul Lemire
-// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only
#include <QtTest/QtTest>
#include <Qt3DCore/qentity.h>
diff --git a/tests/benchmarks/render/materialparametergathering/materialparametergathering.pro b/tests/benchmarks/render/materialparametergathering/materialparametergathering.pro
deleted file mode 100644
index a20372163..000000000
--- a/tests/benchmarks/render/materialparametergathering/materialparametergathering.pro
+++ /dev/null
@@ -1,17 +0,0 @@
-TEMPLATE = app
-
-TARGET = tst_bench_materialparametergathering
-
-QT += core-private 3dcore 3dcore-private 3drender 3drender-private 3dextras testlib
-
-CONFIG += testcase
-
-SOURCES += tst_bench_materialparametergathering.cpp
-
-include(../../../auto/render/commons/commons.pri)
-
-# Needed to use the TestAspect
-DEFINES += QT_BUILD_INTERNAL
-
-# Link Against OpenGL Renderer Plugin
-include(../../../auto/render/opengl/opengl_render_plugin.pri)
diff --git a/tests/benchmarks/render/materialparametergathering/tst_bench_materialparametergathering.cpp b/tests/benchmarks/render/materialparametergathering/tst_bench_materialparametergathering.cpp
index 5ef55a117..b97110304 100644
--- a/tests/benchmarks/render/materialparametergathering/tst_bench_materialparametergathering.cpp
+++ b/tests/benchmarks/render/materialparametergathering/tst_bench_materialparametergathering.cpp
@@ -1,5 +1,5 @@
// Copyright (C) 2016 Paul Lemire
-// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only
#include <QtTest/QTest>
#include <Qt3DCore/qentity.h>
diff --git a/tests/benchmarks/render/opengl/opengl.pro b/tests/benchmarks/render/opengl/opengl.pro
deleted file mode 100644
index 4fdf80256..000000000
--- a/tests/benchmarks/render/opengl/opengl.pro
+++ /dev/null
@@ -1,4 +0,0 @@
-TEMPLATE = subdirs
-
-SUBDIRS += \
- shaderparameterpack
diff --git a/tests/benchmarks/render/opengl/opengl_render_plugin.pri b/tests/benchmarks/render/opengl/opengl_render_plugin.pri
deleted file mode 100644
index 50fade878..000000000
--- a/tests/benchmarks/render/opengl/opengl_render_plugin.pri
+++ /dev/null
@@ -1,18 +0,0 @@
-# Found no way of having the test runner include the correct
-# library path as runtime
-
-#PLUGIN_SRC_PATH = $$PWD/../../../../src/plugins/renderers/opengl
-
-#INCLUDEPATH += \
-# $$PLUGIN_SRC_PATH/graphicshelpers \
-# $$PLUGIN_SRC_PATH/io \
-# $$PLUGIN_SRC_PATH/jobs \
-# $$PLUGIN_SRC_PATH/managers \
-# $$PLUGIN_SRC_PATH/renderer \
-# $$PLUGIN_SRC_PATH/renderstates \
-# $$PLUGIN_SRC_PATH/textures
-
-#LIBS += -L$$[QT_INSTALL_PLUGINS]/renderers/ -lopenglrenderer
-
-# Instead we link against the sources directly
-include(../../../../src/plugins/renderers/opengl/opengl.pri)
diff --git a/tests/benchmarks/render/opengl/shaderparameterpack/shaderparameterpack.pro b/tests/benchmarks/render/opengl/shaderparameterpack/shaderparameterpack.pro
deleted file mode 100644
index 4943a5e91..000000000
--- a/tests/benchmarks/render/opengl/shaderparameterpack/shaderparameterpack.pro
+++ /dev/null
@@ -1,17 +0,0 @@
-TEMPLATE = app
-
-TARGET = tst_bench_shaderparameterpack
-
-QT += core-private 3dcore 3dcore-private 3drender 3drender-private testlib
-
-CONFIG += testcase
-
-SOURCES += tst_bench_shaderparameterpack.cpp
-
-include(../../../../auto/render/commons/commons.pri)
-
-# Needed to use the TestAspect
-DEFINES += QT_BUILD_INTERNAL
-
-# Link Against OpenGL Renderer Plugin
-include(../opengl_render_plugin.pri)
diff --git a/tests/benchmarks/render/opengl/shaderparameterpack/tst_bench_shaderparameterpack.cpp b/tests/benchmarks/render/opengl/shaderparameterpack/tst_bench_shaderparameterpack.cpp
index 2c626f7f2..2586cc6c2 100644
--- a/tests/benchmarks/render/opengl/shaderparameterpack/tst_bench_shaderparameterpack.cpp
+++ b/tests/benchmarks/render/opengl/shaderparameterpack/tst_bench_shaderparameterpack.cpp
@@ -1,5 +1,5 @@
// Copyright (C) 2020 Klaralvdalens Datakonsult AB (KDAB).
-// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only
#include <QtTest/QTest>
#include <Qt3DRender/private/uniform_p.h>
diff --git a/tests/benchmarks/render/render.pro b/tests/benchmarks/render/render.pro
deleted file mode 100644
index 96f2c306c..000000000
--- a/tests/benchmarks/render/render.pro
+++ /dev/null
@@ -1,10 +0,0 @@
-TEMPLATE=subdirs
-
-qtConfig(private_tests) {
- SUBDIRS += layerfiltering \
- materialparametergathering \
- opengl
-
- qtHaveModule(quick): \
- SUBDIRS += jobs
-}