diff options
Diffstat (limited to 'tests/auto/render/opengl')
19 files changed, 487 insertions, 7 deletions
diff --git a/tests/auto/render/opengl/CMakeLists.txt b/tests/auto/render/opengl/CMakeLists.txt new file mode 100644 index 000000000..f77c95aed --- /dev/null +++ b/tests/auto/render/opengl/CMakeLists.txt @@ -0,0 +1,21 @@ +# Generated from opengl.pro. + +add_subdirectory(filtercompatibletechniquejob) +add_subdirectory(graphicshelpergl3_3) +add_subdirectory(graphicshelpergl3_2) +add_subdirectory(graphicshelpergl2) +add_subdirectory(glshadermanager) +add_subdirectory(textures) +add_subdirectory(renderer) +add_subdirectory(renderviewutils) +add_subdirectory(renderviews) +add_subdirectory(renderqueue) +add_subdirectory(renderviewbuilder) +add_subdirectory(qgraphicsutils) +add_subdirectory(computecommand) +if(TARGET Qt::Quick) + add_subdirectory(materialparametergathererjob) +endif() +if(NOT MACOS) + add_subdirectory(graphicshelpergl4) +endif() diff --git a/tests/auto/render/opengl/computecommand/CMakeLists.txt b/tests/auto/render/opengl/computecommand/CMakeLists.txt new file mode 100644 index 000000000..c76abf6f1 --- /dev/null +++ b/tests/auto/render/opengl/computecommand/CMakeLists.txt @@ -0,0 +1,30 @@ +# Generated from computecommand.pro. + +##################################################################### +## tst_computecommand Test: +##################################################################### + +qt_add_test(tst_computecommandgl + SOURCES + tst_computecommand.cpp +) + +#### Keys ignored in scope 1:.:.:computecommand.pro:<TRUE>: +# TEMPLATE = "app" + +## Scopes: +##################################################################### + +include(../../commons/commons.cmake) +qt3d_setup_common_render_test(tst_computecommandgl USE_TEST_ASPECT) +include(${PROJECT_SOURCE_DIR}/src/plugins/renderers/opengl/opengl.cmake) +qt3d_setup_opengl_renderer_target(tst_computecommandgl) + +qt_extend_target(tst_computecommandgl CONDITION gcov + COMPILE_OPTIONS + -fprofile-arcs + -ftest-coverage + LINK_OPTIONS + "-fprofile-arcs" + "-ftest-coverage" +) diff --git a/tests/auto/render/opengl/computecommand/tst_computecommand.cpp b/tests/auto/render/opengl/computecommand/tst_computecommand.cpp index bbe999ce8..4f4f7a1fb 100644 --- a/tests/auto/render/opengl/computecommand/tst_computecommand.cpp +++ b/tests/auto/render/opengl/computecommand/tst_computecommand.cpp @@ -37,10 +37,9 @@ #include <Qt3DCore/private/qaspectmanager_p.h> #include <Qt3DCore/private/qscene_p.h> #include <renderer_p.h> -#include "qbackendnodetester.h" #include "testrenderer.h" #include "testarbiter.h" - +#include "qbackendnodetester.h" // tst_Renderer is a friend class of Renderer class tst_Renderer : public Qt3DRender::Render::OpenGL::Renderer diff --git a/tests/auto/render/opengl/filtercompatibletechniquejob/CMakeLists.txt b/tests/auto/render/opengl/filtercompatibletechniquejob/CMakeLists.txt new file mode 100644 index 000000000..1fa9bee37 --- /dev/null +++ b/tests/auto/render/opengl/filtercompatibletechniquejob/CMakeLists.txt @@ -0,0 +1,31 @@ +# Generated from filtercompatibletechniquejob.pro. + +##################################################################### +## tst_filtercompatibletechniquejob Test: +##################################################################### + +qt_add_test(tst_filtercompatibletechniquejob + SOURCES + tst_filtercompatibletechniquejob.cpp +) + +#### Keys ignored in scope 1:.:.:filtercompatibletechniquejob.pro:<TRUE>: +# TEMPLATE = "app" + +## Scopes: +##################################################################### + +include(../../commons/commons.cmake) +qt3d_setup_common_render_test(tst_filtercompatibletechniquejob USE_TEST_ASPECT) +qt3d_setup_common_test(tst_filtercompatibletechniquejob) +include(${PROJECT_SOURCE_DIR}/src/plugins/renderers/opengl/opengl.cmake) +qt3d_setup_opengl_renderer_target(tst_filtercompatibletechniquejob) + +qt_extend_target(tst_filtercompatibletechniquejob CONDITION gcov + COMPILE_OPTIONS + -fprofile-arcs + -ftest-coverage + LINK_OPTIONS + "-fprofile-arcs" + "-ftest-coverage" +) diff --git a/tests/auto/render/opengl/filtercompatibletechniquejob/tst_filtercompatibletechniquejob.cpp b/tests/auto/render/opengl/filtercompatibletechniquejob/tst_filtercompatibletechniquejob.cpp index e9dae6d97..556d99c3b 100644 --- a/tests/auto/render/opengl/filtercompatibletechniquejob/tst_filtercompatibletechniquejob.cpp +++ b/tests/auto/render/opengl/filtercompatibletechniquejob/tst_filtercompatibletechniquejob.cpp @@ -42,6 +42,8 @@ #include <submissioncontext_p.h> #include <filtercompatibletechniquejob_p.h> +#include "qbackendnodetester.h" + QT_BEGIN_NAMESPACE namespace Qt3DRender { diff --git a/tests/auto/render/opengl/glshadermanager/CMakeLists.txt b/tests/auto/render/opengl/glshadermanager/CMakeLists.txt new file mode 100644 index 000000000..0da95b156 --- /dev/null +++ b/tests/auto/render/opengl/glshadermanager/CMakeLists.txt @@ -0,0 +1,30 @@ +# Generated from glshadermanager.pro. + +##################################################################### +## tst_glshadermanager Test: +##################################################################### + +qt_add_test(tst_glshadermanager + SOURCES + tst_glshadermanager.cpp +) + +#### Keys ignored in scope 1:.:.:glshadermanager.pro:<TRUE>: +# TEMPLATE = "app" + +## Scopes: +##################################################################### + +include(../../commons/commons.cmake) +qt3d_setup_common_render_test(tst_glshadermanager USE_TEST_ASPECT) +include(${PROJECT_SOURCE_DIR}/src/plugins/renderers/opengl/opengl.cmake) +qt3d_setup_opengl_renderer_target(tst_glshadermanager) + +qt_extend_target(tst_glshadermanager CONDITION gcov + COMPILE_OPTIONS + -fprofile-arcs + -ftest-coverage + LINK_OPTIONS + "-fprofile-arcs" + "-ftest-coverage" +) diff --git a/tests/auto/render/opengl/graphicshelpergl2/CMakeLists.txt b/tests/auto/render/opengl/graphicshelpergl2/CMakeLists.txt new file mode 100644 index 000000000..427321382 --- /dev/null +++ b/tests/auto/render/opengl/graphicshelpergl2/CMakeLists.txt @@ -0,0 +1,30 @@ +# Generated from graphicshelpergl2.pro. + +##################################################################### +## tst_graphicshelpergl2 Test: +##################################################################### + +qt_add_test(tst_graphicshelpergl2 + SOURCES + tst_graphicshelpergl2.cpp +) + +#### Keys ignored in scope 1:.:.:graphicshelpergl2.pro:<TRUE>: +# TEMPLATE = "app" + +## Scopes: +##################################################################### + +include(../../commons/commons.cmake) +qt3d_setup_common_render_test(tst_graphicshelpergl2 USE_TEST_ASPECT) +include(${PROJECT_SOURCE_DIR}/src/plugins/renderers/opengl/opengl.cmake) +qt3d_setup_opengl_renderer_target(tst_graphicshelpergl2) + +qt_extend_target(tst_graphicshelpergl2 CONDITION gcov + COMPILE_OPTIONS + -fprofile-arcs + -ftest-coverage + LINK_OPTIONS + "-fprofile-arcs" + "-ftest-coverage" +) diff --git a/tests/auto/render/opengl/graphicshelpergl3_2/CMakeLists.txt b/tests/auto/render/opengl/graphicshelpergl3_2/CMakeLists.txt new file mode 100644 index 000000000..93a1e5e60 --- /dev/null +++ b/tests/auto/render/opengl/graphicshelpergl3_2/CMakeLists.txt @@ -0,0 +1,30 @@ +# Generated from graphicshelpergl3_2.pro. + +##################################################################### +## tst_graphicshelpergl3_2 Test: +##################################################################### + +qt_add_test(tst_graphicshelpergl3_2 + SOURCES + tst_graphicshelpergl3_2.cpp +) + +#### Keys ignored in scope 1:.:.:graphicshelpergl3_2.pro:<TRUE>: +# TEMPLATE = "app" + +## Scopes: +##################################################################### + +include(../../commons/commons.cmake) +qt3d_setup_common_render_test(tst_graphicshelpergl3_2 USE_TEST_ASPECT) +include(${PROJECT_SOURCE_DIR}/src/plugins/renderers/opengl/opengl.cmake) +qt3d_setup_opengl_renderer_target(tst_graphicshelpergl3_2) + +qt_extend_target(tst_graphicshelpergl3_2 CONDITION gcov + COMPILE_OPTIONS + -fprofile-arcs + -ftest-coverage + LINK_OPTIONS + "-fprofile-arcs" + "-ftest-coverage" +) diff --git a/tests/auto/render/opengl/graphicshelpergl3_3/CMakeLists.txt b/tests/auto/render/opengl/graphicshelpergl3_3/CMakeLists.txt new file mode 100644 index 000000000..028879f40 --- /dev/null +++ b/tests/auto/render/opengl/graphicshelpergl3_3/CMakeLists.txt @@ -0,0 +1,30 @@ +# Generated from graphicshelpergl3_3.pro. + +##################################################################### +## tst_graphicshelpergl3_3 Test: +##################################################################### + +qt_add_test(tst_graphicshelpergl3_3 + SOURCES + tst_graphicshelpergl3_3.cpp +) + +#### Keys ignored in scope 1:.:.:graphicshelpergl3_3.pro:<TRUE>: +# TEMPLATE = "app" + +## Scopes: +##################################################################### + +include(../../commons/commons.cmake) +qt3d_setup_common_render_test(tst_graphicshelpergl3_3 USE_TEST_ASPECT) +include(${PROJECT_SOURCE_DIR}/src/plugins/renderers/opengl/opengl.cmake) +qt3d_setup_opengl_renderer_target(tst_graphicshelpergl3_3) + +qt_extend_target(tst_graphicshelpergl3_3 CONDITION gcov + COMPILE_OPTIONS + -fprofile-arcs + -ftest-coverage + LINK_OPTIONS + "-fprofile-arcs" + "-ftest-coverage" +) diff --git a/tests/auto/render/opengl/graphicshelpergl4/CMakeLists.txt b/tests/auto/render/opengl/graphicshelpergl4/CMakeLists.txt new file mode 100644 index 000000000..4f466f0f2 --- /dev/null +++ b/tests/auto/render/opengl/graphicshelpergl4/CMakeLists.txt @@ -0,0 +1,30 @@ +# Generated from graphicshelpergl4.pro. + +##################################################################### +## tst_graphicshelpergl4 Test: +##################################################################### + +qt_add_test(tst_graphicshelpergl4 + SOURCES + tst_graphicshelpergl4.cpp +) + +#### Keys ignored in scope 1:.:.:graphicshelpergl4.pro:<TRUE>: +# TEMPLATE = "app" + +## Scopes: +##################################################################### + +include(../../commons/commons.cmake) +qt3d_setup_common_render_test(tst_graphicshelpergl4 USE_TEST_ASPECT) +include(${PROJECT_SOURCE_DIR}/src/plugins/renderers/opengl/opengl.cmake) +qt3d_setup_opengl_renderer_target(tst_graphicshelpergl4) + +qt_extend_target(tst_graphicshelpergl4 CONDITION gcov + COMPILE_OPTIONS + -fprofile-arcs + -ftest-coverage + LINK_OPTIONS + "-fprofile-arcs" + "-ftest-coverage" +) diff --git a/tests/auto/render/opengl/materialparametergathererjob/CMakeLists.txt b/tests/auto/render/opengl/materialparametergathererjob/CMakeLists.txt new file mode 100644 index 000000000..dfadad96e --- /dev/null +++ b/tests/auto/render/opengl/materialparametergathererjob/CMakeLists.txt @@ -0,0 +1,30 @@ +# Generated from materialparametergathererjob.pro. + +##################################################################### +## tst_materialparametergathererjob Test: +##################################################################### + +qt_add_test(tst_materialparametergathererjob + SOURCES + tst_materialparametergathererjob.cpp +) + +#### Keys ignored in scope 1:.:.:materialparametergathererjob.pro:<TRUE>: +# TEMPLATE = "app" + +## Scopes: +##################################################################### + +include(../../commons/commons.cmake) +qt3d_setup_common_render_test(tst_materialparametergathererjob) +include(${PROJECT_SOURCE_DIR}/src/plugins/renderers/opengl/opengl.cmake) +qt3d_setup_opengl_renderer_target(tst_materialparametergathererjob) + +qt_extend_target(tst_materialparametergathererjob CONDITION gcov + COMPILE_OPTIONS + -fprofile-arcs + -ftest-coverage + LINK_OPTIONS + "-fprofile-arcs" + "-ftest-coverage" +) diff --git a/tests/auto/render/opengl/qgraphicsutils/CMakeLists.txt b/tests/auto/render/opengl/qgraphicsutils/CMakeLists.txt new file mode 100644 index 000000000..06f00fd5a --- /dev/null +++ b/tests/auto/render/opengl/qgraphicsutils/CMakeLists.txt @@ -0,0 +1,30 @@ +# Generated from qgraphicsutils.pro. + +##################################################################### +## tst_qgraphicsutils Test: +##################################################################### + +qt_add_test(tst_qgraphicsutils + SOURCES + tst_qgraphicsutils.cpp +) + +#### Keys ignored in scope 1:.:.:qgraphicsutils.pro:<TRUE>: +# TEMPLATE = "app" + +## Scopes: +##################################################################### + +include(../../commons/commons.cmake) +qt3d_setup_common_render_test(tst_qgraphicsutils) +include(${PROJECT_SOURCE_DIR}/src/plugins/renderers/opengl/opengl.cmake) +qt3d_setup_opengl_renderer_target(tst_qgraphicsutils) + +qt_extend_target(tst_qgraphicsutils CONDITION gcov + COMPILE_OPTIONS + -fprofile-arcs + -ftest-coverage + LINK_OPTIONS + "-fprofile-arcs" + "-ftest-coverage" +) diff --git a/tests/auto/render/opengl/renderer/CMakeLists.txt b/tests/auto/render/opengl/renderer/CMakeLists.txt new file mode 100644 index 000000000..9cac82016 --- /dev/null +++ b/tests/auto/render/opengl/renderer/CMakeLists.txt @@ -0,0 +1,35 @@ +# Generated from renderer.pro. + +##################################################################### +## tst_renderer Test: +##################################################################### + +qt_add_test(tst_renderer + SOURCES + tst_renderer.cpp +) + +#### Keys ignored in scope 1:.:.:renderer.pro:<TRUE>: +# TEMPLATE = "app" + +## Scopes: +##################################################################### + +include(../../commons/commons.cmake) +qt3d_setup_common_render_test(tst_renderer USE_TEST_ASPECT) +include(${PROJECT_SOURCE_DIR}/src/plugins/renderers/opengl/opengl.cmake) +qt3d_setup_opengl_renderer_target(tst_renderer) + +qt_extend_target(tst_renderer CONDITION gcov + COMPILE_OPTIONS + -fprofile-arcs + -ftest-coverage + LINK_OPTIONS + "-fprofile-arcs" + "-ftest-coverage" +) + +qt_extend_target(tst_renderer CONDITION useCommonTestAspect + SOURCES + ../../commons/testaspect.cpp ../../commons/testaspect.h +) diff --git a/tests/auto/render/opengl/renderqueue/CMakeLists.txt b/tests/auto/render/opengl/renderqueue/CMakeLists.txt new file mode 100644 index 000000000..940aa1f65 --- /dev/null +++ b/tests/auto/render/opengl/renderqueue/CMakeLists.txt @@ -0,0 +1,30 @@ +# Generated from renderqueue.pro. + +##################################################################### +## tst_renderqueue Test: +##################################################################### + +qt_add_test(tst_renderqueue + SOURCES + tst_renderqueue.cpp +) + +#### Keys ignored in scope 1:.:.:renderqueue.pro:<TRUE>: +# TEMPLATE = "app" + +## Scopes: +##################################################################### + +include(../../commons/commons.cmake) +qt3d_setup_common_render_test(tst_renderqueue USE_TEST_ASPECT) +include(${PROJECT_SOURCE_DIR}/src/plugins/renderers/opengl/opengl.cmake) +qt3d_setup_opengl_renderer_target(tst_renderqueue) + +qt_extend_target(tst_renderqueue CONDITION gcov + COMPILE_OPTIONS + -fprofile-arcs + -ftest-coverage + LINK_OPTIONS + "-fprofile-arcs" + "-ftest-coverage" +) diff --git a/tests/auto/render/opengl/renderviewbuilder/CMakeLists.txt b/tests/auto/render/opengl/renderviewbuilder/CMakeLists.txt new file mode 100644 index 000000000..1e47584be --- /dev/null +++ b/tests/auto/render/opengl/renderviewbuilder/CMakeLists.txt @@ -0,0 +1,30 @@ +# Generated from renderviewbuilder.pro. + +##################################################################### +## tst_renderviewbuilder Test: +##################################################################### + +qt_add_test(tst_renderviewbuilder + SOURCES + tst_renderviewbuilder.cpp +) + +#### Keys ignored in scope 1:.:.:renderviewbuilder.pro:<TRUE>: +# TEMPLATE = "app" + +## Scopes: +##################################################################### + +include(../../commons/commons.cmake) +qt3d_setup_common_render_test(tst_renderviewbuilder) +include(${PROJECT_SOURCE_DIR}/src/plugins/renderers/opengl/opengl.cmake) +qt3d_setup_opengl_renderer_target(tst_renderviewbuilder) + +qt_extend_target(tst_renderviewbuilder CONDITION gcov + COMPILE_OPTIONS + -fprofile-arcs + -ftest-coverage + LINK_OPTIONS + "-fprofile-arcs" + "-ftest-coverage" +) diff --git a/tests/auto/render/opengl/renderviewbuilder/tst_renderviewbuilder.cpp b/tests/auto/render/opengl/renderviewbuilder/tst_renderviewbuilder.cpp index f092795e3..8e929e5da 100644 --- a/tests/auto/render/opengl/renderviewbuilder/tst_renderviewbuilder.cpp +++ b/tests/auto/render/opengl/renderviewbuilder/tst_renderviewbuilder.cpp @@ -87,10 +87,7 @@ public: }); } - ~TestAspect() - { - QRenderAspect::onUnregistered(); - } + ~TestAspect(); Qt3DRender::Render::NodeManagers *nodeManagers() const { @@ -116,6 +113,11 @@ private: QScopedPointer<Qt3DCore::QAspectJobManager> m_jobManager; }; +TestAspect::~TestAspect() +{ + QRenderAspect::onUnregistered(); +} + } // namespace Qt3DRender QT_END_NAMESPACE @@ -526,8 +528,8 @@ private Q_SLOTS: Qt3DRender::QTechniqueFilter *techniqueFilter = new Qt3DRender::QTechniqueFilter(frustumCulling); Qt3DRender::QRenderPassFilter *renderPassFilter = new Qt3DRender::QRenderPassFilter(techniqueFilter); Qt3DRender::QLayer *layer = new Qt3DRender::QLayer(); - layerFilter->addLayer(layer); + Qt3DRender::TestAspect testAspect(buildSimpleScene(viewport)); // THEN diff --git a/tests/auto/render/opengl/renderviews/CMakeLists.txt b/tests/auto/render/opengl/renderviews/CMakeLists.txt new file mode 100644 index 000000000..4a675c02e --- /dev/null +++ b/tests/auto/render/opengl/renderviews/CMakeLists.txt @@ -0,0 +1,30 @@ +# Generated from renderviews.pro. + +##################################################################### +## tst_renderviews Test: +##################################################################### + +qt_add_test(tst_renderviews + SOURCES + tst_renderviews.cpp +) + +#### Keys ignored in scope 1:.:.:renderviews.pro:<TRUE>: +# TEMPLATE = "app" + +## Scopes: +##################################################################### + +include(../../commons/commons.cmake) +qt3d_setup_common_render_test(tst_renderviews USE_TEST_ASPECT) +include(${PROJECT_SOURCE_DIR}/src/plugins/renderers/opengl/opengl.cmake) +qt3d_setup_opengl_renderer_target(tst_renderviews) + +qt_extend_target(tst_renderviews CONDITION gcov + COMPILE_OPTIONS + -fprofile-arcs + -ftest-coverage + LINK_OPTIONS + "-fprofile-arcs" + "-ftest-coverage" +) diff --git a/tests/auto/render/opengl/renderviewutils/CMakeLists.txt b/tests/auto/render/opengl/renderviewutils/CMakeLists.txt new file mode 100644 index 000000000..10cb1e0c7 --- /dev/null +++ b/tests/auto/render/opengl/renderviewutils/CMakeLists.txt @@ -0,0 +1,30 @@ +# Generated from renderviewutils.pro. + +##################################################################### +## tst_renderviewutils Test: +##################################################################### + +qt_add_test(tst_renderviewutils + SOURCES + tst_renderviewutils.cpp +) + +#### Keys ignored in scope 1:.:.:renderviewutils.pro:<TRUE>: +# TEMPLATE = "app" + +## Scopes: +##################################################################### + +include(../../commons/commons.cmake) +qt3d_setup_common_render_test(tst_renderviewutils USE_TEST_ASPECT) +include(${PROJECT_SOURCE_DIR}/src/plugins/renderers/opengl/opengl.cmake) +qt3d_setup_opengl_renderer_target(tst_renderviewutils) + +qt_extend_target(tst_renderviewutils CONDITION gcov + COMPILE_OPTIONS + -fprofile-arcs + -ftest-coverage + LINK_OPTIONS + "-fprofile-arcs" + "-ftest-coverage" +) diff --git a/tests/auto/render/opengl/textures/CMakeLists.txt b/tests/auto/render/opengl/textures/CMakeLists.txt new file mode 100644 index 000000000..59bdc8923 --- /dev/null +++ b/tests/auto/render/opengl/textures/CMakeLists.txt @@ -0,0 +1,30 @@ +# Generated from textures.pro. + +##################################################################### +## tst_textures Test: +##################################################################### + +qt_add_test(tst_textures + SOURCES + tst_textures.cpp +) + +#### Keys ignored in scope 1:.:.:textures.pro:<TRUE>: +# TEMPLATE = "app" + +## Scopes: +##################################################################### + +include(../../commons/commons.cmake) +qt3d_setup_common_render_test(tst_textures USE_TEST_ASPECT) +include(${PROJECT_SOURCE_DIR}/src/plugins/renderers/opengl/opengl.cmake) +qt3d_setup_opengl_renderer_target(tst_textures) + +qt_extend_target(tst_textures CONDITION gcov + COMPILE_OPTIONS + -fprofile-arcs + -ftest-coverage + LINK_OPTIONS + "-fprofile-arcs" + "-ftest-coverage" +) |