summaryrefslogtreecommitdiffstats
path: root/tests/auto/render/opengl/renderviews/tst_renderviews.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'tests/auto/render/opengl/renderviews/tst_renderviews.cpp')
-rw-r--r--tests/auto/render/opengl/renderviews/tst_renderviews.cpp20
1 files changed, 12 insertions, 8 deletions
diff --git a/tests/auto/render/opengl/renderviews/tst_renderviews.cpp b/tests/auto/render/opengl/renderviews/tst_renderviews.cpp
index d30b8ddca..0b1e22909 100644
--- a/tests/auto/render/opengl/renderviews/tst_renderviews.cpp
+++ b/tests/auto/render/opengl/renderviews/tst_renderviews.cpp
@@ -48,6 +48,8 @@ namespace Qt3DRender {
namespace Render {
+namespace OpenGL {
+
namespace {
void compareShaderParameterPacks(const ShaderParameterPack &t1,
@@ -127,7 +129,7 @@ private Q_SLOTS:
QCOMPARE(backendBarrier.waitOperations(), barriers);
// WHEN
- Qt3DRender::Render::setRenderViewConfigFromFrameGraphLeafNode(&renderView, &backendBarrier);
+ Qt3DRender::Render::OpenGL::setRenderViewConfigFromFrameGraphLeafNode(&renderView, &backendBarrier);
// THEN
QCOMPARE(backendBarrier.waitOperations(), renderView.memoryBarrier());
@@ -139,7 +141,7 @@ private Q_SLOTS:
{
// GIVEN
Qt3DRender::Render::NodeManagers nodeManagers;
- Qt3DRender::Render::Renderer renderer(Qt3DRender::QRenderAspect::Synchronous);
+ Renderer renderer(Qt3DRender::QRenderAspect::Synchronous);
RenderView renderView;
QVector<RenderCommand> rawCommands;
QVector<QSortPolicy::SortType> sortTypes;
@@ -174,7 +176,7 @@ private Q_SLOTS:
{
// GIVEN
Qt3DRender::Render::NodeManagers nodeManagers;
- Qt3DRender::Render::Renderer renderer(Qt3DRender::QRenderAspect::Synchronous);
+ Renderer renderer(Qt3DRender::QRenderAspect::Synchronous);
RenderView renderView;
QVector<RenderCommand> rawCommands;
QVector<QSortPolicy::SortType> sortTypes;
@@ -266,7 +268,7 @@ private Q_SLOTS:
QFETCH(QVector<ShaderParameterPack>, expectedMinimizedParameters);
Qt3DRender::Render::NodeManagers nodeManagers;
- Qt3DRender::Render::Renderer renderer(Qt3DRender::QRenderAspect::Synchronous);
+ Renderer renderer(Qt3DRender::QRenderAspect::Synchronous);
renderer.setNodeManagers(&nodeManagers);
GLShaderManager *shaderManager = renderer.glResourceManagers()->glShaderManager();
@@ -312,7 +314,7 @@ private Q_SLOTS:
{
// GIVEN
Qt3DRender::Render::NodeManagers nodeManagers;
- Qt3DRender::Render::Renderer renderer(Qt3DRender::QRenderAspect::Synchronous);
+ Renderer renderer(Qt3DRender::QRenderAspect::Synchronous);
RenderView renderView;
QVector<RenderCommand> rawCommands;
QVector<QSortPolicy::SortType> sortTypes;
@@ -347,7 +349,7 @@ private Q_SLOTS:
{
// GIVEN
Qt3DRender::Render::NodeManagers nodeManagers;
- Qt3DRender::Render::Renderer renderer(Qt3DRender::QRenderAspect::Synchronous);
+ Renderer renderer(Qt3DRender::QRenderAspect::Synchronous);
RenderView renderView;
QVector<RenderCommand> rawCommands;
QVector<QSortPolicy::SortType> sortTypes;
@@ -382,7 +384,7 @@ private Q_SLOTS:
{
// GIVEN
Qt3DRender::Render::NodeManagers nodeManagers;
- Qt3DRender::Render::Renderer renderer(Qt3DRender::QRenderAspect::Synchronous);
+ Renderer renderer(Qt3DRender::QRenderAspect::Synchronous);
RenderView renderView;
QVector<RenderCommand> rawCommands;
QVector<QSortPolicy::SortType> sortTypes;
@@ -542,6 +544,8 @@ private Q_SLOTS:
private:
};
+} // OpenGL
+
} // Render
} // Qt3DRender
@@ -549,6 +553,6 @@ private:
QT_END_NAMESPACE
//APPLESS_
-QTEST_MAIN(Qt3DRender::Render::tst_RenderViews)
+QTEST_MAIN(Qt3DRender::Render::OpenGL::tst_RenderViews)
#include "tst_renderviews.moc"