Move classes in OpenGL renderer plugin into an OpenGL namespace

Change-Id: I5314da1df7fbfd1b6db4412e7bc71231525d9de2
Reviewed-by: Mike Krus <mike.krus@kdab.com>

26 files changed, 144 insertions, 81 deletions

diff --git a/src/plugins/renderers/opengl/graphicshelpers/graphicscontext.cpp b/src/plugins/renderers/opengl/graphicshelpers/graphicscontext.cpp
index abe11fd4d..a4152449f 100644
--- a/src/plugins/renderers/opengl/graphicshelpers/graphicscontext.cpp
+++ b/src/plugins/renderers/opengl/graphicshelpers/graphicscontext.cpp
@@ -118,6 +118,7 @@ QOpenGLShader::ShaderType shaderType(Qt3DRender::QShaderProgram::ShaderType type
 
 namespace Qt3DRender {
 namespace Render {
+namespace OpenGL {
 
 namespace {
 
@@ -324,7 +325,7 @@ void GraphicsContext::loadShader(Shader *shaderNode,
     }
     shaderNode->unsetDirty();
     // Ensure we will rebuilt material caches
-    shaderNode->markDirty(AbstractRenderer::AllDirty);
+    shaderNode->requestCacheRebuild();
 }
 
 void GraphicsContext::activateDrawBuffers(const AttachmentPack &attachments)
@@ -1022,6 +1023,7 @@ QT3D_UNIFORM_TYPE_IMPL(UniformType::Mat4x2, float, glUniformMatrix4x2fv)
 QT3D_UNIFORM_TYPE_IMPL(UniformType::Mat3x4, float, glUniformMatrix3x4fv)
 QT3D_UNIFORM_TYPE_IMPL(UniformType::Mat4x3, float, glUniformMatrix4x3fv)
 
+} // namespace OpenGL
 } // namespace Render
 } // namespace Qt3DRender of namespace
 
diff --git a/src/plugins/renderers/opengl/graphicshelpers/graphicscontext_p.h b/src/plugins/renderers/opengl/graphicshelpers/graphicscontext_p.h
index 07df3e9e4..5d122f450 100644
--- a/src/plugins/renderers/opengl/graphicshelpers/graphicscontext_p.h
+++ b/src/plugins/renderers/opengl/graphicshelpers/graphicscontext_p.h
@@ -38,8 +38,8 @@
 **
 ****************************************************************************/
 
-#ifndef QT3DRENDER_RENDER_GRAPHICSCONTEXT_H
-#define QT3DRENDER_RENDER_GRAPHICSCONTEXT_H
+#ifndef QT3DRENDER_RENDER_OPENGL_GRAPHICSCONTEXT_H
+#define QT3DRENDER_RENDER_OPENGL_GRAPHICSCONTEXT_H
 
 //
 //  W A R N I N G
@@ -84,10 +84,13 @@ namespace Qt3DRender {
 
 namespace Render {
 
-class GraphicsHelperInterface;
 class RenderTarget;
 class AttachmentPack;
 class ShaderManager;
+
+namespace OpenGL {
+
+class GraphicsHelperInterface;
 class GLShader;
 class GLShaderManager;
 
@@ -256,9 +259,10 @@ QT3D_UNIFORM_TYPE_PROTO(UniformType::Mat4x2, float, glUniformMatrix4x2fv)
 QT3D_UNIFORM_TYPE_PROTO(UniformType::Mat3x4, float, glUniformMatrix3x4fv)
 QT3D_UNIFORM_TYPE_PROTO(UniformType::Mat4x3, float, glUniformMatrix4x3fv)
 
+} // namespace OpenGL
 } // namespace Render
 } // namespace Qt3DRender
 
 QT_END_NAMESPACE
 
-#endif // QT3DRENDER_RENDER_GRAPHICSCONTEXT_H
+#endif // QT3DRENDER_RENDER_OPENGL_GRAPHICSCONTEXT_H
diff --git a/src/plugins/renderers/opengl/graphicshelpers/graphicshelperes2.cpp b/src/plugins/renderers/opengl/graphicshelpers/graphicshelperes2.cpp
index ba00325b1..3ae9ed932 100644
--- a/src/plugins/renderers/opengl/graphicshelpers/graphicshelperes2.cpp
+++ b/src/plugins/renderers/opengl/graphicshelpers/graphicshelperes2.cpp
@@ -38,12 +38,13 @@
 ****************************************************************************/
 
 #include "graphicshelperes2_p.h"
-#include <Qt3DRender/private/renderlogging_p.h>
 #include <private/attachmentpack_p.h>
 #include <qgraphicsutils_p.h>
 #include <renderbuffer_p.h>
+#include <logging_p.h>
 #include <QtGui/private/qopenglextensions_p.h>
 
+
 QT_BEGIN_NAMESPACE
 
 // ES 3.0+
@@ -65,6 +66,7 @@ QT_BEGIN_NAMESPACE
 
 namespace Qt3DRender {
 namespace Render {
+namespace OpenGL {
 
 GraphicsHelperES2::GraphicsHelperES2()
     : m_funcs(0)
@@ -293,7 +295,7 @@ void GraphicsHelperES2::vertexAttributePointer(GLenum shaderDataType,
         break;
 
     default:
-        qCWarning(Render::Rendering) << "vertexAttribPointer: Unhandled type";
+        qCWarning(Rendering) << "vertexAttribPointer: Unhandled type";
         Q_UNREACHABLE();
     }
 }
@@ -387,7 +389,7 @@ void GraphicsHelperES2::blendFuncSeparatei(GLuint buf, GLenum sRGB, GLenum dRGB,
 
 void GraphicsHelperES2::alphaTest(GLenum, GLenum)
 {
-    qCWarning(Render::Rendering) << Q_FUNC_INFO << "AlphaTest not available with OpenGL ES 2.0";
+    qCWarning(Rendering) << Q_FUNC_INFO << "AlphaTest not available with OpenGL ES 2.0";
 }
 
 void GraphicsHelperES2::depthTest(GLenum mode)
@@ -1028,6 +1030,7 @@ void GraphicsHelperES2::blitFramebuffer(GLint srcX0, GLint srcY0, GLint srcX1, G
         m_ext->glBlitFramebuffer(srcX0, srcY0, srcX1, srcY1, dstX0, dstY0, dstX1, dstY1, mask, filter);
 }
 
+} // namespace OpenGL
 } // namespace Render
 } // namespace Qt3DRender
 
diff --git a/src/plugins/renderers/opengl/graphicshelpers/graphicshelperes2_p.h b/src/plugins/renderers/opengl/graphicshelpers/graphicshelperes2_p.h
index 902bd5fb2..9f820c72b 100644
--- a/src/plugins/renderers/opengl/graphicshelpers/graphicshelperes2_p.h
+++ b/src/plugins/renderers/opengl/graphicshelpers/graphicshelperes2_p.h
@@ -37,8 +37,8 @@
 **
 ****************************************************************************/
 
-#ifndef QT3DRENDER_RENDER_GRAPHICSHELPERES2_H
-#define QT3DRENDER_RENDER_GRAPHICSHELPERES2_H
+#ifndef QT3DRENDER_RENDER_OPENGL_GRAPHICSHELPERES2_H
+#define QT3DRENDER_RENDER_OPENGL_GRAPHICSHELPERES2_H
 
 //
 //  W A R N I N G
@@ -61,6 +61,7 @@ class QOpenGLExtensions;
 
 namespace Qt3DRender {
 namespace Render {
+namespace OpenGL {
 
 class GraphicsHelperES2 : public GraphicsHelperInterface
 {
@@ -174,9 +175,10 @@ protected:
     QScopedPointer<QOpenGLExtensions> m_ext;
 };
 
+} // namespace OpenGL
 } // namespace Render
 } // namespace Qt3DRender
 
 QT_END_NAMESPACE
 
-#endif // QT3DRENDER_RENDER_GRAPHICSHELPERES2_H
+#endif // QT3DRENDER_RENDER_OPENGL_GRAPHICSHELPERES2_H
diff --git a/src/plugins/renderers/opengl/graphicshelpers/graphicshelperes3.cpp b/src/plugins/renderers/opengl/graphicshelpers/graphicshelperes3.cpp
index 6e299199f..97a256b9c 100644
--- a/src/plugins/renderers/opengl/graphicshelpers/graphicshelperes3.cpp
+++ b/src/plugins/renderers/opengl/graphicshelpers/graphicshelperes3.cpp
@@ -41,7 +41,7 @@
 #include "graphicshelperes3_p.h"
 #include <private/attachmentpack_p.h>
 #include <qgraphicsutils_p.h>
-#include <private/renderlogging_p.h>
+#include <logging_p.h>
 #include <QOpenGLExtraFunctions>
 
 QT_BEGIN_NAMESPACE
@@ -169,6 +169,7 @@ QT_BEGIN_NAMESPACE
 
 namespace Qt3DRender {
 namespace Render {
+namespace OpenGL {
 
 GraphicsHelperES3::GraphicsHelperES3()
 {
@@ -249,7 +250,7 @@ void GraphicsHelperES3::vertexAttributePointer(GLenum shaderDataType,
         break;
 
     default:
-        qCWarning(Render::Rendering) << "vertexAttribPointer: Unhandled type";
+        qCWarning(Rendering) << "vertexAttribPointer: Unhandled type";
         Q_UNREACHABLE();
     }
 }
@@ -733,7 +734,7 @@ QVector<ShaderUniform> GraphicsHelperES3::programUniformsAndLocations(GLuint pro
         m_extraFuncs->glGetActiveUniformsiv(programId, 1, (GLuint*)&i, GL_UNIFORM_MATRIX_STRIDE, &uniform.m_matrixStride);
         uniform.m_rawByteSize = uniformByteSize(uniform);
         uniforms.append(uniform);
-        qCDebug(Render::Rendering) << uniform.m_name << "size" << uniform.m_size
+        qCDebug(Rendering) << uniform.m_name << "size" << uniform.m_size
                                    << " offset" << uniform.m_offset
                                    << " rawSize" << uniform.m_rawByteSize;
     }
@@ -762,6 +763,7 @@ QVector<ShaderUniformBlock> GraphicsHelperES3::programUniformBlocks(GLuint progr
     return blocks;
 }
 
+} // namespace OpenGL
 } // namespace Render
 } // namespace Qt3DRender
 
diff --git a/src/plugins/renderers/opengl/graphicshelpers/graphicshelperes3_1.cpp b/src/plugins/renderers/opengl/graphicshelpers/graphicshelperes3_1.cpp
index dc042b0c6..692e0880b 100644
--- a/src/plugins/renderers/opengl/graphicshelpers/graphicshelperes3_1.cpp
+++ b/src/plugins/renderers/opengl/graphicshelpers/graphicshelperes3_1.cpp
@@ -150,6 +150,7 @@ QT_BEGIN_NAMESPACE
 
 namespace Qt3DRender {
 namespace Render {
+namespace OpenGL {
 
 namespace {
 
@@ -361,6 +362,7 @@ void GraphicsHelperES3_1::buildUniformBuffer(const QVariant &v, const ShaderUnif
     }
 }
 
+} // namespace OpenGL
 } // namespace Render
 } // namespace Qt3DRender
 
diff --git a/src/plugins/renderers/opengl/graphicshelpers/graphicshelperes3_1_p.h b/src/plugins/renderers/opengl/graphicshelpers/graphicshelperes3_1_p.h
index 7eab61c60..408db0766 100644
--- a/src/plugins/renderers/opengl/graphicshelpers/graphicshelperes3_1_p.h
+++ b/src/plugins/renderers/opengl/graphicshelpers/graphicshelperes3_1_p.h
@@ -57,6 +57,7 @@ QT_BEGIN_NAMESPACE
 
 namespace Qt3DRender {
 namespace Render {
+namespace OpenGL {
 
 class GraphicsHelperES3_1 : public GraphicsHelperES3
 {
@@ -79,6 +80,7 @@ public:
     void buildUniformBuffer(const QVariant &v, const ShaderUniform &description, QByteArray &buffer) override;
 };
 
+} // namespace OpenGL
 } // namespace Render
 } // namespace Qt3DRender
 
diff --git a/src/plugins/renderers/opengl/graphicshelpers/graphicshelperes3_2.cpp b/src/plugins/renderers/opengl/graphicshelpers/graphicshelperes3_2.cpp
index 9d0988410..65108800b 100644
--- a/src/plugins/renderers/opengl/graphicshelpers/graphicshelperes3_2.cpp
+++ b/src/plugins/renderers/opengl/graphicshelpers/graphicshelperes3_2.cpp
@@ -77,6 +77,7 @@ QT_BEGIN_NAMESPACE
 
 namespace Qt3DRender {
 namespace Render {
+namespace OpenGL {
 
 GraphicsHelperES3_2::GraphicsHelperES3_2()
 {
@@ -187,6 +188,7 @@ uint GraphicsHelperES3_2::uniformByteSize(const ShaderUniform &description)
     return rawByteSize;
 }
 
+} // namespace OpenGL
 } // namespace Render
 } // namespace Qt3DRender
 
diff --git a/src/plugins/renderers/opengl/graphicshelpers/graphicshelperes3_2_p.h b/src/plugins/renderers/opengl/graphicshelpers/graphicshelperes3_2_p.h
index 9552e656a..7a70f6269 100644
--- a/src/plugins/renderers/opengl/graphicshelpers/graphicshelperes3_2_p.h
+++ b/src/plugins/renderers/opengl/graphicshelpers/graphicshelperes3_2_p.h
@@ -37,8 +37,8 @@
 **
 ****************************************************************************/
 
-#ifndef QT3DRENDER_RENDER_GRAPHICSHELPERES3_2_H
-#define QT3DRENDER_RENDER_GRAPHICSHELPERES3_2_H
+#ifndef QT3DRENDER_RENDER_OPENGL_GRAPHICSHELPERES3_2_H
+#define QT3DRENDER_RENDER_OPENGL_GRAPHICSHELPERES3_2_H
 
 //
 //  W A R N I N G
@@ -57,6 +57,7 @@ QT_BEGIN_NAMESPACE
 
 namespace Qt3DRender {
 namespace Render {
+namespace OpenGL {
 
 class GraphicsHelperES3_2 : public GraphicsHelperES3_1
 {
@@ -76,9 +77,10 @@ public:
 
 };
 
+} // namespace OpenGL
 } // namespace Render
 } // namespace Qt3DRender
 
 QT_END_NAMESPACE
 
-#endif // QT3DRENDER_RENDER_GRAPHICSHELPERES3_2_H
+#endif // QT3DRENDER_RENDER_OPENGL_GRAPHICSHELPERES3_2_H
diff --git a/src/plugins/renderers/opengl/graphicshelpers/graphicshelperes3_p.h b/src/plugins/renderers/opengl/graphicshelpers/graphicshelperes3_p.h
index c985ba24a..5c34a8abb 100644
--- a/src/plugins/renderers/opengl/graphicshelpers/graphicshelperes3_p.h
+++ b/src/plugins/renderers/opengl/graphicshelpers/graphicshelperes3_p.h
@@ -38,8 +38,8 @@
 **
 ****************************************************************************/
 
-#ifndef QT3DRENDER_RENDER_GRAPHICSHELPERES3_H
-#define QT3DRENDER_RENDER_GRAPHICSHELPERES3_H
+#ifndef QT3DRENDER_RENDER_OPENGL_GRAPHICSHELPERES3_H
+#define QT3DRENDER_RENDER_OPENGL_GRAPHICSHELPERES3_H
 
 //
 //  W A R N I N G
@@ -58,6 +58,7 @@ QT_BEGIN_NAMESPACE
 
 namespace Qt3DRender {
 namespace Render {
+namespace OpenGL {
 
 class GraphicsHelperES3 : public GraphicsHelperES2
 {
@@ -100,9 +101,10 @@ protected:
     QOpenGLExtraFunctions *m_extraFuncs = nullptr;
 };
 
+} // namespace OpenGL
 } // namespace Render
 } // namespace Qt3DRender
 
 QT_END_NAMESPACE
 
-#endif // QT3DRENDER_RENDER_GRAPHICSHELPERES3_H
+#endif // QT3DRENDER_RENDER_OPENGL_GRAPHICSHELPERES3_H
diff --git a/src/plugins/renderers/opengl/graphicshelpers/graphicshelpergl2.cpp b/src/plugins/renderers/opengl/graphicshelpers/graphicshelpergl2.cpp
index 3afc29d2f..6989be743 100644
--- a/src/plugins/renderers/opengl/graphicshelpers/graphicshelpergl2.cpp
+++ b/src/plugins/renderers/opengl/graphicshelpers/graphicshelpergl2.cpp
@@ -43,12 +43,13 @@
 #include <private/attachmentpack_p.h>
 #include <QtOpenGLExtensions/QOpenGLExtensions>
 #include <qgraphicsutils_p.h>
-#include <Qt3DRender/private/renderlogging_p.h>
+#include <logging_p.h>
 
 QT_BEGIN_NAMESPACE
 
 namespace Qt3DRender {
 namespace Render {
+namespace OpenGL {
 
 GraphicsHelperGL2::GraphicsHelperGL2()
     : m_funcs(nullptr)
@@ -257,7 +258,7 @@ void GraphicsHelperGL2::vertexAttributePointer(GLenum shaderDataType,
         break;
 
     default:
-        qCWarning(Render::Rendering) << "vertexAttribPointer: Unhandled type";
+        qCWarning(Rendering) << "vertexAttribPointer: Unhandled type";
         Q_UNREACHABLE();
     }
 }
@@ -927,6 +928,7 @@ void GraphicsHelperGL2::blitFramebuffer(GLint srcX0, GLint srcY0, GLint srcX1, G
     qWarning() << "Framebuffer blits are not supported by ES 2.0 (since ES 3.1)";
 }
 
+} // namespace OpenGL
 } // namespace Render
 } // namespace Qt3DRender
 
diff --git a/src/plugins/renderers/opengl/graphicshelpers/graphicshelpergl2_p.h b/src/plugins/renderers/opengl/graphicshelpers/graphicshelpergl2_p.h
index 35391471f..7eac312b8 100644
--- a/src/plugins/renderers/opengl/graphicshelpers/graphicshelpergl2_p.h
+++ b/src/plugins/renderers/opengl/graphicshelpers/graphicshelpergl2_p.h
@@ -37,8 +37,8 @@
 **
 ****************************************************************************/
 
-#ifndef QT3DRENDER_RENDER_GRAPHICSHELPERGL2_H
-#define QT3DRENDER_RENDER_GRAPHICSHELPERGL2_H
+#ifndef QT3DRENDER_RENDER_OPENGL_GRAPHICSHELPERGL2_H
+#define QT3DRENDER_RENDER_OPENGL_GRAPHICSHELPERGL2_H
 
 //
 //  W A R N I N G
@@ -62,6 +62,7 @@ class QOpenGLExtension_ARB_framebuffer_object;
 
 namespace Qt3DRender {
 namespace Render {
+namespace OpenGL {
 
 class Q_AUTOTEST_EXPORT GraphicsHelperGL2 : public GraphicsHelperInterface
 {
@@ -173,6 +174,7 @@ private:
     QOpenGLExtension_ARB_framebuffer_object *m_fboFuncs;
 };
 
+} // namespace OpenGL
 } // namespace Render
 } // namespace Qt3DRender
 
@@ -180,4 +182,4 @@ QT_END_NAMESPACE
 
 #endif // !QT_OPENGL_ES_2
 
-#endif // QT3DRENDER_RENDER_GRAPHICSHELPERGL2_H
+#endif // QT3DRENDER_RENDER_OPENGL_GRAPHICSHELPERGL2_H
diff --git a/src/plugins/renderers/opengl/graphicshelpers/graphicshelpergl3_2.cpp b/src/plugins/renderers/opengl/graphicshelpers/graphicshelpergl3_2.cpp
index 17850cf00..cb0a62224 100644
--- a/src/plugins/renderers/opengl/graphicshelpers/graphicshelpergl3_2.cpp
+++ b/src/plugins/renderers/opengl/graphicshelpers/graphicshelpergl3_2.cpp
@@ -43,8 +43,8 @@
 #include <QOpenGLFunctions_3_2_Core>
 #include <QOpenGLFunctions_3_3_Core>
 #include <QtOpenGLExtensions/qopenglextensions.h>
-#include <Qt3DRender/private/renderlogging_p.h>
 #include <private/attachmentpack_p.h>
+#include <logging_p.h>
 #include <qgraphicsutils_p.h>
 
 QT_BEGIN_NAMESPACE
@@ -70,6 +70,7 @@ QT_BEGIN_NAMESPACE
 
 namespace Qt3DRender {
 namespace Render {
+namespace OpenGL {
 
 GraphicsHelperGL3_2::GraphicsHelperGL3_2()
     : m_funcs(nullptr)
@@ -216,9 +217,9 @@ QVector<ShaderUniform> GraphicsHelperGL3_2::programUniformsAndLocations(GLuint p
         m_funcs->glGetActiveUniformsiv(programId, 1, (GLuint*)&i, GL_UNIFORM_MATRIX_STRIDE, &uniform.m_matrixStride);
         uniform.m_rawByteSize = uniformByteSize(uniform);
         uniforms.append(uniform);
-        qCDebug(Render::Rendering) << uniform.m_name << "size" << uniform.m_size
-                                   << " offset" << uniform.m_offset
-                                   << " rawSize" << uniform.m_rawByteSize;
+        qCDebug(Rendering) << uniform.m_name << "size" << uniform.m_size
+                           << " offset" << uniform.m_offset
+                           << " rawSize" << uniform.m_rawByteSize;
     }
 
     return uniforms;
@@ -279,7 +280,7 @@ void GraphicsHelperGL3_2::vertexAttribDivisor(GLuint index, GLuint divisor)
 {
     Q_UNUSED(index);
     Q_UNUSED(divisor);
-    qCWarning(Render::Rendering) << "Vertex attribute divisor not available with OpenGL 3.2 core";
+    qCWarning(Rendering) << "Vertex attribute divisor not available with OpenGL 3.2 core";
 }
 
 void GraphicsHelperGL3_2::vertexAttributePointer(GLenum shaderDataType,
@@ -319,7 +320,7 @@ void GraphicsHelperGL3_2::vertexAttributePointer(GLenum shaderDataType,
         break;
 
     default:
-        qCWarning(Render::Rendering) << "vertexAttribPointer: Unhandled type";
+        qCWarning(Rendering) << "vertexAttribPointer: Unhandled type";
         Q_UNREACHABLE();
     }
 }
@@ -397,7 +398,7 @@ void GraphicsHelperGL3_2::blendFuncSeparatei(GLuint buf, GLenum sRGB, GLenum dRG
 
 void GraphicsHelperGL3_2::alphaTest(GLenum, GLenum)
 {
-    qCWarning(Render::Rendering) << "AlphaTest not available with OpenGL 3.2 core";
+    qCWarning(Rendering) << "AlphaTest not available with OpenGL 3.2 core";
 }
 
 void GraphicsHelperGL3_2::depthTest(GLenum mode)
@@ -1237,6 +1238,7 @@ void GraphicsHelperGL3_2::blitFramebuffer(GLint srcX0, GLint srcY0, GLint srcX1,
     m_funcs->glBlitFramebuffer(srcX0, srcY0, srcX1, srcY1, dstX0, dstY0, dstX1, dstY1, mask, filter);
 }
 
+} // namespace OpenGL
 } // namespace Render
 } // namespace Qt3DRender
 
diff --git a/src/plugins/renderers/opengl/graphicshelpers/graphicshelpergl3_2_p.h b/src/plugins/renderers/opengl/graphicshelpers/graphicshelpergl3_2_p.h
index b6b2f7141..a7396dc87 100644
--- a/src/plugins/renderers/opengl/graphicshelpers/graphicshelpergl3_2_p.h
+++ b/src/plugins/renderers/opengl/graphicshelpers/graphicshelpergl3_2_p.h
@@ -37,8 +37,8 @@
 **
 ****************************************************************************/
 
-#ifndef QT3DRENDER_RENDER_GRAPHICSHELPERGL3_H
-#define QT3DRENDER_RENDER_GRAPHICSHELPERGL3_H
+#ifndef QT3DRENDER_RENDER_OPENGL_GRAPHICSHELPERGL3_H
+#define QT3DRENDER_RENDER_OPENGL_GRAPHICSHELPERGL3_H
 
 //
 //  W A R N I N G
@@ -63,6 +63,7 @@ class QOpenGLExtension_ARB_tessellation_shader;
 
 namespace Qt3DRender {
 namespace Render {
+namespace OpenGL {
 
 class Q_AUTOTEST_EXPORT GraphicsHelperGL3_2 : public GraphicsHelperInterface
 {
@@ -175,6 +176,7 @@ private:
     QScopedPointer<QOpenGLExtension_ARB_tessellation_shader> m_tessFuncs;
 };
 
+} // namespace OpenGL
 } // namespace Render
 } // namespace Qt3DRender
 
@@ -182,4 +184,4 @@ QT_END_NAMESPACE
 
 #endif // !QT_OPENGL_ES_2
 
-#endif // QT3DRENDER_RENDER_GRAPHICSHELPERGL3_H
+#endif // QT3DRENDER_RENDER_OPENGL_GRAPHICSHELPERGL3_H
diff --git a/src/plugins/renderers/opengl/graphicshelpers/graphicshelpergl3_3.cpp b/src/plugins/renderers/opengl/graphicshelpers/graphicshelpergl3_3.cpp
index 3d8e2acfc..f5a61aa4b 100644
--- a/src/plugins/renderers/opengl/graphicshelpers/graphicshelpergl3_3.cpp
+++ b/src/plugins/renderers/opengl/graphicshelpers/graphicshelpergl3_3.cpp
@@ -42,8 +42,8 @@
 #ifndef QT_OPENGL_ES_2
 #include <QOpenGLFunctions_3_3_Core>
 #include <QtOpenGLExtensions/qopenglextensions.h>
-#include <Qt3DRender/private/renderlogging_p.h>
 #include <private/attachmentpack_p.h>
+#include <logging_p.h>
 #include <qgraphicsutils_p.h>
 
 # ifndef QT_OPENGL_3_2
@@ -69,6 +69,7 @@ QT_BEGIN_NAMESPACE
 
 namespace Qt3DRender {
 namespace Render {
+namespace OpenGL {
 
 GraphicsHelperGL3_3::GraphicsHelperGL3_3()
     : m_funcs(nullptr)
@@ -215,9 +216,9 @@ QVector<ShaderUniform> GraphicsHelperGL3_3::programUniformsAndLocations(GLuint p
         m_funcs->glGetActiveUniformsiv(programId, 1, (GLuint*)&i, GL_UNIFORM_MATRIX_STRIDE, &uniform.m_matrixStride);
         uniform.m_rawByteSize = uniformByteSize(uniform);
         uniforms.append(uniform);
-        qCDebug(Render::Rendering) << uniform.m_name << "size" << uniform.m_size
-                                   << " offset" << uniform.m_offset
-                                   << " rawSize" << uniform.m_rawByteSize;
+        qCDebug(Rendering) << uniform.m_name << "size" << uniform.m_size
+                           << " offset" << uniform.m_offset
+                           << " rawSize" << uniform.m_rawByteSize;
     }
 
     return uniforms;
@@ -316,7 +317,7 @@ void GraphicsHelperGL3_3::vertexAttributePointer(GLenum shaderDataType,
         break;
 
     default:
-        qCWarning(Render::Rendering) << "vertexAttribPointer: Unhandled type";
+        qCWarning(Rendering) << "vertexAttribPointer: Unhandled type";
     }
 }
 
@@ -393,7 +394,7 @@ void GraphicsHelperGL3_3::blendFuncSeparatei(GLuint buf, GLenum sRGB, GLenum dRG
 
 void GraphicsHelperGL3_3::alphaTest(GLenum, GLenum)
 {
-    qCWarning(Render::Rendering) << "AlphaTest not available with OpenGL 3.2 core";
+    qCWarning(Rendering) << "AlphaTest not available with OpenGL 3.2 core";
 }
 
 void GraphicsHelperGL3_3::depthTest(GLenum mode)
@@ -1232,6 +1233,7 @@ void GraphicsHelperGL3_3::blitFramebuffer(GLint srcX0, GLint srcY0, GLint srcX1,
     m_funcs->glBlitFramebuffer(srcX0, srcY0, srcX1, srcY1, dstX0, dstY0, dstX1, dstY1, mask, filter);
 }
 
+} // namespace OpenGL
 } // namespace Render
 } // namespace Qt3DRender
 
diff --git a/src/plugins/renderers/opengl/graphicshelpers/graphicshelpergl3_3_p.h b/src/plugins/renderers/opengl/graphicshelpers/graphicshelpergl3_3_p.h
index 8d8525111..3b667420c 100644
--- a/src/plugins/renderers/opengl/graphicshelpers/graphicshelpergl3_3_p.h
+++ b/src/plugins/renderers/opengl/graphicshelpers/graphicshelpergl3_3_p.h
@@ -37,8 +37,8 @@
 **
 ****************************************************************************/
 
-#ifndef QT3DRENDER_RENDER_GRAPHICSHELPERGL3_3_P_H
-#define QT3DRENDER_RENDER_GRAPHICSHELPERGL3_3_P_H
+#ifndef QT3DRENDER_RENDER_OPENGL_GRAPHICSHELPERGL3_3_P_H
+#define QT3DRENDER_RENDER_OPENGL_GRAPHICSHELPERGL3_3_P_H
 
 //
 //  W A R N I N G
@@ -63,6 +63,7 @@ class QOpenGLExtension_ARB_tessellation_shader;
 
 namespace Qt3DRender {
 namespace Render {
+namespace OpenGL {
 
 class Q_AUTOTEST_EXPORT GraphicsHelperGL3_3 : public GraphicsHelperInterface
 {
@@ -175,6 +176,7 @@ private:
     QScopedPointer<QOpenGLExtension_ARB_tessellation_shader> m_tessFuncs;
 };
 
+} // namespace OpenGL
 } // namespace Render
 } // namespace Qt3DRender
 
@@ -182,4 +184,4 @@ QT_END_NAMESPACE
 
 #endif // !QT_OPENGL_ES_2
 
-#endif // QT3DRENDER_RENDER_GRAPHICSHELPERGL3_3_P_H
+#endif // QT3DRENDER_RENDER_OPENGL_GRAPHICSHELPERGL3_3_P_H
diff --git a/src/plugins/renderers/opengl/graphicshelpers/graphicshelpergl4.cpp b/src/plugins/renderers/opengl/graphicshelpers/graphicshelpergl4.cpp
index 775dd7935..96e055870 100644
--- a/src/plugins/renderers/opengl/graphicshelpers/graphicshelpergl4.cpp
+++ b/src/plugins/renderers/opengl/graphicshelpers/graphicshelpergl4.cpp
@@ -42,9 +42,9 @@
 #ifndef QT_OPENGL_ES_2
 #include <QOpenGLFunctions_4_3_Core>
 #include <QtOpenGLExtensions/qopenglextensions.h>
-#include <Qt3DRender/private/renderlogging_p.h>
 #include <private/attachmentpack_p.h>
 #include <qgraphicsutils_p.h>
+#include <logging_p.h>
 
 # ifndef QT_OPENGL_4_3
 #  ifndef GL_PATCH_VERTICES
@@ -118,6 +118,7 @@ QT_BEGIN_NAMESPACE
 
 namespace Qt3DRender {
 namespace Render {
+namespace OpenGL {
 
 namespace {
 
@@ -291,9 +292,9 @@ QVector<ShaderUniform> GraphicsHelperGL4::programUniformsAndLocations(GLuint pro
         m_funcs->glGetActiveUniformsiv(programId, 1, (GLuint*)&i, GL_UNIFORM_MATRIX_STRIDE, &uniform.m_matrixStride);
         uniform.m_rawByteSize = uniformByteSize(uniform);
         uniforms.append(uniform);
-        qCDebug(Render::Rendering) << uniform.m_name << "size" << uniform.m_size
-                                   << " offset" << uniform.m_offset
-                                   << " rawSize" << uniform.m_rawByteSize;
+        qCDebug(Rendering) << uniform.m_name << "size" << uniform.m_size
+                           << " offset" << uniform.m_offset
+                           << " rawSize" << uniform.m_rawByteSize;
     }
 
     return uniforms;
@@ -418,7 +419,7 @@ void GraphicsHelperGL4::vertexAttributePointer(GLenum shaderDataType,
         break;
 
     default:
-        qCWarning(Render::Rendering) << "vertexAttribPointer: Unhandled type";
+        qCWarning(Rendering) << "vertexAttribPointer: Unhandled type";
         Q_UNREACHABLE();
     }
 }
@@ -728,7 +729,7 @@ void GraphicsHelperGL4::blendFuncSeparatei(GLuint buf, GLenum sRGB, GLenum dRGB,
 
 void GraphicsHelperGL4::alphaTest(GLenum, GLenum)
 {
-    qCWarning(Render::Rendering) << "AlphaTest not available with OpenGL 3.2 core";
+    qCWarning(Rendering) << "AlphaTest not available with OpenGL 3.2 core";
 }
 
 void GraphicsHelperGL4::depthTest(GLenum mode)
@@ -1434,6 +1435,7 @@ void GraphicsHelperGL4::blitFramebuffer(GLint srcX0, GLint srcY0, GLint srcX1, G
     m_funcs->glBlitFramebuffer(srcX0, srcY0, srcX1, srcY1, dstX0, dstY0, dstX1, dstY1, mask, filter);
 }
 
+} // namespace OpenGL
 } // namespace Render
 } // namespace Qt3DRender
 
diff --git a/src/plugins/renderers/opengl/graphicshelpers/graphicshelpergl4_p.h b/src/plugins/renderers/opengl/graphicshelpers/graphicshelpergl4_p.h
index 02cb7e211..1fa390806 100644
--- a/src/plugins/renderers/opengl/graphicshelpers/graphicshelpergl4_p.h
+++ b/src/plugins/renderers/opengl/graphicshelpers/graphicshelpergl4_p.h
@@ -37,8 +37,8 @@
 **
 ****************************************************************************/
 
-#ifndef QT3DRENDER_RENDER_GRAPHICSHELPERGL4_H
-#define QT3DRENDER_RENDER_GRAPHICSHELPERGL4_H
+#ifndef QT3DRENDER_RENDER_OPENGL_GRAPHICSHELPERGL4_H
+#define QT3DRENDER_RENDER_OPENGL_GRAPHICSHELPERGL4_H
 
 //
 //  W A R N I N G
@@ -62,6 +62,7 @@ class QOpenGLFunctions_4_3_Core;
 
 namespace Qt3DRender {
 namespace Render {
+namespace OpenGL {
 
 class Q_AUTOTEST_EXPORT GraphicsHelperGL4 : public GraphicsHelperInterface
 {
@@ -172,6 +173,7 @@ private:
     QOpenGLFunctions_4_3_Core *m_funcs;
 };
 
+} // namespace OpenGL
 } // namespace Render
 } // namespace Qt3DRender
 
@@ -179,4 +181,4 @@ QT_END_NAMESPACE
 
 #endif // !QT_OPENGL_ES_2
 
-#endif // QT3DRENDER_RENDER_GRAPHICSHELPERGL4_H
+#endif // QT3DRENDER_RENDER_OPENGL_GRAPHICSHELPERGL4_H
diff --git a/src/plugins/renderers/opengl/graphicshelpers/graphicshelperinterface_p.h b/src/plugins/renderers/opengl/graphicshelpers/graphicshelperinterface_p.h
index aa2b65c66..bbbf05ee0 100644
--- a/src/plugins/renderers/opengl/graphicshelpers/graphicshelperinterface_p.h
+++ b/src/plugins/renderers/opengl/graphicshelpers/graphicshelperinterface_p.h
@@ -37,8 +37,8 @@
 **
 ****************************************************************************/
 
-#ifndef QT3DRENDER_RENDER_GRAPHICSHELPERINTERFACE_H
-#define QT3DRENDER_RENDER_GRAPHICSHELPERINTERFACE_H
+#ifndef QT3DRENDER_RENDER_OPENGL_GRAPHICSHELPERINTERFACE_H
+#define QT3DRENDER_RENDER_OPENGL_GRAPHICSHELPERINTERFACE_H
 
 //
 //  W A R N I N G
@@ -64,6 +64,9 @@ namespace Qt3DRender {
 namespace Render {
 
 struct Attachment;
+
+namespace OpenGL {
+
 class RenderBuffer;
 
 class GraphicsHelperInterface
@@ -194,10 +197,10 @@ public:
     virtual UniformType uniformTypeFromGLType(GLenum glType) = 0;
 };
 
-
+} // namespace OpenGL
 } // namespace Render
 } // namespace Qt3DRender
 
 QT_END_NAMESPACE
 
-#endif // QT3DRENDER_RENDER_GRAPHICSHELPERINTERFACE_H
+#endif // QT3DRENDER_RENDER_OPENGL_GRAPHICSHELPERINTERFACE_H
diff --git a/src/plugins/renderers/opengl/graphicshelpers/imagesubmissioncontext.cpp b/src/plugins/renderers/opengl/graphicshelpers/imagesubmissioncontext.cpp
index cd2b33fb4..c2316d81a 100644
--- a/src/plugins/renderers/opengl/graphicshelpers/imagesubmissioncontext.cpp
+++ b/src/plugins/renderers/opengl/graphicshelpers/imagesubmissioncontext.cpp
@@ -42,6 +42,7 @@
 #include <Qt3DRender/qshaderimage.h>
 #include <graphicscontext_p.h>
 #include <gltexture_p.h>
+#include <logging_p.h>
 
 QT_BEGIN_NAMESPACE
 
@@ -58,6 +59,7 @@ QT_BEGIN_NAMESPACE
 
 namespace Qt3DRender {
 namespace Render {
+namespace OpenGL {
 
 class GraphicsContext;
 class GLTexture;
@@ -299,7 +301,7 @@ int ImageSubmissionContext::assignUnitForImage(Qt3DCore::QNodeId shaderImageId)
     return lowestScoredUnit;
 }
 
-
+} // namespace OpenGL
 } // namespace Render
 } // namespace Qt3DRender
 
diff --git a/src/plugins/renderers/opengl/graphicshelpers/imagesubmissioncontext_p.h b/src/plugins/renderers/opengl/graphicshelpers/imagesubmissioncontext_p.h
index 6d39f469b..52a0152f8 100644
--- a/src/plugins/renderers/opengl/graphicshelpers/imagesubmissioncontext_p.h
+++ b/src/plugins/renderers/opengl/graphicshelpers/imagesubmissioncontext_p.h
@@ -37,8 +37,8 @@
 **
 ****************************************************************************/
 
-#ifndef QT3DRENDER_RENDER_IMAGESUBMISSIONCONTEXT_P_H
-#define QT3DRENDER_RENDER_IMAGESUBMISSIONCONTEXT_P_H
+#ifndef QT3DRENDER_RENDER_OPENGL_IMAGESUBMISSIONCONTEXT_P_H
+#define QT3DRENDER_RENDER_OPENGL_IMAGESUBMISSIONCONTEXT_P_H
 
 //
 //  W A R N I N G
@@ -58,9 +58,12 @@ QT_BEGIN_NAMESPACE
 namespace Qt3DRender {
 namespace Render {
 
+class ShaderImage;
+
+namespace OpenGL {
+
 class GraphicsContext;
 class GLTexture;
-class ShaderImage;
 
 class Q_AUTOTEST_EXPORT ImageSubmissionContext
 {
@@ -87,9 +90,10 @@ private:
     GraphicsContext *m_ctx;
 };
 
+} // namespace OpenGL
 } // namespace Render
 } // namespace Qt3DRender
 
 QT_END_NAMESPACE
 
-#endif // QT3DRENDER_RENDER_IMAGESUBMISSIONCONTEXT_P_H
+#endif // QT3DRENDER_RENDER_OPENGL_IMAGESUBMISSIONCONTEXT_P_H
diff --git a/src/plugins/renderers/opengl/graphicshelpers/qgraphicsutils_p.h b/src/plugins/renderers/opengl/graphicshelpers/qgraphicsutils_p.h
index efc952ea5..a2a995811 100644
--- a/src/plugins/renderers/opengl/graphicshelpers/qgraphicsutils_p.h
+++ b/src/plugins/renderers/opengl/graphicshelpers/qgraphicsutils_p.h
@@ -37,8 +37,8 @@
 **
 ****************************************************************************/
 
-#ifndef QT3DRENDER_RENDER_QGRAPHICSUTILS_P_H
-#define QT3DRENDER_RENDER_QGRAPHICSUTILS_P_H
+#ifndef QT3DRENDER_RENDER_OPENGL_QGRAPHICSUTILS_P_H
+#define QT3DRENDER_RENDER_OPENGL_QGRAPHICSUTILS_P_H
 
 //
 //  W A R N I N G
@@ -67,6 +67,8 @@ namespace Qt3DRender {
 
 namespace Render {
 
+namespace OpenGL {
+
 namespace {
 
 const int QMatrix2x2Type = qMetaTypeId<QMatrix2x2>();
@@ -401,10 +403,12 @@ public:
 
 };
 
+} // namespace OpenGL
+
 } // namespace Render
 
 } // namespace Qt3DRender
 
 QT_END_NAMESPACE
 
-#endif // QT3DRENDER_RENDER_QGRAPHICSUTILS_P_H
+#endif // QT3DRENDER_RENDER_OPENGL_QGRAPHICSUTILS_P_H
diff --git a/src/plugins/renderers/opengl/graphicshelpers/submissioncontext.cpp b/src/plugins/renderers/opengl/graphicshelpers/submissioncontext.cpp
index 9501b0b52..e4b223185 100644
--- a/src/plugins/renderers/opengl/graphicshelpers/submissioncontext.cpp
+++ b/src/plugins/renderers/opengl/graphicshelpers/submissioncontext.cpp
@@ -97,6 +97,7 @@ QT_BEGIN_NAMESPACE
 
 namespace Qt3DRender {
 namespace Render {
+namespace OpenGL {
 
 
 static QHash<unsigned int, SubmissionContext*> static_contexts;
@@ -1407,7 +1408,7 @@ HGLBuffer SubmissionContext::createGLBufferFor(Buffer *buffer)
     //    b.setUsagePattern(static_cast<QOpenGLBuffer::UsagePattern>(buffer->usage()));
     Q_ASSERT(b);
     if (!b->create(this))
-        qCWarning(Render::Io) << Q_FUNC_INFO << "buffer creation failed";
+        qCWarning(Io) << Q_FUNC_INFO << "buffer creation failed";
 
     return m_renderer->glResourceManagers()->glBufferManager()->lookupHandle(buffer->peerId());
 }
@@ -1428,7 +1429,7 @@ bool SubmissionContext::bindGLBuffer(GLBuffer *buffer, GLBuffer::Type type)
 void SubmissionContext::uploadDataToGLBuffer(Buffer *buffer, GLBuffer *b, bool releaseBuffer)
 {
     if (!bindGLBuffer(b, GLBuffer::ArrayBuffer)) // We're uploading, the type doesn't matter here
-        qCWarning(Render::Io) << Q_FUNC_INFO << "buffer bind failed";
+        qCWarning(Io) << Q_FUNC_INFO << "buffer bind failed";
     // If the buffer is dirty (hence being called here)
     // there are two possible cases
     // * setData was called changing the whole data or functor (or the usage pattern)
@@ -1471,13 +1472,13 @@ void SubmissionContext::uploadDataToGLBuffer(Buffer *buffer, GLBuffer *b, bool r
         b->release(this);
         m_boundArrayBuffer = nullptr;
     }
-    qCDebug(Render::Io) << "uploaded buffer size=" << buffer->data().size();
+    qCDebug(Io) << "uploaded buffer size=" << buffer->data().size();
 }
 
 QByteArray SubmissionContext::downloadDataFromGLBuffer(Buffer *buffer, GLBuffer *b)
 {
     if (!bindGLBuffer(b, GLBuffer::ArrayBuffer)) // We're downloading, the type doesn't matter here
-        qCWarning(Render::Io) << Q_FUNC_INFO << "buffer bind failed";
+        qCWarning(Io) << Q_FUNC_INFO << "buffer bind failed";
 
     QByteArray data = b->download(this, buffer->data().size());
     return data;
@@ -1568,6 +1569,7 @@ void SubmissionContext::blitFramebuffer(Qt3DCore::QNodeId inputRenderTargetId,
     }
 }
 
+} // namespace OpenGL
 } // namespace Render
 } // namespace Qt3DRender of namespace
 
diff --git a/src/plugins/renderers/opengl/graphicshelpers/submissioncontext_p.h b/src/plugins/renderers/opengl/graphicshelpers/submissioncontext_p.h
index 16eca07ea..b663e47ec 100644
--- a/src/plugins/renderers/opengl/graphicshelpers/submissioncontext_p.h
+++ b/src/plugins/renderers/opengl/graphicshelpers/submissioncontext_p.h
@@ -38,8 +38,8 @@
 **
 ****************************************************************************/
 
-#ifndef QT3DRENDER_RENDER_SUBMISSIONCONTEXT_H
-#define QT3DRENDER_RENDER_SUBMISSIONCONTEXT_H
+#ifndef QT3DRENDER_RENDER_OPENGL_SUBMISSIONCONTEXT_H
+#define QT3DRENDER_RENDER_OPENGL_SUBMISSIONCONTEXT_H
 
 //
 //  W A R N I N G
@@ -70,18 +70,21 @@ namespace Qt3DRender {
 
 namespace Render {
 
-class Renderer;
-class GraphicsHelperInterface;
-class RenderStateSet;
 class Material;
-class GLTexture;
-class RenderCommand;
-class RenderTarget;
 class AttachmentPack;
 class Attribute;
 class Buffer;
 class ShaderManager;
 struct StateVariant;
+class RenderTarget;
+class RenderStateSet;
+
+namespace OpenGL {
+
+class Renderer;
+class GraphicsHelperInterface;
+class GLTexture;
+class RenderCommand;
 
 typedef QPair<QString, int> NamedUniformLocation;
 
@@ -226,9 +229,10 @@ private:
     void disableAttribute(const VAOVertexAttribute &attr);
 };
 
+} // namespace OpenGL
 } // namespace Render
 } // namespace Qt3DRender
 
 QT_END_NAMESPACE
 
-#endif // QT3DRENDER_RENDER_SUBMISSIONCONTEXT_H
+#endif // QT3DRENDER_RENDER_OPENGL_SUBMISSIONCONTEXT_H
diff --git a/src/plugins/renderers/opengl/graphicshelpers/texturesubmissioncontext.cpp b/src/plugins/renderers/opengl/graphicshelpers/texturesubmissioncontext.cpp
index 4f2ff80f5..4577d3d10 100644
--- a/src/plugins/renderers/opengl/graphicshelpers/texturesubmissioncontext.cpp
+++ b/src/plugins/renderers/opengl/graphicshelpers/texturesubmissioncontext.cpp
@@ -41,11 +41,13 @@
 
 #include <graphicscontext_p.h>
 #include <gltexture_p.h>
+#include <logging_p.h>
 
 QT_BEGIN_NAMESPACE
 
 namespace Qt3DRender {
 namespace Render {
+namespace OpenGL {
 
 class TextureExtRendererLocker
 {
@@ -219,6 +221,7 @@ void TextureSubmissionContext::decayTextureScores()
         m_activeTextures[u].score = qMax(m_activeTextures[u].score - 1, 0);
 }
 
+} // namespace OpenGL
 } // namespace Render
 } // namespace Qt3DRender of namespace
 
diff --git a/src/plugins/renderers/opengl/graphicshelpers/texturesubmissioncontext_p.h b/src/plugins/renderers/opengl/graphicshelpers/texturesubmissioncontext_p.h
index 3c84fe558..d80f6b9e3 100644
--- a/src/plugins/renderers/opengl/graphicshelpers/texturesubmissioncontext_p.h
+++ b/src/plugins/renderers/opengl/graphicshelpers/texturesubmissioncontext_p.h
@@ -37,8 +37,8 @@
 **
 ****************************************************************************/
 
-#ifndef QT3DRENDER_RENDER_TEXTURESUBMISSIONCONTEXT_H
-#define QT3DRENDER_RENDER_TEXTURESUBMISSIONCONTEXT_H
+#ifndef QT3DRENDER_RENDER_OPENGL_TEXTURESUBMISSIONCONTEXT_H
+#define QT3DRENDER_RENDER_OPENGL_TEXTURESUBMISSIONCONTEXT_H
 
 //
 //  W A R N I N G
@@ -61,6 +61,7 @@ class QOpenGLContext;
 
 namespace Qt3DRender {
 namespace Render {
+namespace OpenGL {
 
 class GraphicsContext;
 class GLTexture;
@@ -98,9 +99,10 @@ private:
     QVector<ActiveTexture> m_activeTextures;
 };
 
+} // namespace OpenGL
 } // namespace Render
 } // namespace Qt3DRender
 
 QT_END_NAMESPACE
 
-#endif // QT3DRENDER_RENDER_TEXTURESUBMISSIONCONTEXT_H
+#endif // QT3DRENDER_RENDER_OPENGL_TEXTURESUBMISSIONCONTEXT_H