diff options
| author | Paul Lemire <paul.lemire@kdab.com> | 2018-03-12 15:23:34 +0100 |
|---|---|---|
| committer | Paul Lemire <paul.lemire@kdab.com> | 2020-02-05 14:10:07 +0100 |
| commit | 01358191691cc81acb58afba6f82e800bc1b427c (patch) | |
| tree | f8be05bcfcda0616bd24125b994252ce91142a10 /src/plugins/renderers/opengl/managers | |
| parent | 0e115ff000fb294de8519bf5b39beee0d6bfa605 (diff) | |
Move classes in OpenGL renderer plugin into an OpenGL namespace
Change-Id: I5314da1df7fbfd1b6db4412e7bc71231525d9de2
Reviewed-by: Mike Krus <mike.krus@kdab.com>
Diffstat (limited to 'src/plugins/renderers/opengl/managers')
3 files changed, 15 insertions, 4 deletions
diff --git a/src/plugins/renderers/opengl/managers/gl_handle_types_p.h b/src/plugins/renderers/opengl/managers/gl_handle_types_p.h index eb25bab7f..98af4d3b8 100644 --- a/src/plugins/renderers/opengl/managers/gl_handle_types_p.h +++ b/src/plugins/renderers/opengl/managers/gl_handle_types_p.h @@ -59,6 +59,8 @@ namespace Qt3DRender { namespace Render { +namespace OpenGL { + class GLBuffer; class GLTexture; class OpenGLVertexArrayObject; @@ -67,6 +69,8 @@ typedef Qt3DCore::QHandle<GLBuffer> HGLBuffer; typedef Qt3DCore::QHandle<OpenGLVertexArrayObject> HVao; typedef Qt3DCore::QHandle<GLTexture> HGLTexture; +} // namespace OpenGL + } // namespace Render } // namespace Qt3DRender diff --git a/src/plugins/renderers/opengl/managers/glresourcemanagers.cpp b/src/plugins/renderers/opengl/managers/glresourcemanagers.cpp index 67a7422aa..e8fd893ee 100644 --- a/src/plugins/renderers/opengl/managers/glresourcemanagers.cpp +++ b/src/plugins/renderers/opengl/managers/glresourcemanagers.cpp @@ -45,6 +45,7 @@ namespace Qt3DRender { namespace Render { +namespace OpenGL { GLResourceManagers::GLResourceManagers() : m_glBufferManager(new GLBufferManager()) @@ -64,6 +65,8 @@ GLResourceManagers::~GLResourceManagers() delete m_glBufferManager; } +} // OpenGL + } // Render } // Qt3DRender diff --git a/src/plugins/renderers/opengl/managers/glresourcemanagers_p.h b/src/plugins/renderers/opengl/managers/glresourcemanagers_p.h index 3597e6965..9472bc33f 100644 --- a/src/plugins/renderers/opengl/managers/glresourcemanagers_p.h +++ b/src/plugins/renderers/opengl/managers/glresourcemanagers_p.h @@ -37,8 +37,8 @@ ** ****************************************************************************/ -#ifndef QT3DRENDER_RENDER_GLRESOURCEMANAGERS_P_H -#define QT3DRENDER_RENDER_GLRESOURCEMANAGERS_P_H +#ifndef QT3DRENDER_RENDER_OPENGL_GLRESOURCEMANAGERS_P_H +#define QT3DRENDER_RENDER_OPENGL_GLRESOURCEMANAGERS_P_H // // W A R N I N G @@ -66,6 +66,8 @@ namespace Qt3DRender { namespace Render { +namespace OpenGL { + class Q_AUTOTEST_EXPORT GLFenceManager : public QHash<Qt3DCore::QNodeId, GLFence> { }; @@ -124,12 +126,14 @@ private: VAOManager *m_vaoManager; }; +} // OpenGL + } // Render } // Qt3DRender -Q_DECLARE_RESOURCE_INFO(Qt3DRender::Render::OpenGLVertexArrayObject, Q_REQUIRES_CLEANUP) +Q_DECLARE_RESOURCE_INFO(Qt3DRender::Render::OpenGL::OpenGLVertexArrayObject, Q_REQUIRES_CLEANUP) QT_END_NAMESPACE -#endif // QT3DRENDER_RENDER_GLRESOURCEMANAGERS_P_H +#endif // QT3DRENDER_RENDER_OPENGL_GLRESOURCEMANAGERS_P_H |