diff options
| author | Paul Lemire <paul.lemire@kdab.com> | 2018-03-12 15:23:34 +0100 |
|---|---|---|
| committer | Paul Lemire <paul.lemire@kdab.com> | 2019-12-19 07:31:16 +0100 |
| commit | bba6f45889fe1b7503bf812bb2bf6456a730c3a5 (patch) | |
| tree | 68aae6feade62fc85caed2855c6fb9c6a67bedc6 | |
| parent | 082ded6a34b88c2d0b6c2a30e0d2ee9a5cee9a4d (diff) | |
Move classes in OpenGL renderer plugin into an OpenGL namespace
Change-Id: I5314da1df7fbfd1b6db4412e7bc71231525d9de2
93 files changed, 647 insertions, 413 deletions
diff --git a/src/plugins/renderers/opengl/graphicshelpers/graphicscontext.cpp b/src/plugins/renderers/opengl/graphicshelpers/graphicscontext.cpp index fe989ff70..aface4e80 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 { @@ -320,7 +321,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) @@ -1018,6 +1019,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 diff --git a/src/plugins/renderers/opengl/io/glbuffer.cpp b/src/plugins/renderers/opengl/io/glbuffer.cpp index 53fc50cb9..27f005f01 100644 --- a/src/plugins/renderers/opengl/io/glbuffer.cpp +++ b/src/plugins/renderers/opengl/io/glbuffer.cpp @@ -68,6 +68,8 @@ namespace Qt3DRender { namespace Render { +namespace OpenGL { + // A UBO is created for each ShaderData Shader Pair // That means a UBO is unique to a shader/shaderdata @@ -162,6 +164,8 @@ void GLBuffer::bindBufferBase(GraphicsContext *ctx, int bindingPoint) ctx->bindBufferBase(m_lastTarget, bindingPoint, m_bufferId); } +} // namespace OpenGL + } // namespace Render } // namespace Qt3DRender diff --git a/src/plugins/renderers/opengl/io/glbuffer_p.h b/src/plugins/renderers/opengl/io/glbuffer_p.h index 731634b6b..6a2daa287 100644 --- a/src/plugins/renderers/opengl/io/glbuffer_p.h +++ b/src/plugins/renderers/opengl/io/glbuffer_p.h @@ -37,8 +37,8 @@ ** ****************************************************************************/ -#ifndef QT3DRENDER_RENDER_GLBUFFER_P_H -#define QT3DRENDER_RENDER_GLBUFFER_P_H +#ifndef QT3DRENDER_RENDER_OPENGL_GLBUFFER_P_H +#define QT3DRENDER_RENDER_OPENGL_GLBUFFER_P_H // // W A R N I N G @@ -61,6 +61,8 @@ namespace Qt3DRender { namespace Render { +namespace OpenGL { + class GraphicsContext; class GLBuffer @@ -101,10 +103,12 @@ private: GLenum m_lastTarget; }; +} // namespace OpenGL + } // namespace Render } // namespace Qt3DRender QT_END_NAMESPACE -#endif // QT3DRENDER_RENDER_GLBUFFER_P_H +#endif // QT3DRENDER_RENDER_OPENGL_GLBUFFER_P_H diff --git a/src/plugins/renderers/opengl/jobs/filtercompatibletechniquejob.cpp b/src/plugins/renderers/opengl/jobs/filtercompatibletechniquejob.cpp index 95e8862ef..52fd99f52 100644 --- a/src/plugins/renderers/opengl/jobs/filtercompatibletechniquejob.cpp +++ b/src/plugins/renderers/opengl/jobs/filtercompatibletechniquejob.cpp @@ -48,6 +48,7 @@ QT_BEGIN_NAMESPACE namespace Qt3DRender { namespace Render { +namespace OpenGL { FilterCompatibleTechniqueJob::FilterCompatibleTechniqueJob() : m_manager(nullptr) @@ -89,6 +90,7 @@ void FilterCompatibleTechniqueJob::run() } } +} // namespace OpenGL } // namespace Render } // namespace Qt3DRender diff --git a/src/plugins/renderers/opengl/jobs/filtercompatibletechniquejob_p.h b/src/plugins/renderers/opengl/jobs/filtercompatibletechniquejob_p.h index 27b3d4ed2..738a2483f 100644 --- a/src/plugins/renderers/opengl/jobs/filtercompatibletechniquejob_p.h +++ b/src/plugins/renderers/opengl/jobs/filtercompatibletechniquejob_p.h @@ -37,8 +37,8 @@ ** ****************************************************************************/ -#ifndef QT3DRENDER_RENDER_FILTERCOMPATIBLETECHNIQUEJOB_H -#define QT3DRENDER_RENDER_FILTERCOMPATIBLETECHNIQUEJOB_H +#ifndef QT3DRENDER_RENDER_OPENGL_FILTERCOMPATIBLETECHNIQUEJOB_H +#define QT3DRENDER_RENDER_OPENGL_FILTERCOMPATIBLETECHNIQUEJOB_H // // W A R N I N G @@ -62,6 +62,9 @@ namespace Qt3DRender { namespace Render { class TechniqueManager; + +namespace OpenGL { + class Renderer; class Q_3DRENDERSHARED_PRIVATE_EXPORT FilterCompatibleTechniqueJob : public Qt3DCore::QAspectJob @@ -84,9 +87,10 @@ private: typedef QSharedPointer<FilterCompatibleTechniqueJob> FilterCompatibleTechniqueJobPtr; +} // namespace OpenGL } // namespace Render } // namespace Qt3DRender QT_END_NAMESPACE -#endif // QT3DRENDER_RENDER_FILTERCOMPATIBLETECHNIQUEJOB_H +#endif // QT3DRENDER_RENDER_OPENGL_FILTERCOMPATIBLETECHNIQUEJOB_H diff --git a/src/plugins/renderers/opengl/jobs/materialparametergathererjob.cpp b/src/plugins/renderers/opengl/jobs/materialparametergathererjob.cpp index e1f8aa403..1f51ceba3 100644 --- a/src/plugins/renderers/opengl/jobs/materialparametergathererjob.cpp +++ b/src/plugins/renderers/opengl/jobs/materialparametergathererjob.cpp @@ -50,6 +50,8 @@ namespace Qt3DRender { namespace Render { +namespace OpenGL { + namespace { int materialParameterGathererCounter = 0; @@ -124,6 +126,8 @@ void MaterialParameterGathererJob::run() } } +} // OpenGL + } // Render } // Qt3DRender diff --git a/src/plugins/renderers/opengl/jobs/materialparametergathererjob_p.h b/src/plugins/renderers/opengl/jobs/materialparametergathererjob_p.h index 9fe0cdfee..ed9f50a07 100644 --- a/src/plugins/renderers/opengl/jobs/materialparametergathererjob_p.h +++ b/src/plugins/renderers/opengl/jobs/materialparametergathererjob_p.h @@ -37,8 +37,8 @@ ** ****************************************************************************/ -#ifndef QT3DRENDER_RENDER_MATERIALPARAMETERGATHERERJOB_P_H -#define QT3DRENDER_RENDER_MATERIALPARAMETERGATHERERJOB_P_H +#ifndef QT3DRENDER_RENDER_OPENGL_MATERIALPARAMETERGATHERERJOB_P_H +#define QT3DRENDER_RENDER_OPENGL_MATERIALPARAMETERGATHERERJOB_P_H // // W A R N I N G @@ -66,6 +66,8 @@ namespace Render { class NodeManagers; class TechniqueFilter; class RenderPassFilter; + +namespace OpenGL { class Renderer; // TO be executed for each FrameGraph branch with a given RenderPassFilter/TechniqueFilter @@ -98,10 +100,12 @@ private: typedef QSharedPointer<MaterialParameterGathererJob> MaterialParameterGathererJobPtr; +} // OpenGL + } // Render } // Qt3DRender QT_END_NAMESPACE -#endif // QT3DRENDER_RENDER_MATERIALPARAMETERGATHERERJOB_P_H +#endif // QT3DRENDER_RENDER_OPENGL_MATERIALPARAMETERGATHERERJOB_P_H diff --git a/src/plugins/renderers/opengl/jobs/renderviewbuilderjob.cpp b/src/plugins/renderers/opengl/jobs/renderviewbuilderjob.cpp index 5bfa9ed6f..468ab9342 100644 --- a/src/plugins/renderers/opengl/jobs/renderviewbuilderjob.cpp +++ b/src/plugins/renderers/opengl/jobs/renderviewbuilderjob.cpp @@ -48,6 +48,8 @@ namespace Qt3DRender { namespace Render { +namespace OpenGL { + namespace { int renderViewInstanceCounter = 0; } // anonymous @@ -75,6 +77,8 @@ void RenderViewCommandUpdaterJob::run() } } +} // OpenGL + } // Render } // Qt3DRender diff --git a/src/plugins/renderers/opengl/jobs/renderviewbuilderjob_p.h b/src/plugins/renderers/opengl/jobs/renderviewbuilderjob_p.h index 6a171d281..13e19daf7 100644 --- a/src/plugins/renderers/opengl/jobs/renderviewbuilderjob_p.h +++ b/src/plugins/renderers/opengl/jobs/renderviewbuilderjob_p.h @@ -37,8 +37,8 @@ ** ****************************************************************************/ -#ifndef QT3DRENDER_RENDER_RENDERVIEWCOMMANDBUILDERJOB_P_H -#define QT3DRENDER_RENDER_RENDERVIEWCOMMANDBUILDERJOB_P_H +#ifndef QT3DRENDER_RENDER_OPENGL_RENDERVIEWCOMMANDBUILDERJOB_P_H +#define QT3DRENDER_RENDER_OPENGL_RENDERVIEWCOMMANDBUILDERJOB_P_H // // W A R N I N G @@ -61,6 +61,10 @@ namespace Qt3DRender { namespace Render { +namespace OpenGL { + +class RenderView; + class Q_AUTOTEST_EXPORT RenderViewCommandBuilderJob : public Qt3DCore::QAspectJob { public: @@ -87,10 +91,12 @@ private: typedef QSharedPointer<RenderViewCommandBuilderJob> RenderViewCommandBuilderJobPtr; +} // OpenGL + } // Render } // Qt3DRender QT_END_NAMESPACE -#endif // QT3DRENDER_RENDER_RENDERVIEWCOMMANDBUILDERJOB_P_H +#endif // QT3DRENDER_RENDER_OPENGL_RENDERVIEWCOMMANDBUILDERJOB_P_H diff --git a/src/plugins/renderers/opengl/jobs/renderviewcommandbuilderjob.cpp b/src/plugins/renderers/opengl/jobs/renderviewcommandbuilderjob.cpp index 00cfba558..d8a33b693 100644 --- a/src/plugins/renderers/opengl/jobs/renderviewcommandbuilderjob.cpp +++ b/src/plugins/renderers/opengl/jobs/renderviewcommandbuilderjob.cpp @@ -47,6 +47,8 @@ namespace Qt3DRender { namespace Render { +namespace OpenGL { + namespace { int renderViewInstanceCounter = 0; } // anonymous @@ -74,6 +76,8 @@ void RenderViewCommandBuilderJob::run() } } +} // OpenGL + } // Render } // Qt3DRender diff --git a/src/plugins/renderers/opengl/jobs/renderviewcommandbuilderjob_p.h b/src/plugins/renderers/opengl/jobs/renderviewcommandbuilderjob_p.h index 6a171d281..e9f8bb10a 100644 --- a/src/plugins/renderers/opengl/jobs/renderviewcommandbuilderjob_p.h +++ b/src/plugins/renderers/opengl/jobs/renderviewcommandbuilderjob_p.h @@ -37,8 +37,8 @@ ** ****************************************************************************/ -#ifndef QT3DRENDER_RENDER_RENDERVIEWCOMMANDBUILDERJOB_P_H -#define QT3DRENDER_RENDER_RENDERVIEWCOMMANDBUILDERJOB_P_H +#ifndef QT3DRENDER_RENDER_OPENGL_RENDERVIEWCOMMANDBUILDERJOB_P_H +#define QT3DRENDER_RENDER_OPENGL_RENDERVIEWCOMMANDBUILDERJOB_P_H // // W A R N I N G @@ -61,6 +61,8 @@ namespace Qt3DRender { namespace Render { +namespace OpenGL { + class Q_AUTOTEST_EXPORT RenderViewCommandBuilderJob : public Qt3DCore::QAspectJob { public: @@ -87,10 +89,12 @@ private: typedef QSharedPointer<RenderViewCommandBuilderJob> RenderViewCommandBuilderJobPtr; +} // OpenGL + } // Render } // Qt3DRender QT_END_NAMESPACE -#endif // QT3DRENDER_RENDER_RENDERVIEWCOMMANDBUILDERJOB_P_H +#endif // QT3DRENDER_RENDER_OPENGL_RENDERVIEWCOMMANDBUILDERJOB_P_H diff --git a/src/plugins/renderers/opengl/jobs/renderviewcommandupdaterjob.cpp b/src/plugins/renderers/opengl/jobs/renderviewcommandupdaterjob.cpp index 1b7cae229..79a115525 100644 --- a/src/plugins/renderers/opengl/jobs/renderviewcommandupdaterjob.cpp +++ b/src/plugins/renderers/opengl/jobs/renderviewcommandupdaterjob.cpp @@ -48,10 +48,13 @@ namespace Qt3DRender { namespace Render { +namespace OpenGL { + namespace { int renderViewInstanceCounter = 0; } // anonymous + RenderViewCommandUpdaterJob::RenderViewCommandUpdaterJob() : Qt3DCore::QAspectJob() , m_offset(0) @@ -75,6 +78,8 @@ void RenderViewCommandUpdaterJob::run() } } +} // OpenGL + } // Render } // Qt3DRender diff --git a/src/plugins/renderers/opengl/jobs/renderviewcommandupdaterjob_p.h b/src/plugins/renderers/opengl/jobs/renderviewcommandupdaterjob_p.h index 88961d848..2fe5749ad 100644 --- a/src/plugins/renderers/opengl/jobs/renderviewcommandupdaterjob_p.h +++ b/src/plugins/renderers/opengl/jobs/renderviewcommandupdaterjob_p.h @@ -37,8 +37,8 @@ ** ****************************************************************************/ -#ifndef QT3DRENDER_RENDER_RENDERVIEWCOMMANDUPDATEJOB_P_H -#define QT3DRENDER_RENDER_RENDERVIEWCOMMANDUPDATEJOB_P_H +#ifndef QT3DRENDER_RENDER_OPENGL_RENDERVIEWCOMMANDUPDATEJOB_P_H +#define QT3DRENDER_RENDER_OPENGL_RENDERVIEWCOMMANDUPDATEJOB_P_H // // W A R N I N G @@ -61,6 +61,8 @@ namespace Qt3DRender { namespace Render { +namespace OpenGL { + class RenderView; class Renderer; @@ -94,10 +96,12 @@ private: typedef QSharedPointer<RenderViewCommandUpdaterJob> RenderViewCommandUpdaterJobPtr; +} // OpenGL + } // Render } // Qt3DRender QT_END_NAMESPACE -#endif // QT3DRENDER_RENDER_RENDERVIEWCOMMANDUPDATEJOB_P_H +#endif // QT3DRENDER_RENDER_OPENGL_RENDERVIEWCOMMANDUPDATEJOB_P_H diff --git a/src/plugins/renderers/opengl/jobs/renderviewinitializerjob.cpp b/src/plugins/renderers/opengl/jobs/renderviewinitializerjob.cpp index c1b97959f..6be1016f0 100644 --- a/src/plugins/renderers/opengl/jobs/renderviewinitializerjob.cpp +++ b/src/plugins/renderers/opengl/jobs/renderviewinitializerjob.cpp @@ -52,6 +52,7 @@ QT_BEGIN_NAMESPACE namespace Qt3DRender { namespace Render { +namespace OpenGL { namespace { // only accessed in ctor and dtor of RenderViewJob @@ -98,6 +99,7 @@ void RenderViewInitializerJob::run() #endif } +} // namespace OpenGL } // namespace Render } // namespace Qt3DRender diff --git a/src/plugins/renderers/opengl/jobs/renderviewinitializerjob_p.h b/src/plugins/renderers/opengl/jobs/renderviewinitializerjob_p.h index fb4e2c67c..2ebb5dc36 100644 --- a/src/plugins/renderers/opengl/jobs/renderviewinitializerjob_p.h +++ b/src/plugins/renderers/opengl/jobs/renderviewinitializerjob_p.h @@ -38,8 +38,8 @@ ** ****************************************************************************/ -#ifndef QT3DRENDER_RENDER_RENDERVIEWINITIALIZERJOB_H -#define QT3DRENDER_RENDER_RENDERVIEWINITIALIZERJOB_H +#ifndef QT3DRENDER_RENDER_OPENGL_RENDERVIEWINITIALIZERJOB_H +#define QT3DRENDER_RENDER_OPENGL_RENDERVIEWINITIALIZERJOB_H // // W A R N I N G @@ -62,8 +62,11 @@ namespace Qt3DRender { namespace Render { -class Renderer; class FrameGraphNode; + +namespace OpenGL { + +class Renderer; class RenderView; class Q_AUTOTEST_EXPORT RenderViewInitializerJob : public Qt3DCore::QAspectJob @@ -99,9 +102,10 @@ private: typedef QSharedPointer<RenderViewInitializerJob> RenderViewInitializerJobPtr; +} // namespace OpenGL } // namespace Render } // namespace Qt3DRender QT_END_NAMESPACE -#endif // QT3DRENDER_RENDER_RENDERVIEWINITIALIZERJOB_H +#endif // QT3DRENDER_RENDER_OPENGL_RENDERVIEWINITIALIZERJOB_H diff --git a/src/plugins/renderers/opengl/jobs/renderviewjobutils.cpp b/src/plugins/renderers/opengl/jobs/renderviewjobutils.cpp index c454aff77..c71f98568 100644 --- a/src/plugins/renderers/opengl/jobs/renderviewjobutils.cpp +++ b/src/plugins/renderers/opengl/jobs/renderviewjobutils.cpp @@ -76,6 +76,7 @@ using namespace Qt3DCore; namespace Qt3DRender { namespace Render { +namespace OpenGL { /*! \internal @@ -563,6 +564,7 @@ bool ParameterInfo::operator<(const int otherNameId) const Q_DECL_NOEXCEPT return nameId < otherNameId; } +} // namespace OpenGL } // namespace Render } // namespace Qt3DRender diff --git a/src/plugins/renderers/opengl/jobs/renderviewjobutils_p.h b/src/plugins/renderers/opengl/jobs/renderviewjobutils_p.h index b2fa59785..f021fc739 100644 --- a/src/plugins/renderers/opengl/jobs/renderviewjobutils_p.h +++ b/src/plugins/renderers/opengl/jobs/renderviewjobutils_p.h @@ -37,8 +37,8 @@ ** ****************************************************************************/ -#ifndef QT3DRENDER_RENDERVIEWJOBUTILS_P_H -#define QT3DRENDER_RENDERVIEWJOBUTILS_P_H +#ifndef QT3DRENDER_RENDER_OPENGL_RENDERVIEWJOBUTILS_P_H +#define QT3DRENDER_RENDER_OPENGL_RENDERVIEWJOBUTILS_P_H // // W A R N I N G @@ -75,19 +75,21 @@ class Effect; class Entity; class Material; class RenderPass; -class RenderStateSet; class Technique; -class RenderView; class TechniqueFilter; class RenderPassFilter; -class Renderer; class NodeManagers; class ShaderDataManager; -struct ShaderUniform; class ShaderData; class TextureManager; class RenderStateManager; class RenderStateCollection; +class RenderStateSet; + +namespace OpenGL { +class Renderer; +class RenderView; +struct ShaderUniform; Q_AUTOTEST_EXPORT void setRenderViewConfigFromFrameGraphLeafNode(RenderView *rv, const FrameGraphNode *fgLeaf); @@ -126,7 +128,7 @@ struct RenderPassParameterData RenderPass *pass; ParameterInfoList parameterInfo; }; -QT3D_DECLARE_TYPEINFO_2(Qt3DRender, Render, RenderPassParameterData, Q_MOVABLE_TYPE) +QT3D_DECLARE_TYPEINFO_3(Qt3DRender, Render, OpenGL, RenderPassParameterData, Q_MOVABLE_TYPE) using MaterialParameterGathererData = QHash<Qt3DCore::QNodeId, QVector<RenderPassParameterData>>; @@ -179,9 +181,10 @@ struct Q_AUTOTEST_EXPORT UniformBlockValueBuilder Matrix4x4 viewMatrix; }; +} // namespace OpenGL } // namespace Render } // namespace Qt3DRender QT_END_NAMESPACE -#endif // QT3DRENDER_RENDERVIEWJOBUTILS_P_H +#endif // QT3DRENDER_RENDER_OPENGL_RENDERVIEWJOBUTILS_P_H diff --git a/src/plugins/renderers/opengl/main.cpp b/src/plugins/renderers/opengl/main.cpp index 61e796788..a6cd9faf7 100644 --- a/src/plugins/renderers/opengl/main.cpp +++ b/src/plugins/renderers/opengl/main.cpp @@ -50,7 +50,7 @@ class OpenGLRendererPlugin : public Qt3DRender::Render::QRendererPlugin Qt3DRender::Render::AbstractRenderer *create(const QString &key, Qt3DRender::QRenderAspect::RenderType renderMode) override { Q_UNUSED(key) - return new Qt3DRender::Render::Renderer(renderMode); + return new Qt3DRender::Render::OpenGL::Renderer(renderMode); } }; 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 diff --git a/src/plugins/renderers/opengl/renderer/commandexecuter.cpp b/src/plugins/renderers/opengl/renderer/commandexecuter.cpp index 6498b44b8..03d5d5a7f 100644 --- a/src/plugins/renderers/opengl/renderer/commandexecuter.cpp +++ b/src/plugins/renderers/opengl/renderer/commandexecuter.cpp @@ -242,11 +242,11 @@ QJsonObject backendNodeToJSon(Handle handle, Manager *manager) return obj; } -QJsonObject parameterPackToJson(const Render::ShaderParameterPack &pack) +QJsonObject parameterPackToJson(const Render::OpenGL::ShaderParameterPack &pack) { QJsonObject obj; - const Render::PackUniformHash &uniforms = pack.uniforms(); + const Render::OpenGL::PackUniformHash &uniforms = pack.uniforms(); QJsonArray uniformsArray; for (int i = 0, m = uniforms.keys.size(); i < m; ++i) { QJsonObject uniformObj; @@ -261,7 +261,7 @@ QJsonObject parameterPackToJson(const Render::ShaderParameterPack &pack) obj.insert(QLatin1String("uniforms"), uniformsArray); QJsonArray texturesArray; - const QVector<Render::ShaderParameterPack::NamedResource> &textures = pack.textures(); + const QVector<Render::OpenGL::ShaderParameterPack::NamedResource> &textures = pack.textures(); for (const auto & texture : textures) { QJsonObject textureObj; textureObj.insert(QLatin1String("name"), Render::StringToInt::lookupString(texture.glslNameId)); @@ -270,7 +270,7 @@ QJsonObject parameterPackToJson(const Render::ShaderParameterPack &pack) } obj.insert(QLatin1String("textures"), texturesArray); - const QVector<Render::BlockToUBO> &ubos = pack.uniformBuffers(); + const QVector<Render::OpenGL::BlockToUBO> &ubos = pack.uniformBuffers(); QJsonArray ubosArray; for (const auto &ubo : ubos) { QJsonObject uboObj; @@ -281,7 +281,7 @@ QJsonObject parameterPackToJson(const Render::ShaderParameterPack &pack) } obj.insert(QLatin1String("ubos"), ubosArray); - const QVector<Render::BlockToSSBO> &ssbos = pack.shaderStorageBuffers(); + const QVector<Render::OpenGL::BlockToSSBO> &ssbos = pack.shaderStorageBuffers(); QJsonArray ssbosArray; for (const auto &ssbo : ssbos) { QJsonObject ssboObj; @@ -296,13 +296,13 @@ QJsonObject parameterPackToJson(const Render::ShaderParameterPack &pack) } // anonymous -CommandExecuter::CommandExecuter(Render::Renderer *renderer) +CommandExecuter::CommandExecuter(Render::OpenGL::Renderer *renderer) : m_renderer(renderer) { } // Render thread -void CommandExecuter::performAsynchronousCommandExecution(const QVector<Render::RenderView *> &views) +void CommandExecuter::performAsynchronousCommandExecution(const QVector<Render::OpenGL::RenderView *> &views) { QMutexLocker lock(&m_pendingCommandsMutex); const QVector<Qt3DCore::Debug::AsynchronousCommandReply *> shellCommands = std::move(m_pendingCommands); @@ -334,7 +334,7 @@ void CommandExecuter::performAsynchronousCommandExecution(const QVector<Render:: QJsonObject replyObj; QJsonArray viewArray; - for (Render::RenderView *v : views) { + for (Render::OpenGL::RenderView *v : views) { QJsonObject viewObj; viewObj.insert(QLatin1String("viewport"), typeToJsonValue(v->viewport())); viewObj.insert(QLatin1String("surfaceSize"), typeToJsonValue(v->surfaceSize())); @@ -346,7 +346,7 @@ void CommandExecuter::performAsynchronousCommandExecution(const QVector<Render:: viewObj.insert(QLatin1String("clearStencilValue"), v->clearStencilValue()); QJsonArray renderCommandsArray; - for (const Render::RenderCommand &c : v->commands()) { + for (Render::OpenGL::RenderCommand &c : v->commands()) { QJsonObject commandObj; Render::NodeManagers *nodeManagers = m_renderer->nodeManagers(); commandObj.insert(QLatin1String("shader"), typeToJsonValue(QVariant::fromValue(c.m_shaderId))); diff --git a/src/plugins/renderers/opengl/renderer/commandexecuter_p.h b/src/plugins/renderers/opengl/renderer/commandexecuter_p.h index 2d90bf4d6..9aea9fc2f 100644 --- a/src/plugins/renderers/opengl/renderer/commandexecuter_p.h +++ b/src/plugins/renderers/opengl/renderer/commandexecuter_p.h @@ -65,8 +65,10 @@ class AsynchronousCommandReply; namespace Qt3DRender { namespace Render { +namespace OpenGL { class Renderer; class RenderView; +} // OpenGL } // Render namespace Debug { @@ -74,14 +76,14 @@ namespace Debug { class CommandExecuter { public: - explicit CommandExecuter(Render::Renderer *renderer); + explicit CommandExecuter(Render::OpenGL::Renderer *renderer); - void performAsynchronousCommandExecution(const QVector<Render::RenderView *> &views); + void performAsynchronousCommandExecution(const QVector<Render::OpenGL::RenderView *> &views); QVariant executeCommand(const QStringList &args); private: - Render::Renderer *m_renderer; + Render::OpenGL::Renderer *m_renderer; QVector<Qt3DCore::Debug::AsynchronousCommandReply *> m_pendingCommands; QMutex m_pendingCommandsMutex; }; diff --git a/src/plugins/renderers/opengl/renderer/glshader.cpp b/src/plugins/renderers/opengl/renderer/glshader.cpp index 02fa2de6d..5e92d84c2 100644 --- a/src/plugins/renderers/opengl/renderer/glshader.cpp +++ b/src/plugins/renderers/opengl/renderer/glshader.cpp @@ -41,6 +41,7 @@ #include <QMutexLocker> #include <Qt3DRender/private/stringtoint_p.h> #include <graphicscontext_p.h> +#include <logging_p.h> QT_BEGIN_NAMESPACE @@ -48,6 +49,8 @@ namespace Qt3DRender { namespace Render { +namespace OpenGL { + GLShader::GLShader() : m_isLoaded(false) , m_graphicsContext(nullptr) @@ -309,6 +312,8 @@ void GLShader::initializeShaderStorageBlocks(const QVector<ShaderStorageBlock> & } } +} // OpenGL + } // Render } // Qt3DRender diff --git a/src/plugins/renderers/opengl/renderer/glshader_p.h b/src/plugins/renderers/opengl/renderer/glshader_p.h index 18293ac54..6bd5400af 100644 --- a/src/plugins/renderers/opengl/renderer/glshader_p.h +++ b/src/plugins/renderers/opengl/renderer/glshader_p.h @@ -37,8 +37,8 @@ ** ****************************************************************************/ -#ifndef QT3DRENDER_RENDER_GLSHADER_P_H -#define QT3DRENDER_RENDER_GLSHADER_P_H +#ifndef QT3DRENDER_RENDER_OPENGL_GLSHADER_P_H +#define QT3DRENDER_RENDER_OPENGL_GLSHADER_P_H // // W A R N I N G @@ -66,6 +66,8 @@ namespace Qt3DRender { namespace Render { +namespace OpenGL { + class Q_AUTOTEST_EXPORT GLShader { public: @@ -151,10 +153,12 @@ private: QMetaObject::Connection m_contextConnection; }; +} // OpenGL + } // Render } // Qt3DRender QT_END_NAMESPACE -#endif // QT3DRENDER_RENDER_GLSHADER_P_H +#endif // QT3DRENDER_RENDER_OPENGL_GLSHADER_P_H diff --git a/src/plugins/renderers/opengl/renderer/logging.cpp b/src/plugins/renderers/opengl/renderer/logging.cpp index ab7437eba..0d6ef1211 100644 --- a/src/plugins/renderers/opengl/renderer/logging.cpp +++ b/src/plugins/renderers/opengl/renderer/logging.cpp @@ -45,6 +45,8 @@ namespace Qt3DRender { namespace Render { +namespace OpenGL { + Q_LOGGING_CATEGORY(Backend, "Qt3D.Renderer.OpenGL.Backend", QtWarningMsg) Q_LOGGING_CATEGORY(Frontend, "Qt3D.Renderer.OpenGL.Frontend", QtWarningMsg) Q_LOGGING_CATEGORY(Io, "Qt3D.Renderer.OpenGL.IO", QtWarningMsg) @@ -58,6 +60,8 @@ Q_LOGGING_CATEGORY(Shaders, "Qt3D.Renderer.OpenGL.Shaders", QtWarningMsg) Q_LOGGING_CATEGORY(RenderStates, "Qt3D.Renderer.OpenGL.RenderStates", QtWarningMsg) Q_LOGGING_CATEGORY(VSyncAdvanceService, "Qt3D.Renderer.OpenGL.VsyncAdvanceService", QtWarningMsg) +} // namespace OpenGL + } // namespace Render } // namespace Qt3DRender diff --git a/src/plugins/renderers/opengl/renderer/logging_p.h b/src/plugins/renderers/opengl/renderer/logging_p.h index 8a550e22f..69c125195 100644 --- a/src/plugins/renderers/opengl/renderer/logging_p.h +++ b/src/plugins/renderers/opengl/renderer/logging_p.h @@ -59,6 +59,8 @@ namespace Qt3DRender { namespace Render { +namespace OpenGL { + Q_DECLARE_LOGGING_CATEGORY(Backend) Q_DECLARE_LOGGING_CATEGORY(Frontend) Q_DECLARE_LOGGING_CATEGORY(Io) @@ -72,6 +74,8 @@ Q_DECLARE_LOGGING_CATEGORY(Shaders) Q_DECLARE_LOGGING_CATEGORY(RenderStates) Q_DECLARE_LOGGING_CATEGORY(VSyncAdvanceService) +} // namespace OpenGL + } // namespace Render } // namespace Qt3DRender diff --git a/src/plugins/renderers/opengl/renderer/openglvertexarrayobject.cpp b/src/plugins/renderers/opengl/renderer/openglvertexarrayobject.cpp index 19ae4fa55..b43815f98 100644 --- a/src/plugins/renderers/opengl/renderer/openglvertexarrayobject.cpp +++ b/src/plugins/renderers/opengl/renderer/openglvertexarrayobject.cpp @@ -47,6 +47,7 @@ QT_BEGIN_NAMESPACE namespace Qt3DRender { namespace Render { +namespace OpenGL { OpenGLVertexArrayObject::OpenGLVertexArrayObject() : m_ctx(nullptr) @@ -159,6 +160,7 @@ void OpenGLVertexArrayObject::saveVertexAttribute(const SubmissionContext::VAOVe } +} // namespace OpenGL } // namespace Render } // namespace Qt3DRender diff --git a/src/plugins/renderers/opengl/renderer/openglvertexarrayobject_p.h b/src/plugins/renderers/opengl/renderer/openglvertexarrayobject_p.h index d422b5b8b..a92616f2f 100644 --- a/src/plugins/renderers/opengl/renderer/openglvertexarrayobject_p.h +++ b/src/plugins/renderers/opengl/renderer/openglvertexarrayobject_p.h @@ -37,8 +37,8 @@ ** ****************************************************************************/ -#ifndef OPENGLVERTEXARRAYOBJECT_H -#define OPENGLVERTEXARRAYOBJECT_H +#ifndef QT3DRENDER_RENDER_OPENGL_OPENGLVERTEXARRAYOBJECT_H +#define QT3DRENDER_RENDER_OPENGL_OPENGLVERTEXARRAYOBJECT_H // // W A R N I N G @@ -60,10 +60,13 @@ namespace Qt3DRender { namespace Render { class GeometryManager; -class GLShaderManager; typedef QPair<HGeometry, Qt3DCore::QNodeId> VAOIdentifier; +namespace OpenGL { + +class GLShaderManager; + class OpenGLVertexArrayObject { public: @@ -103,9 +106,10 @@ private: SubmissionContext::VAOIndexAttribute m_indexAttribute; }; +} // namespace OpenGL } // namespace Render } // namespace Qt3DRender QT_END_NAMESPACE -#endif // OPENGLVERTEXARRAYOBJECT_H +#endif // QT3DRENDER_RENDER_OPENGL_OPENGLVERTEXARRAYOBJECT_H diff --git a/src/plugins/renderers/opengl/renderer/rendercommand.cpp b/src/plugins/renderers/opengl/renderer/rendercommand.cpp index c6d42fde1..d4da1a41b 100644 --- a/src/plugins/renderers/opengl/renderer/rendercommand.cpp +++ b/src/plugins/renderers/opengl/renderer/rendercommand.cpp @@ -43,6 +43,7 @@ QT_BEGIN_NAMESPACE namespace Qt3DRender { namespace Render { +namespace OpenGL { RenderCommand::RenderCommand() : m_glShader(nullptr) @@ -85,6 +86,7 @@ bool operator==(const RenderCommand &a, const RenderCommand &b) noexcept a.m_isValid == b.m_isValid && a.m_computeCommand == b.m_computeCommand); } +} // namespace OpenGL } // namespace Render } // namespace Qt3DRender diff --git a/src/plugins/renderers/opengl/renderer/rendercommand_p.h b/src/plugins/renderers/opengl/renderer/rendercommand_p.h index 600c52959..123ff232b 100644 --- a/src/plugins/renderers/opengl/renderer/rendercommand_p.h +++ b/src/plugins/renderers/opengl/renderer/rendercommand_p.h @@ -38,8 +38,8 @@ ** ****************************************************************************/ -#ifndef QT3DRENDER_RENDER_RENDERCOMMAND_H -#define QT3DRENDER_RENDER_RENDERCOMMAND_H +#ifndef QT3DRENDER_RENDER_OPENGL_RENDERCOMMAND_H +#define QT3DRENDER_RENDER_OPENGL_RENDERCOMMAND_H // // W A R N I N G @@ -72,6 +72,9 @@ namespace Render { class RenderStateSet; using RenderStateSetPtr = QSharedPointer<RenderStateSet>; + +namespace OpenGL { + class GLShader; class Q_AUTOTEST_EXPORT RenderCommand @@ -172,6 +175,7 @@ struct EntityRenderCommandData using EntityRenderCommandDataPtr = QSharedPointer<EntityRenderCommandData>; +} // namespace OpenGL } // namespace Render @@ -179,4 +183,4 @@ using EntityRenderCommandDataPtr = QSharedPointer<EntityRenderCommandData>; QT_END_NAMESPACE -#endif // QT3DRENDER_RENDER_RENDERCOMMAND_H +#endif // QT3DRENDER_RENDER_OPENGL_RENDERCOMMAND_H diff --git a/src/plugins/renderers/opengl/renderer/renderer.cpp b/src/plugins/renderers/opengl/renderer/renderer.cpp index a090f7abb..b7c7d46c4 100644 --- a/src/plugins/renderers/opengl/renderer/renderer.cpp +++ b/src/plugins/renderers/opengl/renderer/renderer.cpp @@ -131,6 +131,7 @@ using namespace Qt3DCore; namespace Qt3DRender { namespace Render { +namespace OpenGL { namespace { @@ -206,7 +207,6 @@ private: } // anonymous - /*! \internal @@ -258,7 +258,7 @@ Renderer::Renderer(QRenderAspect::RenderType type) , m_updateSkinningPaletteJob(Render::UpdateSkinningPaletteJobPtr::create()) , m_updateLevelOfDetailJob(Render::UpdateLevelOfDetailJobPtr::create()) , m_updateMeshTriangleListJob(Render::UpdateMeshTriangleListJobPtr::create()) - , m_filterCompatibleTechniqueJob(Render::FilterCompatibleTechniqueJobPtr::create()) + , m_filterCompatibleTechniqueJob(FilterCompatibleTechniqueJobPtr::create()) , m_updateEntityLayersJob(Render::UpdateEntityLayersJobPtr::create()) , m_lightGathererJob(Render::LightGathererPtr::create()) , m_renderableEntityFilterJob(Render::RenderableEntityFilterPtr::create()) @@ -502,7 +502,8 @@ void Renderer::initialize() ctx->setFormat(sf); } - // Create OpenGL context + // Create OpenGL context<<<<<<< HEAD + if (ctx->create()) qCDebug(Backend) << "OpenGL context created with actual format" << ctx->format(); else @@ -776,18 +777,17 @@ void Renderer::doRender(bool swapBuffers) // RenderQueue is complete (but that means it may be of size 0) if (canSubmit && (queueIsComplete && !queueIsEmpty)) { - const QVector<Render::RenderView *> renderViews = m_renderQueue->nextFrameQueue(); + const QVector<Render::OpenGL::RenderView *> renderViews = m_renderQueue->nextFrameQueue(); QTaskLogger submissionStatsPart1(m_services->systemInformation(), {JobTypes::FrameSubmissionPart1, 0}, QTaskLogger::Submission); QTaskLogger submissionStatsPart2(m_services->systemInformation(), {JobTypes::FrameSubmissionPart2, 0}, QTaskLogger::Submission); - if (canRender()) { { // Scoped to destroy surfaceLock QSurface *surface = nullptr; - for (const Render::RenderView *rv: renderViews) { + for (const RenderView *rv: renderViews) { surface = rv->surface(); if (surface) break; @@ -881,7 +881,7 @@ void Renderer::doRender(bool swapBuffers) // Called by RenderViewJobs // When the frameQueue is complete and we are using a renderThread // we allow the render thread to proceed -void Renderer::enqueueRenderView(Render::RenderView *renderView, int submitOrder) +void Renderer::enqueueRenderView(RenderView *renderView, int submitOrder) { QMutexLocker locker(m_renderQueue->mutex()); // Prevent out of order execution // We cannot use a lock free primitive here because: @@ -1506,7 +1506,7 @@ void Renderer::downloadGLBuffers() // Happens in RenderThread context when all RenderViewJobs are done // Returns the id of the last bound FBO -Renderer::ViewSubmissionResultData Renderer::submitRenderViews(const QVector<Render::RenderView *> &renderViews) +Renderer::ViewSubmissionResultData Renderer::submitRenderViews(const QVector<RenderView *> &renderViews) { QElapsedTimer timer; quint64 queueElapsed = 0; @@ -1522,7 +1522,7 @@ Renderer::ViewSubmissionResultData Renderer::submitRenderViews(const QVector<Ren uint lastBoundFBOId = m_submissionContext->boundFrameBufferObject(); QSurface *surface = nullptr; QSurface *previousSurface = nullptr; - for (const Render::RenderView *rv: renderViews) { + for (const RenderView *rv: renderViews) { previousSurface = rv->surface(); if (previousSurface) break; @@ -2408,6 +2408,7 @@ QVector<Qt3DCore::QAspectJobPtr> Renderer::createRenderBufferJobs() const return dirtyBuffersJobs; } +} // namespace OpenGL } // namespace Render } // namespace Qt3DRender diff --git a/src/plugins/renderers/opengl/renderer/renderer_p.h b/src/plugins/renderers/opengl/renderer/renderer_p.h index eac622192..b6159a884 100644 --- a/src/plugins/renderers/opengl/renderer/renderer_p.h +++ b/src/plugins/renderers/opengl/renderer/renderer_p.h @@ -38,8 +38,8 @@ ** ****************************************************************************/ -#ifndef QT3DRENDER_RENDER_RENDERER_H -#define QT3DRENDER_RENDER_RENDERER_H +#ifndef QT3DRENDER_RENDER_OPENGL_RENDERER_H +#define QT3DRENDER_RENDER_OPENGL_RENDERER_H // // W A R N I N G @@ -135,15 +135,11 @@ class CommandExecuter; namespace Render { class CameraLens; -class SubmissionContext; class FrameGraphNode; class Material; class Technique; class Shader; class Entity; -class RenderCommand; -class RenderQueue; -class RenderView; class Effect; class RenderPass; class RenderThread; @@ -151,16 +147,11 @@ class RenderStateSet; class VSyncFrameAdvanceService; class PickEventFilter; class NodeManagers; -class GLResourceManagers; -class GLShader; class ResourceAccessor; class UpdateLevelOfDetailJob; typedef QSharedPointer<UpdateLevelOfDetailJob> UpdateLevelOfDetailJobPtr; -using SynchronizerJobPtr = GenericLambdaJobPtr<std::function<void()>>; -using SynchronizerPostFramePtr = GenericLambdaJobAndPostFramePtr<std::function<void ()>, std::function<void (Qt3DCore::QAspectManager *)>>; - template<typename T, typename ... Ts> class FilterEntityByComponentJob; template<typename T, typename ... Ts> @@ -168,6 +159,19 @@ using FilterEntityByComponentJobPtr = QSharedPointer<FilterEntityByComponentJob< using ComputableEntityFilterPtr = FilterEntityByComponentJobPtr<Render::ComputeCommand, Render::Material>; using RenderableEntityFilterPtr = FilterEntityByComponentJobPtr<Render::GeometryRenderer, Render::Material>; +using SynchronizerJobPtr = GenericLambdaJobPtr<std::function<void()>>; +using SynchronizerPostFramePtr = GenericLambdaJobAndPostFramePtr<std::function<void ()>, std::function<void (Qt3DCore::QAspectManager *)>>; + +namespace OpenGL { + +class CommandThread; +class SubmissionContext; +class RenderCommand; +class RenderQueue; +class RenderView; +class GLShader; +class GLResourceManagers; + class Q_3DRENDERSHARED_PRIVATE_EXPORT Renderer : public AbstractRenderer { public: @@ -314,7 +318,7 @@ public: QSurface *surface; }; - ViewSubmissionResultData submitRenderViews(const QVector<Render::RenderView *> &renderViews); + ViewSubmissionResultData submitRenderViews(const QVector<RenderView *> &renderViews); RendererCache *cache() { return &m_cache; } void setScreen(QScreen *scr) override; @@ -456,9 +460,10 @@ private: QSharedPointer<ResourceAccessor> m_scene2DResourceAccessor; }; +} // namespace OpenGL } // namespace Render } // namespace Qt3DRender QT_END_NAMESPACE -#endif // QT3DRENDER_RENDER_RENDERER_H +#endif // QT3DRENDER_RENDER_OPENGL_RENDERER_H diff --git a/src/plugins/renderers/opengl/renderer/renderercache_p.h b/src/plugins/renderers/opengl/renderer/renderercache_p.h index 70a5ef43c..6b3946002 100644 --- a/src/plugins/renderers/opengl/renderer/renderercache_p.h +++ b/src/plugins/renderers/opengl/renderer/renderercache_p.h @@ -37,8 +37,8 @@ ** ****************************************************************************/ -#ifndef QT3DRENDER_RENDER_RENDERERCACHE_P_H -#define QT3DRENDER_RENDER_RENDERERCACHE_P_H +#ifndef QT3DRENDER_RENDER_OPENGL_RENDERERCACHE_P_H +#define QT3DRENDER_RENDER_OPENGL_RENDERERCACHE_P_H // // W A R N I N G @@ -64,6 +64,8 @@ namespace Qt3DRender { namespace Render { +namespace OpenGL { + struct RendererCache { struct LeafNodeData @@ -88,10 +90,12 @@ private: QMutex m_mutex; }; +} // namespace OpenGL + } // namespace Render } // namespace Qt3DRender QT_END_NAMESPACE -#endif // QT3DRENDER_RENDER_RENDERERCACHE_P_H +#endif // QT3DRENDER_RENDER_OPENGL_RENDERERCACHE_P_H diff --git a/src/plugins/renderers/opengl/renderer/renderqueue.cpp b/src/plugins/renderers/opengl/renderer/renderqueue.cpp index 9ba66952f..15b89da30 100644 --- a/src/plugins/renderers/opengl/renderer/renderqueue.cpp +++ b/src/plugins/renderers/opengl/renderer/renderqueue.cpp @@ -47,6 +47,8 @@ namespace Qt3DRender { namespace Render { +namespace OpenGL { + RenderQueue::RenderQueue() : m_noRender(false) , m_wasReset(true) @@ -126,6 +128,8 @@ bool RenderQueue::isFrameQueueComplete() const || (m_targetRenderViewCount > 0 && m_targetRenderViewCount == m_currentRenderViewCount)); } +} // namespace OpenGL + } // namespace Render } // namespace Qt3DRender diff --git a/src/plugins/renderers/opengl/renderer/renderqueue_p.h b/src/plugins/renderers/opengl/renderer/renderqueue_p.h index e565115f2..0dcf7b8ee 100644 --- a/src/plugins/renderers/opengl/renderer/renderqueue_p.h +++ b/src/plugins/renderers/opengl/renderer/renderqueue_p.h @@ -37,8 +37,8 @@ ** ****************************************************************************/ -#ifndef QT3DRENDER_RENDER_RENDERQUEUE_H -#define QT3DRENDER_RENDER_RENDERQUEUE_H +#ifndef QT3DRENDER_RENDER_OPENGL_RENDERQUEUE_H +#define QT3DRENDER_RENDER_OPENGL_RENDERQUEUE_H // // W A R N I N G @@ -61,6 +61,8 @@ namespace Qt3DRender { namespace Render { +namespace OpenGL { + class RenderView; class Q_AUTOTEST_EXPORT RenderQueue @@ -93,10 +95,12 @@ private: QMutex m_mutex; }; +} // namespace OpenGL + } // namespace Render } // namespace Qt3DRender QT_END_NAMESPACE -#endif // QT3DRENDER_RENDER_RENDERQUEUE_H +#endif // QT3DRENDER_RENDER_OPENGL_RENDERQUEUE_H diff --git a/src/plugins/renderers/opengl/renderer/renderview.cpp b/src/plugins/renderers/opengl/renderer/renderview.cpp index bd4c98a01..30182f768 100644 --- a/src/plugins/renderers/opengl/renderer/renderview.cpp +++ b/src/plugins/renderers/opengl/renderer/renderview.cpp @@ -85,6 +85,7 @@ QT_BEGIN_NAMESPACE namespace Qt3DRender { namespace Render { +namespace OpenGL { namespace { @@ -1223,6 +1224,7 @@ void RenderView::setIsDownloadBuffersEnable(bool isDownloadBuffersEnable) m_isDownloadBuffersEnable = isDownloadBuffersEnable; } +} // namespace OpenGL } // namespace Render } // namespace Qt3DRender diff --git a/src/plugins/renderers/opengl/renderer/renderview_p.h b/src/plugins/renderers/opengl/renderer/renderview_p.h index c12ee627a..5e64f59b9 100644 --- a/src/plugins/renderers/opengl/renderer/renderview_p.h +++ b/src/plugins/renderers/opengl/renderer/renderview_p.h @@ -38,8 +38,8 @@ ** ****************************************************************************/ -#ifndef QT3DRENDER_RENDER_RENDERVIEW_H -#define QT3DRENDER_RENDER_RENDERVIEW_H +#ifndef QT3DRENDER_RENDER_OPENGL_RENDERVIEW_H +#define QT3DRENDER_RENDER_OPENGL_RENDERVIEW_H // // W A R N I N G @@ -86,15 +86,18 @@ class QRenderPass; namespace Render { -class Renderer; class NodeManagers; -class RenderCommand; class RenderPassFilter; class TechniqueFilter; class ViewportNode; class Effect; class RenderPass; +namespace OpenGL { + +class Renderer; +class RenderCommand; + typedef QPair<ShaderUniform, QVariant> ActivePropertyContent; typedef QPair<QString, ActivePropertyContent > ActiveProperty; @@ -386,9 +389,10 @@ private: const QString &structName) const; }; +} // namespace OpenGL } // namespace Render } // namespace Qt3DRender QT_END_NAMESPACE -#endif // QT3DRENDER_RENDER_RENDERVIEW_H +#endif // QT3DRENDER_RENDER_OPENGL_ENDERVIEW_H diff --git a/src/plugins/renderers/opengl/renderer/renderviewbuilder.cpp b/src/plugins/renderers/opengl/renderer/renderviewbuilder.cpp index 8f1b17119..0488fb60e 100644 --- a/src/plugins/renderers/opengl/renderer/renderviewbuilder.cpp +++ b/src/plugins/renderers/opengl/renderer/renderviewbuilder.cpp @@ -46,6 +46,7 @@ QT_BEGIN_NAMESPACE namespace Qt3DRender { namespace Render { +namespace OpenGL { // In some cases having less jobs is better (especially on fast cpus where // splitting just adds more overhead). Ideally, we should try to set the value @@ -554,7 +555,7 @@ void RenderViewBuilder::prepareJobs() m_renderViewCommandBuilderJobs.reserve(RenderViewBuilder::m_optimalParallelJobCount); for (auto i = 0; i < RenderViewBuilder::m_optimalParallelJobCount; ++i) { - auto renderViewCommandBuilder = Render::RenderViewCommandBuilderJobPtr::create(); + auto renderViewCommandBuilder = Render::OpenGL::RenderViewCommandBuilderJobPtr::create(); m_renderViewCommandBuilderJobs.push_back(renderViewCommandBuilder); } m_syncRenderViewPreCommandBuildingJob = SynchronizerJobPtr::create(SyncPreCommandBuilding(m_renderViewJob, @@ -572,7 +573,7 @@ void RenderViewBuilder::prepareJobs() // Estimate the number of jobs to create based on the number of entities m_renderViewCommandUpdaterJobs.reserve(RenderViewBuilder::m_optimalParallelJobCount); for (auto i = 0; i < RenderViewBuilder::m_optimalParallelJobCount; ++i) { - auto renderViewCommandUpdater = Render::RenderViewCommandUpdaterJobPtr::create(); + auto renderViewCommandUpdater = Render::OpenGL::RenderViewCommandUpdaterJobPtr::create(); renderViewCommandUpdater->setRenderer(m_renderer); m_renderViewCommandUpdaterJobs.push_back(renderViewCommandUpdater); } @@ -584,7 +585,7 @@ void RenderViewBuilder::prepareJobs() const int lastRemaingElements = materialHandles.size() % RenderViewBuilder::m_optimalParallelJobCount; m_materialGathererJobs.reserve(RenderViewBuilder::m_optimalParallelJobCount); for (auto i = 0; i < RenderViewBuilder::m_optimalParallelJobCount; ++i) { - auto materialGatherer = Render::MaterialParameterGathererJobPtr::create(); + auto materialGatherer = MaterialParameterGathererJobPtr::create(); materialGatherer->setNodeManagers(m_renderer->nodeManagers()); if (i == RenderViewBuilder::m_optimalParallelJobCount - 1) materialGatherer->setHandles(materialHandles.mid(i * elementsPerJob, elementsPerJob + lastRemaingElements)); @@ -796,6 +797,8 @@ QVector<Entity *> RenderViewBuilder::entitiesInSubset(const QVector<Entity *> &e return intersection; } +} // OpenGL + } // Render } // Qt3DRender diff --git a/src/plugins/renderers/opengl/renderer/renderviewbuilder_p.h b/src/plugins/renderers/opengl/renderer/renderviewbuilder_p.h index 71719abee..98202670e 100644 --- a/src/plugins/renderers/opengl/renderer/renderviewbuilder_p.h +++ b/src/plugins/renderers/opengl/renderer/renderviewbuilder_p.h @@ -37,8 +37,8 @@ ** ****************************************************************************/ -#ifndef QT3DRENDER_RENDER_RENDERVIEWBUILDER_H -#define QT3DRENDER_RENDER_RENDERVIEWBUILDER_H +#ifndef QT3DRENDER_RENDER_OPENGL_RENDERVIEWBUILDER_H +#define QT3DRENDER_RENDER_OPENGL_RENDERVIEWBUILDER_H // // W A R N I N G @@ -70,6 +70,8 @@ namespace Qt3DRender { namespace Render { +namespace OpenGL { + class Renderer; using SynchronizerJobPtr = GenericLambdaJobPtr<std::function<void()>>; @@ -139,10 +141,12 @@ private: static const int m_optimalParallelJobCount; }; +} // OpenGL + } // Render } // Qt3DRender QT_END_NAMESPACE -#endif // QT3DRENDER_RENDER_RENDERVIEWBUILDER_H +#endif // QT3DRENDER_RENDER_OPENGL_RENDERVIEWBUILDER_H diff --git a/src/plugins/renderers/opengl/renderer/shaderparameterpack.cpp b/src/plugins/renderers/opengl/renderer/shaderparameterpack.cpp index e3cc7baf7..8c509f804 100644 --- a/src/plugins/renderers/opengl/renderer/shaderparameterpack.cpp +++ b/src/plugins/renderers/opengl/renderer/shaderparameterpack.cpp @@ -54,6 +54,7 @@ QT_BEGIN_NAMESPACE namespace Qt3DRender { namespace Render { +namespace OpenGL { ShaderParameterPack::~ShaderParameterPack() { @@ -106,6 +107,7 @@ void ShaderParameterPack::setSubmissionUniform(const ShaderUniform &uniform) m_submissionUniforms.push_back(uniform); } +} // namespace OpenGL } // namespace Render } // namespace Qt3DRender diff --git a/src/plugins/renderers/opengl/renderer/shaderparameterpack_p.h b/src/plugins/renderers/opengl/renderer/shaderparameterpack_p.h index 045081afd..d658d223b 100644 --- a/src/plugins/renderers/opengl/renderer/shaderparameterpack_p.h +++ b/src/plugins/renderers/opengl/renderer/shaderparameterpack_p.h @@ -37,8 +37,8 @@ ** ****************************************************************************/ -#ifndef QT3DRENDER_RENDER_SHADERPARAMETERPACK_P_H -#define QT3DRENDER_RENDER_SHADERPARAMETERPACK_P_H +#ifndef QT3DRENDER_RENDER_OPENGL_SHADERPARAMETERPACK_P_H +#define QT3DRENDER_RENDER_OPENGL_SHADERPARAMETERPACK_P_H // // W A R N I N G @@ -70,6 +70,7 @@ class QFrameAllocator; namespace Qt3DRender { namespace Render { +namespace OpenGL { class GraphicsContext; @@ -79,14 +80,14 @@ struct BlockToUBO { bool m_needsUpdate; QHash<QString, QVariant> m_updatedProperties; }; -QT3D_DECLARE_TYPEINFO_2(Qt3DRender, Render, BlockToUBO, Q_MOVABLE_TYPE) +QT3D_DECLARE_TYPEINFO_3(Qt3DRender, Render, OpenGL, BlockToUBO, Q_MOVABLE_TYPE) struct BlockToSSBO { int m_blockIndex; int m_bindingIndex; Qt3DCore::QNodeId m_bufferID; }; -QT3D_DECLARE_TYPEINFO_2(Qt3DRender, Render, BlockToSSBO, Q_PRIMITIVE_TYPE) +QT3D_DECLARE_TYPEINFO_3(Qt3DRender, Render, OpenGL, BlockToSSBO, Q_PRIMITIVE_TYPE) struct PackUniformHash @@ -209,13 +210,14 @@ private: friend class RenderView; }; -QT3D_DECLARE_TYPEINFO_2(Qt3DRender, Render, ShaderParameterPack::NamedResource, Q_PRIMITIVE_TYPE) +QT3D_DECLARE_TYPEINFO_3(Qt3DRender, Render, OpenGL, ShaderParameterPack::NamedResource, Q_PRIMITIVE_TYPE) +} // namespace OpenGL } // namespace Render } // namespace Qt3DRender QT_END_NAMESPACE -Q_DECLARE_METATYPE(Qt3DRender::Render::ShaderParameterPack) +Q_DECLARE_METATYPE(Qt3DRender::Render::OpenGL::ShaderParameterPack) -#endif // QT3DRENDER_RENDER_SHADERPARAMETERPACK_P_H +#endif // QT3DRENDER_RENDER_OPENGL_SHADERPARAMETERPACK_P_H diff --git a/src/plugins/renderers/opengl/renderer/shadervariables_p.h b/src/plugins/renderers/opengl/renderer/shadervariables_p.h index e0fa07dff..8c7bee5ab 100644 --- a/src/plugins/renderers/opengl/renderer/shadervariables_p.h +++ b/src/plugins/renderers/opengl/renderer/shadervariables_p.h @@ -37,8 +37,8 @@ ** ****************************************************************************/ -#ifndef QT3DRENDER_RENDER_SHADERVARIABLES_P_H -#define QT3DRENDER_RENDER_SHADERVARIABLES_P_H +#ifndef QT3DRENDER_RENDER_OPENGL_SHADERVARIABLES_P_H +#define QT3DRENDER_RENDER_OPENGL_SHADERVARIABLES_P_H // // W A R N I N G @@ -60,6 +60,8 @@ namespace Qt3DRender { namespace Render { +namespace OpenGL { + struct ShaderAttribute { ShaderAttribute() @@ -75,7 +77,7 @@ struct ShaderAttribute int m_size; int m_location; }; -QT3D_DECLARE_TYPEINFO_2(Qt3DRender, Render, ShaderAttribute, Q_MOVABLE_TYPE) +QT3D_DECLARE_TYPEINFO_3(Qt3DRender, Render, OpenGL, ShaderAttribute, Q_MOVABLE_TYPE) struct ShaderUniform { @@ -103,7 +105,7 @@ struct ShaderUniform uint m_rawByteSize; // contains byte size (size / type / strides) // size, offset and strides are in bytes }; -QT3D_DECLARE_TYPEINFO_2(Qt3DRender, Render, ShaderUniform, Q_MOVABLE_TYPE) +QT3D_DECLARE_TYPEINFO_3(Qt3DRender, Render, OpenGL, ShaderUniform, Q_MOVABLE_TYPE) struct ShaderUniformBlock { @@ -122,7 +124,7 @@ struct ShaderUniformBlock int m_activeUniformsCount; int m_size; }; -QT3D_DECLARE_TYPEINFO_2(Qt3DRender, Render, ShaderUniformBlock, Q_MOVABLE_TYPE) +QT3D_DECLARE_TYPEINFO_3(Qt3DRender, Render, OpenGL, ShaderUniformBlock, Q_MOVABLE_TYPE) struct ShaderStorageBlock { @@ -141,7 +143,9 @@ struct ShaderStorageBlock int m_size; int m_activeVariablesCount; }; -QT3D_DECLARE_TYPEINFO_2(Qt3DRender, Render, ShaderStorageBlock, Q_MOVABLE_TYPE) +QT3D_DECLARE_TYPEINFO_3(Qt3DRender, Render, OpenGL, ShaderStorageBlock, Q_MOVABLE_TYPE) + +} // namespace OpenGL } // namespace Render @@ -149,4 +153,4 @@ QT3D_DECLARE_TYPEINFO_2(Qt3DRender, Render, ShaderStorageBlock, Q_MOVABLE_TYPE) QT_END_NAMESPACE -#endif // QT3DRENDER_RENDER_SHADERVARIABLES_P_H +#endif // QT3DRENDER_RENDER_OPENGL_SHADERVARIABLES_P_H diff --git a/src/plugins/renderers/opengl/textures/gltexture.cpp b/src/plugins/renderers/opengl/textures/gltexture.cpp index c79961d78..11b43e085 100644 --- a/src/plugins/renderers/opengl/textures/gltexture.cpp +++ b/src/plugins/renderers/opengl/textures/gltexture.cpp @@ -66,6 +66,7 @@ using namespace Qt3DCore; namespace Qt3DRender { namespace Render { +namespace OpenGL { namespace { @@ -766,6 +767,7 @@ void GLTexture::introspectPropertiesFromSharedTextureId() gl->glBindTexture(m_properties.target, 0); } +} // namespace OpenGL } // namespace Render } // namespace Qt3DRender diff --git a/src/plugins/renderers/opengl/textures/gltexture_p.h b/src/plugins/renderers/opengl/textures/gltexture_p.h index ca851712d..576ef5001 100644 --- a/src/plugins/renderers/opengl/textures/gltexture_p.h +++ b/src/plugins/renderers/opengl/textures/gltexture_p.h @@ -37,8 +37,8 @@ ** ****************************************************************************/ -#ifndef QT3DRENDER_RENDER_GLTEXTURE_H -#define QT3DRENDER_RENDER_GLTEXTURE_H +#ifndef QT3DRENDER_RENDER_OPENGL_GLTEXTURE_H +#define QT3DRENDER_RENDER_OPENGL_GLTEXTURE_H // // W A R N I N G @@ -69,9 +69,14 @@ class QOpenGLTexture; namespace Qt3DRender { namespace Render { +template<class APITexture, class APITextureImage> +class APITextureManager; + class TextureImageManager; class TextureDataManager; class TextureImageDataManager; + +namespace OpenGL { class RenderBuffer; /** @@ -258,9 +263,10 @@ private: bool m_wasTextureRecreated; }; +} // namespace OpenGL } // namespace Render } // namespace Qt3DRender QT_END_NAMESPACE -#endif // QT3DRENDER_RENDER_GLTEXTURE_H +#endif // QT3DRENDER_RENDER_OPENGL_GLTEXTURE_H diff --git a/src/plugins/renderers/opengl/textures/renderbuffer.cpp b/src/plugins/renderers/opengl/textures/renderbuffer.cpp index bc5050f73..330e29472 100644 --- a/src/plugins/renderers/opengl/textures/renderbuffer.cpp +++ b/src/plugins/renderers/opengl/textures/renderbuffer.cpp @@ -45,6 +45,7 @@ QT_BEGIN_NAMESPACE namespace Qt3DRender { namespace Render { +namespace OpenGL { RenderBuffer::RenderBuffer(int width, int height, QAbstractTexture::TextureFormat format) : m_size(width, height), @@ -106,6 +107,7 @@ void RenderBuffer::release() m_context->functions()->glBindRenderbuffer(GL_RENDERBUFFER, 0); } +} // namespace OpenGL } // namespace Render } // namespace Qt3DRender diff --git a/src/plugins/renderers/opengl/textures/renderbuffer_p.h b/src/plugins/renderers/opengl/textures/renderbuffer_p.h index 7dc62492a..16fc90e67 100644 --- a/src/plugins/renderers/opengl/textures/renderbuffer_p.h +++ b/src/plugins/renderers/opengl/textures/renderbuffer_p.h @@ -37,8 +37,8 @@ ** ****************************************************************************/ -#ifndef QT3DRENDER_RENDER_RENDERBUFFER_P_H -#define QT3DRENDER_RENDER_RENDERBUFFER_P_H +#ifndef QT3DRENDER_RENDER_OPENGL_RENDERBUFFER_P_H +#define QT3DRENDER_RENDER_OPENGL_RENDERBUFFER_P_H // // W A R N I N G @@ -59,6 +59,7 @@ class QOpenGLContext; namespace Qt3DRender { namespace Render { +namespace OpenGL { class Q_AUTOTEST_EXPORT RenderBuffer { @@ -82,9 +83,10 @@ private: QOpenGLContext *m_context; }; +} // namespace OpenGL } // namespace Render } // namespace Qt3DRender QT_END_NAMESPACE -#endif // QT3DRENDER_RENDER_RENDERBUFFER_P_H +#endif // QT3DRENDER_RENDER_OPENGL_RENDERBUFFER_P_H diff --git a/src/render/framegraph/nopicking_p.h b/src/render/framegraph/nopicking_p.h index 4ecf6e33b..f72090ef6 100644 --- a/src/render/framegraph/nopicking_p.h +++ b/src/render/framegraph/nopicking_p.h @@ -39,6 +39,7 @@ #ifndef QT3DRENDER_RENDER_NOPICKING_P_H #define QT3DRENDER_RENDER_NOPICKING_P_H + // // W A R N I N G // ------------- diff --git a/src/render/frontend/qrenderaspect.cpp b/src/render/frontend/qrenderaspect.cpp index a5cf7d90e..196b5b333 100644 --- a/src/render/frontend/qrenderaspect.cpp +++ b/src/render/frontend/qrenderaspect.cpp @@ -678,6 +678,7 @@ Render::AbstractRenderer *QRenderAspectPrivate::loadRendererPlugin() if (renderer) return renderer; } + qFatal("Unable to load a renderer plugin"); return nullptr; } diff --git a/src/render/materialsystem/shader.cpp b/src/render/materialsystem/shader.cpp index f3570f78d..94e30a2c0 100644 --- a/src/render/materialsystem/shader.cpp +++ b/src/render/materialsystem/shader.cpp @@ -166,6 +166,12 @@ void Shader::initializeFromReference(const Shader &other) setLog(other.log()); } +// Called by renderer plugin when loading a GL Shader plugins +void Shader::requestCacheRebuild() +{ + markDirty(AbstractRenderer::MaterialDirty); +} + void Shader::setLog(const QString &log) { m_log = log; diff --git a/src/render/materialsystem/shader_p.h b/src/render/materialsystem/shader_p.h index 9065a6524..e4221603d 100644 --- a/src/render/materialsystem/shader_p.h +++ b/src/render/materialsystem/shader_p.h @@ -115,6 +115,13 @@ public: inline bool requiresFrontendSync() const { return m_requiresFrontendSync; } inline void unsetRequiresFrontendSync() { m_requiresFrontendSync = false; } + // Set by Renderer plugin + void setLog(const QString &log); + void setStatus(QShaderProgram::Status status); + void initializeFromReference(const Shader &other); + + void requestCacheRebuild(); + private: QVector<QByteArray> m_shaderCode; @@ -125,12 +132,6 @@ private: bool m_dirty; QVector<Qt3DCore::QPropertyUpdatedChangePtr> m_pendingNotifications; - - void initializeFromReference(const Shader &other); - void setLog(const QString &log); - void setStatus(QShaderProgram::Status status); - - friend class GraphicsContext; }; #ifndef QT_NO_DEBUG_STREAM diff --git a/tests/auto/render/opengl/computecommand/tst_computecommand.cpp b/tests/auto/render/opengl/computecommand/tst_computecommand.cpp index 80cbfb090..3caf11c8f 100644 --- a/tests/auto/render/opengl/computecommand/tst_computecommand.cpp +++ b/tests/auto/render/opengl/computecommand/tst_computecommand.cpp @@ -44,11 +44,11 @@ // tst_Renderer is a friend class of Renderer -class tst_Renderer : public Qt3DRender::Render::Renderer +class tst_Renderer : public Qt3DRender::Render::OpenGL::Renderer { public: tst_Renderer() - : Qt3DRender::Render::Renderer(Qt3DRender::QRenderAspect::Synchronous) + : Qt3DRender::Render::OpenGL::Renderer(Qt3DRender::QRenderAspect::Synchronous) {} ~tst_Renderer() { diff --git a/tests/auto/render/opengl/filtercompatibletechniquejob/tst_filtercompatibletechniquejob.cpp b/tests/auto/render/opengl/filtercompatibletechniquejob/tst_filtercompatibletechniquejob.cpp index 19dae1c23..d92ddd6d5 100644 --- a/tests/auto/render/opengl/filtercompatibletechniquejob/tst_filtercompatibletechniquejob.cpp +++ b/tests/auto/render/opengl/filtercompatibletechniquejob/tst_filtercompatibletechniquejob.cpp @@ -107,9 +107,9 @@ public: renderer()->submissionContext()->beginDrawing(m_window.data()); } - Render::Renderer *renderer() const + Render::OpenGL::Renderer *renderer() const { - return static_cast<Render::Renderer *>(d_func()->m_renderer); + return static_cast<Render::OpenGL::Renderer *>(d_func()->m_renderer); } void onRegistered() { QRenderAspect::onRegistered(); } @@ -186,7 +186,7 @@ private Q_SLOTS: void checkInitialState() { // GIVEN - Qt3DRender::Render::FilterCompatibleTechniqueJob backendFilterCompatibleTechniqueJob; + Qt3DRender::Render::OpenGL::FilterCompatibleTechniqueJob backendFilterCompatibleTechniqueJob; // THEN QVERIFY(backendFilterCompatibleTechniqueJob.manager() == nullptr); @@ -194,7 +194,7 @@ private Q_SLOTS: // WHEN Qt3DRender::Render::TechniqueManager techniqueManager; - Qt3DRender::Render::Renderer renderer(Qt3DRender::QRenderAspect::Synchronous); + Qt3DRender::Render::OpenGL::Renderer renderer(Qt3DRender::QRenderAspect::Synchronous); backendFilterCompatibleTechniqueJob.setManager(&techniqueManager); backendFilterCompatibleTechniqueJob.setRenderer(&renderer); @@ -208,7 +208,7 @@ private Q_SLOTS: void checkRunRendererRunning() { // GIVEN - Qt3DRender::Render::FilterCompatibleTechniqueJob backendFilterCompatibleTechniqueJob; + Qt3DRender::Render::OpenGL::FilterCompatibleTechniqueJob backendFilterCompatibleTechniqueJob; Qt3DRender::TestAspect testAspect(buildTestScene()); // WHEN diff --git a/tests/auto/render/opengl/glshadermanager/tst_glshadermanager.cpp b/tests/auto/render/opengl/glshadermanager/tst_glshadermanager.cpp index 83420af3b..6a5bc87ea 100644 --- a/tests/auto/render/opengl/glshadermanager/tst_glshadermanager.cpp +++ b/tests/auto/render/opengl/glshadermanager/tst_glshadermanager.cpp @@ -46,7 +46,7 @@ private Q_SLOTS: void tst_GLShaderManager::adopt() { // GIVEN - Qt3DRender::Render::GLShaderManager cache; + Qt3DRender::Render::OpenGL::GLShaderManager cache; Qt3DRender::QShaderProgram frontendShader1; Qt3DRender::QShaderProgram frontendShader2; TestRenderer renderer; @@ -64,7 +64,7 @@ void tst_GLShaderManager::adopt() QVERIFY(backendShaderNode1.peerId() != backendShaderNode2.peerId()); // WHEN - Qt3DRender::Render::GLShader *glShader1 = cache.createOrAdoptExisting(&backendShaderNode1); + Qt3DRender::Render::OpenGL::GLShader *glShader1 = cache.createOrAdoptExisting(&backendShaderNode1); // THEN QVERIFY(glShader1 != nullptr); @@ -73,7 +73,7 @@ void tst_GLShaderManager::adopt() QCOMPARE(shaderNodeIds.first(), backendShaderNode1.peerId()); // WHEN - Qt3DRender::Render::GLShader *glShader2 = cache.createOrAdoptExisting(&backendShaderNode2); + Qt3DRender::Render::OpenGL::GLShader *glShader2 = cache.createOrAdoptExisting(&backendShaderNode2); // THEN QCOMPARE(glShader1, glShader2); @@ -87,7 +87,7 @@ void tst_GLShaderManager::adopt() void tst_GLShaderManager::lookupResource() { // GIVEN - Qt3DRender::Render::GLShaderManager cache; + Qt3DRender::Render::OpenGL::GLShaderManager cache; Qt3DRender::QShaderProgram frontendShader1; Qt3DRender::QShaderProgram frontendShader2; TestRenderer renderer; @@ -104,8 +104,8 @@ void tst_GLShaderManager::lookupResource() cache.createOrAdoptExisting(&backendShaderNode2); // THEN - Qt3DRender::Render::GLShader *glShader1 = cache.lookupResource(backendShaderNode1.peerId()); - Qt3DRender::Render::GLShader *glShader2 = cache.lookupResource(backendShaderNode2.peerId()); + Qt3DRender::Render::OpenGL::GLShader *glShader1 = cache.lookupResource(backendShaderNode1.peerId()); + Qt3DRender::Render::OpenGL::GLShader *glShader2 = cache.lookupResource(backendShaderNode2.peerId()); QVERIFY(glShader1 != nullptr); QCOMPARE(glShader1, glShader2); const QVector<Qt3DCore::QNodeId> shaderNodeIds = cache.shaderIdsForProgram(glShader1); @@ -117,7 +117,7 @@ void tst_GLShaderManager::lookupResource() void tst_GLShaderManager::abandon() { // GIVEN - Qt3DRender::Render::GLShaderManager cache; + Qt3DRender::Render::OpenGL::GLShaderManager cache; Qt3DRender::QShaderProgram frontendShader1; Qt3DRender::QShaderProgram frontendShader2; TestRenderer renderer; @@ -132,7 +132,7 @@ void tst_GLShaderManager::abandon() cache.createOrAdoptExisting(&backendShaderNode2); // WHEN - Qt3DRender::Render::GLShader *glShader = cache.lookupResource(backendShaderNode1.peerId()); + Qt3DRender::Render::OpenGL::GLShader *glShader = cache.lookupResource(backendShaderNode1.peerId()); cache.abandon(glShader, &backendShaderNode1); // THEN @@ -147,7 +147,7 @@ void tst_GLShaderManager::abandon() // THEN shaderNodeIds = cache.shaderIdsForProgram(glShader); QCOMPARE(shaderNodeIds.size(), 0); - const QVector<Qt3DRender::Render::GLShader *> releasedShaders = cache.takeAbandonned(); + const QVector<Qt3DRender::Render::OpenGL::GLShader *> releasedShaders = cache.takeAbandonned(); QCOMPARE(releasedShaders.size(), 1); QCOMPARE(releasedShaders.first(), glShader); } @@ -155,7 +155,7 @@ void tst_GLShaderManager::abandon() void tst_GLShaderManager::insertAfterRemoval() { // GIVEN - Qt3DRender::Render::GLShaderManager cache; + Qt3DRender::Render::OpenGL::GLShaderManager cache; Qt3DRender::QShaderProgram frontendShader; TestRenderer renderer; Qt3DRender::Render::Shader backendShaderNode; @@ -165,8 +165,8 @@ void tst_GLShaderManager::insertAfterRemoval() simulateInitialization(&frontendShader, &backendShaderNode); // WHEN - Qt3DRender::Render::GLShader *apiShader1 = cache.createOrAdoptExisting(&backendShaderNode); - const Qt3DRender::Render::GLShader *originalApiShader = apiShader1; + Qt3DRender::Render::OpenGL::GLShader *apiShader1 = cache.createOrAdoptExisting(&backendShaderNode); + const Qt3DRender::Render::OpenGL::GLShader *originalApiShader = apiShader1; // THEN auto apiShader2 = cache.lookupResource(frontendShader.id()); @@ -179,7 +179,7 @@ void tst_GLShaderManager::insertAfterRemoval() cache.abandon(apiShader1, &backendShaderNode); // THEN - Qt3DRender::Render::GLShader *apiShaderEmpty = cache.lookupResource(frontendShader.id()); + Qt3DRender::Render::OpenGL::GLShader *apiShaderEmpty = cache.lookupResource(frontendShader.id()); QVERIFY(apiShaderEmpty == nullptr); // WHEN diff --git a/tests/auto/render/opengl/graphicshelpergl2/tst_graphicshelpergl2.cpp b/tests/auto/render/opengl/graphicshelpergl2/tst_graphicshelpergl2.cpp index 0a43a3040..5a1d22283 100644 --- a/tests/auto/render/opengl/graphicshelpergl2/tst_graphicshelpergl2.cpp +++ b/tests/auto/render/opengl/graphicshelpergl2/tst_graphicshelpergl2.cpp @@ -47,6 +47,7 @@ QT_BEGIN_NAMESPACE using namespace Qt3DRender; using namespace Qt3DRender::Render; +using namespace Qt3DRender::Render::OpenGL; namespace { diff --git a/tests/auto/render/opengl/graphicshelpergl3_2/tst_graphicshelpergl3_2.cpp b/tests/auto/render/opengl/graphicshelpergl3_2/tst_graphicshelpergl3_2.cpp index a4a59d7c4..08c30dc15 100644 --- a/tests/auto/render/opengl/graphicshelpergl3_2/tst_graphicshelpergl3_2.cpp +++ b/tests/auto/render/opengl/graphicshelpergl3_2/tst_graphicshelpergl3_2.cpp @@ -43,6 +43,7 @@ using namespace Qt3DRender; using namespace Qt3DRender::Render; +using namespace Qt3DRender::Render::OpenGL; namespace { diff --git a/tests/auto/render/opengl/graphicshelpergl3_3/tst_graphicshelpergl3_3.cpp b/tests/auto/render/opengl/graphicshelpergl3_3/tst_graphicshelpergl3_3.cpp index 3e4a052ba..b463e6236 100644 --- a/tests/auto/render/opengl/graphicshelpergl3_3/tst_graphicshelpergl3_3.cpp +++ b/tests/auto/render/opengl/graphicshelpergl3_3/tst_graphicshelpergl3_3.cpp @@ -42,6 +42,7 @@ using namespace Qt3DRender; using namespace Qt3DRender::Render; +using namespace Qt3DRender::Render::OpenGL; namespace { diff --git a/tests/auto/render/opengl/graphicshelpergl4/tst_graphicshelpergl4.cpp b/tests/auto/render/opengl/graphicshelpergl4/tst_graphicshelpergl4.cpp index 31024e1db..8f86f38ce 100644 --- a/tests/auto/render/opengl/graphicshelpergl4/tst_graphicshelpergl4.cpp +++ b/tests/auto/render/opengl/graphicshelpergl4/tst_graphicshelpergl4.cpp @@ -43,6 +43,7 @@ using namespace Qt3DRender; using namespace Qt3DRender::Render; +using namespace Qt3DRender::Render::OpenGL; namespace { diff --git a/tests/auto/render/opengl/materialparametergathererjob/tst_materialparametergathererjob.cpp b/tests/auto/render/opengl/materialparametergathererjob/tst_materialparametergathererjob.cpp index e6b78c47b..efd2c6603 100644 --- a/tests/auto/render/opengl/materialparametergathererjob/tst_materialparametergathererjob.cpp +++ b/tests/auto/render/opengl/materialparametergathererjob/tst_materialparametergathererjob.cpp @@ -107,9 +107,9 @@ public: d_func()->m_renderer->initialize(); } - Render::MaterialParameterGathererJobPtr materialGathererJob() const + Render::OpenGL::MaterialParameterGathererJobPtr materialGathererJob() const { - Render::MaterialParameterGathererJobPtr job = Render::MaterialParameterGathererJobPtr::create(); + Render::OpenGL::MaterialParameterGathererJobPtr job = Render::OpenGL::MaterialParameterGathererJobPtr::create(); job->setNodeManagers(nodeManagers()); return job; } @@ -232,7 +232,7 @@ private Q_SLOTS: // GIVEN Qt3DCore::QEntity *sceneRoot = buildScene(viewportFrameGraph()); Qt3DRender::TestAspect testAspect(sceneRoot); - Qt3DRender::Render::MaterialParameterGathererJobPtr gatherer = testAspect.materialGathererJob(); + Qt3DRender::Render::OpenGL::MaterialParameterGathererJobPtr gatherer = testAspect.materialGathererJob(); testAspect.initializeRenderer(); @@ -252,7 +252,7 @@ private Q_SLOTS: TestMaterial material; Qt3DCore::QEntity *sceneRoot = buildScene(viewportFrameGraph(), &material); Qt3DRender::TestAspect testAspect(sceneRoot); - Qt3DRender::Render::MaterialParameterGathererJobPtr gatherer = testAspect.materialGathererJob(); + Qt3DRender::Render::OpenGL::MaterialParameterGathererJobPtr gatherer = testAspect.materialGathererJob(); testAspect.initializeRenderer(); @@ -274,7 +274,7 @@ private Q_SLOTS: material.setEnabled(false); Qt3DCore::QEntity *sceneRoot = buildScene(viewportFrameGraph(), &material); Qt3DRender::TestAspect testAspect(sceneRoot); - Qt3DRender::Render::MaterialParameterGathererJobPtr gatherer = testAspect.materialGathererJob(); + Qt3DRender::Render::OpenGL::MaterialParameterGathererJobPtr gatherer = testAspect.materialGathererJob(); testAspect.initializeRenderer(); @@ -306,7 +306,7 @@ private Q_SLOTS: Qt3DCore::QEntity *sceneRoot = buildScene(frameGraphFilter, &material); Qt3DRender::TestAspect testAspect(sceneRoot); - Qt3DRender::Render::MaterialParameterGathererJobPtr gatherer = testAspect.materialGathererJob(); + Qt3DRender::Render::OpenGL::MaterialParameterGathererJobPtr gatherer = testAspect.materialGathererJob(); testAspect.initializeRenderer(); @@ -346,7 +346,7 @@ private Q_SLOTS: Qt3DCore::QEntity *sceneRoot = buildScene(frameGraphFilter, &material); Qt3DRender::TestAspect testAspect(sceneRoot); - Qt3DRender::Render::MaterialParameterGathererJobPtr gatherer = testAspect.materialGathererJob(); + Qt3DRender::Render::OpenGL::MaterialParameterGathererJobPtr gatherer = testAspect.materialGathererJob(); testAspect.initializeRenderer(); @@ -382,7 +382,7 @@ private Q_SLOTS: Qt3DCore::QEntity *sceneRoot = buildScene(frameGraphFilter, &material); Qt3DRender::TestAspect testAspect(sceneRoot); - Qt3DRender::Render::MaterialParameterGathererJobPtr gatherer = testAspect.materialGathererJob(); + Qt3DRender::Render::OpenGL::MaterialParameterGathererJobPtr gatherer = testAspect.materialGathererJob(); testAspect.initializeRenderer(); @@ -416,7 +416,7 @@ private Q_SLOTS: Qt3DCore::QEntity *sceneRoot = buildScene(frameGraphFilter, &material); Qt3DRender::TestAspect testAspect(sceneRoot); - Qt3DRender::Render::MaterialParameterGathererJobPtr gatherer = testAspect.materialGathererJob(); + Qt3DRender::Render::OpenGL::MaterialParameterGathererJobPtr gatherer = testAspect.materialGathererJob(); testAspect.initializeRenderer(); @@ -456,7 +456,7 @@ private Q_SLOTS: Qt3DCore::QEntity *sceneRoot = buildScene(frameGraphFilter, &material); Qt3DRender::TestAspect testAspect(sceneRoot); - Qt3DRender::Render::MaterialParameterGathererJobPtr gatherer = testAspect.materialGathererJob(); + Qt3DRender::Render::OpenGL::MaterialParameterGathererJobPtr gatherer = testAspect.materialGathererJob(); testAspect.initializeRenderer(); @@ -509,7 +509,7 @@ private Q_SLOTS: material.es2Pass()->addParameter(passParam); Qt3DRender::TestAspect testAspect(sceneRoot); - Qt3DRender::Render::MaterialParameterGathererJobPtr gatherer = testAspect.materialGathererJob(); + Qt3DRender::Render::OpenGL::MaterialParameterGathererJobPtr gatherer = testAspect.materialGathererJob(); testAspect.initializeRenderer(); QCOMPARE(testAspect.nodeManagers()->materialManager()->activeHandles().size(), 1); @@ -526,10 +526,10 @@ private Q_SLOTS: // THEN -> RenderPassFilter wins QCOMPARE(gatherer->materialToPassAndParameter().size(), 1); - const QVector<Qt3DRender::Render::RenderPassParameterData> passParameterData = gatherer->materialToPassAndParameter().begin().value(); + const QVector<Qt3DRender::Render::OpenGL::RenderPassParameterData> passParameterData = gatherer->materialToPassAndParameter().begin().value(); QCOMPARE(passParameterData.size(), 1); - const Qt3DRender::Render::RenderPassParameterData data = passParameterData.first(); + const Qt3DRender::Render::OpenGL::RenderPassParameterData data = passParameterData.first(); QCOMPARE(data.parameterInfo.size(), 1); QCOMPARE(data.parameterInfo.first().handle, testAspect.nodeManagers()->parameterManager()->lookupHandle(renderPassParameter->id())); @@ -565,7 +565,7 @@ private Q_SLOTS: material.es2Pass()->addParameter(passParam); Qt3DRender::TestAspect testAspect(sceneRoot); - Qt3DRender::Render::MaterialParameterGathererJobPtr gatherer = testAspect.materialGathererJob(); + Qt3DRender::Render::OpenGL::MaterialParameterGathererJobPtr gatherer = testAspect.materialGathererJob(); testAspect.initializeRenderer(); QCOMPARE(testAspect.nodeManagers()->materialManager()->activeHandles().size(), 1); @@ -582,10 +582,10 @@ private Q_SLOTS: // THEN -> TechniqueFilter wins QCOMPARE(gatherer->materialToPassAndParameter().size(), 1); - const QVector<Qt3DRender::Render::RenderPassParameterData> passParameterData = gatherer->materialToPassAndParameter().begin().value(); + const QVector<Qt3DRender::Render::OpenGL::RenderPassParameterData> passParameterData = gatherer->materialToPassAndParameter().begin().value(); QCOMPARE(passParameterData.size(), 1); - const Qt3DRender::Render::RenderPassParameterData data = passParameterData.first(); + const Qt3DRender::Render::OpenGL::RenderPassParameterData data = passParameterData.first(); QCOMPARE(data.parameterInfo.size(), 1); QCOMPARE(data.parameterInfo.first().handle, testAspect.nodeManagers()->parameterManager()->lookupHandle(techniqueFilterParameter->id())); @@ -620,7 +620,7 @@ private Q_SLOTS: material.es2Pass()->addParameter(passParam); Qt3DRender::TestAspect testAspect(sceneRoot); - Qt3DRender::Render::MaterialParameterGathererJobPtr gatherer = testAspect.materialGathererJob(); + Qt3DRender::Render::OpenGL::MaterialParameterGathererJobPtr gatherer = testAspect.materialGathererJob(); testAspect.initializeRenderer(); QCOMPARE(testAspect.nodeManagers()->materialManager()->activeHandles().size(), 1); @@ -637,10 +637,10 @@ private Q_SLOTS: // THEN -> TechniqueFilter wins QCOMPARE(gatherer->materialToPassAndParameter().size(), 1); - const QVector<Qt3DRender::Render::RenderPassParameterData> passParameterData = gatherer->materialToPassAndParameter().begin().value(); + const QVector<Qt3DRender::Render::OpenGL::RenderPassParameterData> passParameterData = gatherer->materialToPassAndParameter().begin().value(); QCOMPARE(passParameterData.size(), 1); - const Qt3DRender::Render::RenderPassParameterData data = passParameterData.first(); + const Qt3DRender::Render::OpenGL::RenderPassParameterData data = passParameterData.first(); QCOMPARE(data.parameterInfo.size(), 1); QCOMPARE(data.parameterInfo.first().handle, testAspect.nodeManagers()->parameterManager()->lookupHandle(materialParameter->id())); @@ -674,7 +674,7 @@ private Q_SLOTS: material.es2Pass()->addParameter(passParam); Qt3DRender::TestAspect testAspect(sceneRoot); - Qt3DRender::Render::MaterialParameterGathererJobPtr gatherer = testAspect.materialGathererJob(); + Qt3DRender::Render::OpenGL::MaterialParameterGathererJobPtr gatherer = testAspect.materialGathererJob(); testAspect.initializeRenderer(); QCOMPARE(testAspect.nodeManagers()->materialManager()->activeHandles().size(), 1); @@ -691,10 +691,10 @@ private Q_SLOTS: // THEN -> TechniqueFilter wins QCOMPARE(gatherer->materialToPassAndParameter().size(), 1); - const QVector<Qt3DRender::Render::RenderPassParameterData> passParameterData = gatherer->materialToPassAndParameter().begin().value(); + const QVector<Qt3DRender::Render::OpenGL::RenderPassParameterData> passParameterData = gatherer->materialToPassAndParameter().begin().value(); QCOMPARE(passParameterData.size(), 1); - const Qt3DRender::Render::RenderPassParameterData data = passParameterData.first(); + const Qt3DRender::Render::OpenGL::RenderPassParameterData data = passParameterData.first(); QCOMPARE(data.parameterInfo.size(), 1); QCOMPARE(data.parameterInfo.first().handle, testAspect.nodeManagers()->parameterManager()->lookupHandle(effectParameter->id())); @@ -724,7 +724,7 @@ private Q_SLOTS: material.es2Pass()->addParameter(passParam); Qt3DRender::TestAspect testAspect(sceneRoot); - Qt3DRender::Render::MaterialParameterGathererJobPtr gatherer = testAspect.materialGathererJob(); + Qt3DRender::Render::OpenGL::MaterialParameterGathererJobPtr gatherer = testAspect.materialGathererJob(); testAspect.initializeRenderer(); QCOMPARE(testAspect.nodeManagers()->materialManager()->activeHandles().size(), 1); @@ -741,10 +741,10 @@ private Q_SLOTS: // THEN -> TechniqueFilter wins QCOMPARE(gatherer->materialToPassAndParameter().size(), 1); - const QVector<Qt3DRender::Render::RenderPassParameterData> passParameterData = gatherer->materialToPassAndParameter().begin().value(); + const QVector<Qt3DRender::Render::OpenGL::RenderPassParameterData> passParameterData = gatherer->materialToPassAndParameter().begin().value(); QCOMPARE(passParameterData.size(), 1); - const Qt3DRender::Render::RenderPassParameterData data = passParameterData.first(); + const Qt3DRender::Render::OpenGL::RenderPassParameterData data = passParameterData.first(); QCOMPARE(data.parameterInfo.size(), 1); QCOMPARE(data.parameterInfo.first().handle, testAspect.nodeManagers()->parameterManager()->lookupHandle(techniqueParam->id())); @@ -768,7 +768,7 @@ private Q_SLOTS: material.es2Pass()->addParameter(passParam); Qt3DRender::TestAspect testAspect(sceneRoot); - Qt3DRender::Render::MaterialParameterGathererJobPtr gatherer = testAspect.materialGathererJob(); + Qt3DRender::Render::OpenGL::MaterialParameterGathererJobPtr gatherer = testAspect.materialGathererJob(); testAspect.initializeRenderer(); QCOMPARE(testAspect.nodeManagers()->materialManager()->activeHandles().size(), 1); @@ -785,10 +785,10 @@ private Q_SLOTS: // THEN -> TechniqueFilter wins QCOMPARE(gatherer->materialToPassAndParameter().size(), 1); - const QVector<Qt3DRender::Render::RenderPassParameterData> passParameterData = gatherer->materialToPassAndParameter().begin().value(); + const QVector<Qt3DRender::Render::OpenGL::RenderPassParameterData> passParameterData = gatherer->materialToPassAndParameter().begin().value(); QCOMPARE(passParameterData.size(), 1); - const Qt3DRender::Render::RenderPassParameterData data = passParameterData.first(); + const Qt3DRender::Render::OpenGL::RenderPassParameterData data = passParameterData.first(); QCOMPARE(data.parameterInfo.size(), 1); QCOMPARE(data.parameterInfo.first().handle, testAspect.nodeManagers()->parameterManager()->lookupHandle(passParam->id())); diff --git a/tests/auto/render/opengl/qgraphicsutils/tst_qgraphicsutils.cpp b/tests/auto/render/opengl/qgraphicsutils/tst_qgraphicsutils.cpp index 2e0dd0f96..bd4772045 100644 --- a/tests/auto/render/opengl/qgraphicsutils/tst_qgraphicsutils.cpp +++ b/tests/auto/render/opengl/qgraphicsutils/tst_qgraphicsutils.cpp @@ -44,14 +44,14 @@ private slots: void tst_QGraphicsUtils::fillScalarInDataArray() { - Qt3DRender::Render::ShaderUniform description; + Qt3DRender::Render::OpenGL::ShaderUniform description; description.m_size = 1; description.m_offset = 0; description.m_arrayStride = 10; QVector4D testVector(8.0f, 8.0f, 3.0f, 1.0f); - const GLfloat *vectorData = Qt3DRender::Render::QGraphicsUtils::valueArrayFromVariant<GLfloat>(testVector, 1, 4); + const GLfloat *vectorData = Qt3DRender::Render::OpenGL::QGraphicsUtils::valueArrayFromVariant<GLfloat>(testVector, 1, 4); for (int i = 0; i < 4; i++) { if (i == 0) @@ -68,7 +68,7 @@ void tst_QGraphicsUtils::fillScalarInDataArray() char *innerData = data.data(); // Checked that we are not overflowing - Qt3DRender::Render::QGraphicsUtils::fillDataArray(innerData, vectorData, description, 2); + Qt3DRender::Render::OpenGL::QGraphicsUtils::fillDataArray(innerData, vectorData, description, 2); for (int i = 0; i < 4; ++i) { if (i < 2) QVERIFY(vectorData[i] == ((GLfloat*)innerData)[i]); @@ -77,7 +77,7 @@ void tst_QGraphicsUtils::fillScalarInDataArray() } // Check that all values are copied - Qt3DRender::Render::QGraphicsUtils::fillDataArray(innerData, vectorData, description, 4); + Qt3DRender::Render::OpenGL::QGraphicsUtils::fillDataArray(innerData, vectorData, description, 4); for (int i = 0; i < 4; ++i) QVERIFY(vectorData[i] == ((GLfloat*)innerData)[i]); @@ -86,7 +86,7 @@ void tst_QGraphicsUtils::fillScalarInDataArray() data = QByteArray(description.m_size * 8 * sizeof(GLfloat), 0); innerData = data.data(); - Qt3DRender::Render::QGraphicsUtils::fillDataArray(innerData, vectorData, description, 4); + Qt3DRender::Render::OpenGL::QGraphicsUtils::fillDataArray(innerData, vectorData, description, 4); for (int i = 0; i < 8; ++i) { if (i < 4) QVERIFY(((GLfloat*)innerData)[i] == 0.0f); @@ -102,9 +102,9 @@ void tst_QGraphicsUtils::fillArray() QVector4D testVector3(4.0f, 5.0f, 4.0f, 2.0f); QVariantList variantList = QVariantList() << testVector << testVector2 << testVector3; - const GLfloat *vectorData = Qt3DRender::Render::QGraphicsUtils::valueArrayFromVariant<GLfloat>(QVariant(variantList), 3, 4); + const GLfloat *vectorData = Qt3DRender::Render::OpenGL::QGraphicsUtils::valueArrayFromVariant<GLfloat>(QVariant(variantList), 3, 4); - Qt3DRender::Render::ShaderUniform description; + Qt3DRender::Render::OpenGL::ShaderUniform description; description.m_size = 3; description.m_offset = 16; @@ -112,7 +112,7 @@ void tst_QGraphicsUtils::fillArray() QByteArray data(description.m_size * (4 + description.m_arrayStride) * sizeof(GLfloat) + description.m_offset, 0); char *innerData = data.data(); - Qt3DRender::Render::QGraphicsUtils::fillDataArray(innerData, vectorData, description, 4); + Qt3DRender::Render::OpenGL::QGraphicsUtils::fillDataArray(innerData, vectorData, description, 4); int offset = description.m_offset / sizeof(GLfloat); int stride = description.m_arrayStride / sizeof(GLfloat); @@ -144,25 +144,25 @@ void tst_QGraphicsUtils::fillScalarWithOffsets() QVector4D color(4.0f, 5.0f, 4.0f, 1.0f); float intensity = 1.0f; - Qt3DRender::Render::ShaderUniform posUniform; + Qt3DRender::Render::OpenGL::ShaderUniform posUniform; posUniform.m_size = 1; posUniform.m_arrayStride = 0; posUniform.m_matrixStride = 0; posUniform.m_offset = 0; - Qt3DRender::Render::ShaderUniform dirUniform; + Qt3DRender::Render::OpenGL::ShaderUniform dirUniform; dirUniform.m_size = 1; dirUniform.m_arrayStride = 0; dirUniform.m_matrixStride = 0; dirUniform.m_offset = 16; - Qt3DRender::Render::ShaderUniform colUniform; + Qt3DRender::Render::OpenGL::ShaderUniform colUniform; colUniform.m_size = 1; colUniform.m_arrayStride = 0; colUniform.m_matrixStride = 0; colUniform.m_offset = 32; - Qt3DRender::Render::ShaderUniform intUniform; + Qt3DRender::Render::OpenGL::ShaderUniform intUniform; intUniform.m_size = 1; intUniform.m_arrayStride = 0; intUniform.m_matrixStride = 0; @@ -171,18 +171,18 @@ void tst_QGraphicsUtils::fillScalarWithOffsets() QVector<GLfloat> data(16); void *innerData = data.data(); - Qt3DRender::Render::QGraphicsUtils::fillDataArray(innerData, - Qt3DRender::Render::QGraphicsUtils::valueArrayFromVariant<GLfloat>(position, 1, 3), - posUniform, 3); - Qt3DRender::Render::QGraphicsUtils::fillDataArray(innerData, - Qt3DRender::Render::QGraphicsUtils::valueArrayFromVariant<GLfloat>(direction, 1, 3), - dirUniform, 3); - Qt3DRender::Render::QGraphicsUtils::fillDataArray(innerData, - Qt3DRender::Render::QGraphicsUtils::valueArrayFromVariant<GLfloat>(color, 1, 4), - colUniform, 4); - Qt3DRender::Render::QGraphicsUtils::fillDataArray(innerData, - Qt3DRender::Render::QGraphicsUtils::valueArrayFromVariant<GLfloat>(intensity, 1, 1), - intUniform, 1); + Qt3DRender::Render::OpenGL::QGraphicsUtils::fillDataArray(innerData, + Qt3DRender::Render::OpenGL::QGraphicsUtils::valueArrayFromVariant<GLfloat>(position, 1, 3), + posUniform, 3); + Qt3DRender::Render::OpenGL::QGraphicsUtils::fillDataArray(innerData, + Qt3DRender::Render::OpenGL::QGraphicsUtils::valueArrayFromVariant<GLfloat>(direction, 1, 3), + dirUniform, 3); + Qt3DRender::Render::OpenGL::QGraphicsUtils::fillDataArray(innerData, + Qt3DRender::Render::OpenGL::QGraphicsUtils::valueArrayFromVariant<GLfloat>(color, 1, 4), + colUniform, 4); + Qt3DRender::Render::OpenGL::QGraphicsUtils::fillDataArray(innerData, + Qt3DRender::Render::OpenGL::QGraphicsUtils::valueArrayFromVariant<GLfloat>(intensity, 1, 1), + intUniform, 1); GLfloat *floatData = (GLfloat*)innerData; @@ -214,9 +214,9 @@ void tst_QGraphicsUtils::fillMatrix4x4() QMatrix4x4 mat(1.0f, 2.0f, 3.0f, 4.0f, 5.0f, 6.0f, 7.0f, 8.0f, 9.0f, 10.0f, 11.0f, 12.0f, 13.0f, 14.0f, 15.0f, 16.0f); // column major - const GLfloat *matData = Qt3DRender::Render::QGraphicsUtils::valueArrayFromVariant<GLfloat>(mat, 1, 16); + const GLfloat *matData = Qt3DRender::Render::OpenGL::QGraphicsUtils::valueArrayFromVariant<GLfloat>(mat, 1, 16); - Qt3DRender::Render::ShaderUniform description; + Qt3DRender::Render::OpenGL::ShaderUniform description; description.m_size = 1; description.m_offset = 0; @@ -226,7 +226,7 @@ void tst_QGraphicsUtils::fillMatrix4x4() QByteArray data(description.m_size * 16 * sizeof(GLfloat), 0); char *innerData = data.data(); - Qt3DRender::Render::QGraphicsUtils::fillDataMatrixArray(innerData, matData, description, 4, 4); + Qt3DRender::Render::OpenGL::QGraphicsUtils::fillDataMatrixArray(innerData, matData, description, 4, 4); // Check for no offset/no stride for (int i = 0; i < 16; ++i) QVERIFY((((GLfloat *)innerData)[i]) == matData[i]); @@ -234,7 +234,7 @@ void tst_QGraphicsUtils::fillMatrix4x4() description.m_offset = 12; data = QByteArray((description.m_size * 16 + description.m_offset) * sizeof(GLfloat), 0); innerData = data.data(); - Qt3DRender::Render::QGraphicsUtils::fillDataMatrixArray(innerData, matData, description, 4, 4); + Qt3DRender::Render::OpenGL::QGraphicsUtils::fillDataMatrixArray(innerData, matData, description, 4, 4); // Check with 12 offset/no stride for (int i = 0; i < 16; ++i) QVERIFY((((GLfloat *)innerData)[3 + i]) == matData[i]); @@ -242,7 +242,7 @@ void tst_QGraphicsUtils::fillMatrix4x4() description.m_matrixStride = 16; data = QByteArray((description.m_size * 16 + 4 * description.m_matrixStride + description.m_offset) * sizeof(GLfloat), 0); innerData = data.data(); - Qt3DRender::Render::QGraphicsUtils::fillDataMatrixArray(innerData, matData, description, 4, 4); + Qt3DRender::Render::OpenGL::QGraphicsUtils::fillDataMatrixArray(innerData, matData, description, 4, 4); // Check with 10 offset/ 16 stride int offset = description.m_offset / sizeof(GLfloat); int matrixStride = description.m_matrixStride / sizeof(GLfloat); @@ -259,9 +259,9 @@ void tst_QGraphicsUtils::fillMatrix3x4() QMatrix3x4 mat; mat.fill(6.0f); - const GLfloat *matData = Qt3DRender::Render::QGraphicsUtils::valueArrayFromVariant<GLfloat>(QVariant::fromValue(mat), 1, 12); + const GLfloat *matData = Qt3DRender::Render::OpenGL::QGraphicsUtils::valueArrayFromVariant<GLfloat>(QVariant::fromValue(mat), 1, 12); - Qt3DRender::Render::ShaderUniform description; + Qt3DRender::Render::OpenGL::ShaderUniform description; description.m_size = 1; description.m_offset = 16; @@ -270,7 +270,7 @@ void tst_QGraphicsUtils::fillMatrix3x4() QByteArray data((description.m_size * 12 + 3 * description.m_matrixStride + description.m_offset) * sizeof(GLfloat), 0); char *innerData = data.data(); - Qt3DRender::Render::QGraphicsUtils::fillDataMatrixArray(innerData, matData, description, 3, 4); + Qt3DRender::Render::OpenGL::QGraphicsUtils::fillDataMatrixArray(innerData, matData, description, 3, 4); // Check with 16 offset/ 12 stride int offset = description.m_offset / sizeof(GLfloat); int matrixStride = description.m_matrixStride / sizeof(GLfloat); @@ -287,9 +287,9 @@ void tst_QGraphicsUtils::fillMatrix4x3() QMatrix4x3 mat; mat.fill(6.0f); - const GLfloat *matData = Qt3DRender::Render::QGraphicsUtils::valueArrayFromVariant<GLfloat>(QVariant::fromValue(mat), 1, 12); + const GLfloat *matData = Qt3DRender::Render::OpenGL::QGraphicsUtils::valueArrayFromVariant<GLfloat>(QVariant::fromValue(mat), 1, 12); - Qt3DRender::Render::ShaderUniform description; + Qt3DRender::Render::OpenGL::ShaderUniform description; description.m_size = 1; description.m_offset = 16; @@ -298,7 +298,7 @@ void tst_QGraphicsUtils::fillMatrix4x3() QByteArray data((description.m_size * 12 + 4 * description.m_matrixStride + description.m_offset) * sizeof(GLfloat), 0); char *innerData = data.data(); - Qt3DRender::Render::QGraphicsUtils::fillDataMatrixArray(innerData, matData, description, 4, 3); + Qt3DRender::Render::OpenGL::QGraphicsUtils::fillDataMatrixArray(innerData, matData, description, 4, 3); // Check with 16 offset/ 16 stride int offset = description.m_offset / sizeof(GLfloat); int matrixStride = description.m_matrixStride / sizeof(GLfloat); @@ -321,9 +321,9 @@ void tst_QGraphicsUtils::fillMatrixArray() QVariantList matrices = QVariantList() << QVariant::fromValue(mat1) << QVariant::fromValue(mat2) << QVariant::fromValue(mat3); - const GLfloat *matData = Qt3DRender::Render::QGraphicsUtils::valueArrayFromVariant<GLfloat>(QVariant::fromValue(matrices), 3, 12); + const GLfloat *matData = Qt3DRender::Render::OpenGL::QGraphicsUtils::valueArrayFromVariant<GLfloat>(QVariant::fromValue(matrices), 3, 12); - Qt3DRender::Render::ShaderUniform description; + Qt3DRender::Render::OpenGL::ShaderUniform description; description.m_size = 3; description.m_offset = 12; @@ -332,7 +332,7 @@ void tst_QGraphicsUtils::fillMatrixArray() QByteArray data((description.m_size * (12 + 4 * description.m_matrixStride + description.m_arrayStride) + description.m_offset) * sizeof(GLfloat), 0); char *innerData = data.data(); - Qt3DRender::Render::QGraphicsUtils::fillDataMatrixArray(innerData, matData, description, 4, 3); + Qt3DRender::Render::OpenGL::QGraphicsUtils::fillDataMatrixArray(innerData, matData, description, 4, 3); // Check with 12 offset/ 4 array stride / 16 matrix stride int offset = description.m_offset / sizeof(GLfloat); int matrixStride = description.m_matrixStride / sizeof(GLfloat); diff --git a/tests/auto/render/opengl/renderer/tst_renderer.cpp b/tests/auto/render/opengl/renderer/tst_renderer.cpp index 6aed6ed5f..db7a37af1 100644 --- a/tests/auto/render/opengl/renderer/tst_renderer.cpp +++ b/tests/auto/render/opengl/renderer/tst_renderer.cpp @@ -50,7 +50,7 @@ private Q_SLOTS: { // GIVEN Qt3DRender::Render::NodeManagers nodeManagers; - Qt3DRender::Render::Renderer renderer(Qt3DRender::QRenderAspect::Synchronous); + Qt3DRender::Render::OpenGL::Renderer renderer(Qt3DRender::QRenderAspect::Synchronous); Qt3DRender::Render::OffscreenSurfaceHelper offscreenHelper(&renderer); Qt3DRender::Render::RenderSettings settings; // owned by FG manager @@ -107,8 +107,8 @@ private Q_SLOTS: { // GIVEN Qt3DRender::Render::NodeManagers nodeManagers; - Qt3DRender::Render::Renderer renderer(Qt3DRender::QRenderAspect::Synchronous); - Qt3DRender::Render::RenderQueue *renderQueue = renderer.renderQueue(); + Qt3DRender::Render::OpenGL::Renderer renderer(Qt3DRender::QRenderAspect::Synchronous); + Qt3DRender::Render::OpenGL::RenderQueue *renderQueue = renderer.renderQueue(); Qt3DRender::Render::OffscreenSurfaceHelper offscreenHelper(&renderer); Qt3DRender::Render::RenderSettings settings; // owned by FG manager @@ -129,16 +129,16 @@ private Q_SLOTS: // NOTE: FilterCompatibleTechniqueJob and ShaderGathererJob cannot run because the context // is not initialized in this test - const int renderViewBuilderMaterialCacheJobCount = 1 + Qt3DRender::Render::RenderViewBuilder::optimalJobCount(); + const int renderViewBuilderMaterialCacheJobCount = 1 + Qt3DRender::Render::OpenGL::RenderViewBuilder::optimalJobCount(); // syncMaterialGathererJob // n * materialGathererJob const int layerCacheJobCount = 2; // filterEntityByLayerJob, // syncFilterEntityByLayerJob - const int singleRenderViewCommandRebuildJobCount = 1 + Qt3DRender::Render::RenderViewBuilder::optimalJobCount(); + const int singleRenderViewCommandRebuildJobCount = 1 + Qt3DRender::Render::OpenGL::RenderViewBuilder::optimalJobCount(); - const int singleRenderViewJobCount = 8 + 1 * Qt3DRender::Render::RenderViewBuilder::optimalJobCount(); + const int singleRenderViewJobCount = 8 + 1 * Qt3DRender::Render::OpenGL::RenderViewBuilder::optimalJobCount(); // RenderViewBuilder renderViewJob, // syncRenderViewInitializationJob, // syncFrustumCullingJob, diff --git a/tests/auto/render/opengl/renderqueue/tst_renderqueue.cpp b/tests/auto/render/opengl/renderqueue/tst_renderqueue.cpp index 2be089495..728648a3c 100644 --- a/tests/auto/render/opengl/renderqueue/tst_renderqueue.cpp +++ b/tests/auto/render/opengl/renderqueue/tst_renderqueue.cpp @@ -53,7 +53,7 @@ private Q_SLOTS: void tst_RenderQueue::setRenderViewCount() { // GIVEN - Qt3DRender::Render::RenderQueue renderQueue; + Qt3DRender::Render::OpenGL::RenderQueue renderQueue; // THEN QCOMPARE(renderQueue.wasReset(), true); @@ -70,7 +70,7 @@ void tst_RenderQueue::setRenderViewCount() void tst_RenderQueue::circleQueues() { // GIVEN - Qt3DRender::Render::RenderQueue renderQueue; + Qt3DRender::Render::OpenGL::RenderQueue renderQueue; renderQueue.setTargetRenderViewCount(7); // WHEN @@ -85,9 +85,9 @@ void tst_RenderQueue::circleQueues() QCOMPARE(renderQueue.currentRenderViewCount(), 0); // WHEN - QList<Qt3DRender::Render::RenderView *> renderViews; + QList<Qt3DRender::Render::OpenGL::RenderView *> renderViews; for (int i = 0; i < 7; i++) { - renderViews << new Qt3DRender::Render::RenderView(); + renderViews << new Qt3DRender::Render::OpenGL::RenderView(); renderQueue.queueRenderView(renderViews.at(i), i); } @@ -99,19 +99,19 @@ void tst_RenderQueue::circleQueues() void tst_RenderQueue::checkOrder() { // GIVEN - Qt3DRender::Render::RenderQueue renderQueue; + Qt3DRender::Render::OpenGL::RenderQueue renderQueue; renderQueue.setTargetRenderViewCount(7); - QVector<Qt3DRender::Render::RenderView *> renderViews(7); + QVector<Qt3DRender::Render::OpenGL::RenderView *> renderViews(7); // WHEN for (int i = 0; i < 7; ++i) { int processingOrder = (i % 2 == 0) ? (6 - i) : i; - renderViews[processingOrder] = new Qt3DRender::Render::RenderView(); + renderViews[processingOrder] = new Qt3DRender::Render::OpenGL::RenderView(); renderQueue.queueRenderView(renderViews[processingOrder], processingOrder); } // THEN - QVector<Qt3DRender::Render::RenderView *> frame = renderQueue.nextFrameQueue(); + QVector<Qt3DRender::Render::OpenGL::RenderView *> frame = renderQueue.nextFrameQueue(); for (int i = 0; i < 7; ++i) { QVERIFY(frame[i] == renderViews[i]); } @@ -120,14 +120,14 @@ void tst_RenderQueue::checkOrder() void tst_RenderQueue::checkTimeToSubmit() { // GIVEN - Qt3DRender::Render::RenderQueue renderQueue; + Qt3DRender::Render::OpenGL::RenderQueue renderQueue; renderQueue.setTargetRenderViewCount(7); - QVector<Qt3DRender::Render::RenderView *> renderViews(7); + QVector<Qt3DRender::Render::OpenGL::RenderView *> renderViews(7); // WHEN for (int i = 0; i < 7; i++) { int processingOrder = (i % 2 == 0) ? (6 - i) : i; - renderViews[processingOrder] = new Qt3DRender::Render::RenderView(); + renderViews[processingOrder] = new Qt3DRender::Render::OpenGL::RenderView(); renderQueue.queueRenderView(renderViews[processingOrder], processingOrder); // THEN @@ -144,7 +144,7 @@ class SimpleWorker : public QThread public: QSemaphore m_waitSubmit; QSemaphore m_waitQueue; - Qt3DRender::Render::RenderQueue *m_renderQueues; + Qt3DRender::Render::OpenGL::RenderQueue *m_renderQueues; public Q_SLOTS: @@ -160,7 +160,7 @@ public Q_SLOTS: // THEN QCOMPARE(m_renderQueues->currentRenderViewCount(), j); // WHEN - m_renderQueues->queueRenderView(new Qt3DRender::Render::RenderView(), j); + m_renderQueues->queueRenderView(new Qt3DRender::Render::OpenGL::RenderView(), j); // THEN QVERIFY(m_renderQueues->targetRenderViewCount() == 7); QCOMPARE(m_renderQueues->currentRenderViewCount(), j + 1); @@ -178,7 +178,7 @@ public Q_SLOTS: void tst_RenderQueue::concurrentQueueAccess() { // GIVEN - Qt3DRender::Render::RenderQueue *renderQueue = new Qt3DRender::Render::RenderQueue; + Qt3DRender::Render::OpenGL::RenderQueue *renderQueue = new Qt3DRender::Render::OpenGL::RenderQueue; SimpleWorker *jobsThread = new SimpleWorker(); renderQueue->setTargetRenderViewCount(7); @@ -212,7 +212,7 @@ void tst_RenderQueue::concurrentQueueAccess() void tst_RenderQueue::resetQueue() { // GIVEN - Qt3DRender::Render::RenderQueue renderQueue; + Qt3DRender::Render::OpenGL::RenderQueue renderQueue; for (int j = 0; j < 5; j++) { // WHEN @@ -222,7 +222,7 @@ void tst_RenderQueue::resetQueue() QVERIFY(renderQueue.currentRenderViewCount() == 0); // WHEN - QVector<Qt3DRender::Render::RenderView *> renderViews(5); + QVector<Qt3DRender::Render::OpenGL::RenderView *> renderViews(5); for (int i = 0; i < 5; ++i) { renderQueue.queueRenderView(renderViews.at(i), i); } diff --git a/tests/auto/render/opengl/renderviewbuilder/tst_renderviewbuilder.cpp b/tests/auto/render/opengl/renderviewbuilder/tst_renderviewbuilder.cpp index 6dc463589..fe534e243 100644 --- a/tests/auto/render/opengl/renderviewbuilder/tst_renderviewbuilder.cpp +++ b/tests/auto/render/opengl/renderviewbuilder/tst_renderviewbuilder.cpp @@ -96,14 +96,14 @@ public: return d_func()->m_renderer->nodeManagers(); } - Render::Renderer *renderer() const + Render::OpenGL::Renderer *renderer() const { - return static_cast<Render::Renderer *>(d_func()->m_renderer); + return static_cast<Render::OpenGL::Renderer *>(d_func()->m_renderer); } - Render::MaterialParameterGathererJobPtr materialGathererJob() const + Render::OpenGL::MaterialParameterGathererJobPtr materialGathererJob() const { - Render::MaterialParameterGathererJobPtr job = Render::MaterialParameterGathererJobPtr::create(); + Render::OpenGL::MaterialParameterGathererJobPtr job = Render::OpenGL::MaterialParameterGathererJobPtr::create(); job->setNodeManagers(nodeManagers()); return job; } @@ -216,7 +216,7 @@ private Q_SLOTS: { // WHEN - Qt3DRender::Render::RenderViewBuilder renderViewBuilder(leafNode, 0, testAspect.renderer()); + Qt3DRender::Render::OpenGL::RenderViewBuilder renderViewBuilder(leafNode, 0, testAspect.renderer()); // THEN QCOMPARE(renderViewBuilder.renderViewIndex(), 0); @@ -247,14 +247,14 @@ private Q_SLOTS: QVERIFY(renderViewBuilder.filterEntityByLayerJob().isNull()); QVERIFY(renderViewBuilder.syncFilterEntityByLayerJob().isNull()); - QCOMPARE(renderViewBuilder.renderViewCommandUpdaterJobs().size(), Qt3DRender::Render::RenderViewBuilder::optimalJobCount()); + QCOMPARE(renderViewBuilder.renderViewCommandUpdaterJobs().size(), Qt3DRender::Render::OpenGL::RenderViewBuilder::optimalJobCount()); QCOMPARE(renderViewBuilder.materialGathererJobs().size(), 0); - QCOMPARE(renderViewBuilder.buildJobHierachy().size(), 8 + 1 * Qt3DRender::Render::RenderViewBuilder::optimalJobCount()); + QCOMPARE(renderViewBuilder.buildJobHierachy().size(), 8 + 1 * Qt3DRender::Render::OpenGL::RenderViewBuilder::optimalJobCount()); } { // WHEN - Qt3DRender::Render::RenderViewBuilder renderViewBuilder(leafNode, 0, testAspect.renderer()); + Qt3DRender::Render::OpenGL::RenderViewBuilder renderViewBuilder(leafNode, 0, testAspect.renderer()); renderViewBuilder.setLayerCacheNeedsToBeRebuilt(true); renderViewBuilder.prepareJobs(); @@ -264,22 +264,22 @@ private Q_SLOTS: QVERIFY(!renderViewBuilder.syncFilterEntityByLayerJob().isNull()); // mark jobs dirty and recheck - QCOMPARE(renderViewBuilder.buildJobHierachy().size(), 10 + 1 * Qt3DRender::Render::RenderViewBuilder::optimalJobCount()); + QCOMPARE(renderViewBuilder.buildJobHierachy().size(), 10 + 1 * Qt3DRender::Render::OpenGL::RenderViewBuilder::optimalJobCount()); } { // WHEN - Qt3DRender::Render::RenderViewBuilder renderViewBuilder(leafNode, 0, testAspect.renderer()); + Qt3DRender::Render::OpenGL::RenderViewBuilder renderViewBuilder(leafNode, 0, testAspect.renderer()); renderViewBuilder.setMaterialGathererCacheNeedsToBeRebuilt(true); renderViewBuilder.prepareJobs(); // THEN QCOMPARE(renderViewBuilder.materialGathererCacheNeedsToBeRebuilt(), true); - QCOMPARE(renderViewBuilder.materialGathererJobs().size(), Qt3DRender::Render::RenderViewBuilder::optimalJobCount()); + QCOMPARE(renderViewBuilder.materialGathererJobs().size(), Qt3DRender::Render::OpenGL::RenderViewBuilder::optimalJobCount()); QVERIFY(!renderViewBuilder.syncMaterialGathererJob().isNull()); // mark jobs dirty and recheck - QCOMPARE(renderViewBuilder.buildJobHierachy().size(), 9 + 2 * Qt3DRender::Render::RenderViewBuilder::optimalJobCount()); + QCOMPARE(renderViewBuilder.buildJobHierachy().size(), 9 + 2 * Qt3DRender::Render::OpenGL::RenderViewBuilder::optimalJobCount()); } } @@ -296,7 +296,7 @@ private Q_SLOTS: { // WHEN - Qt3DRender::Render::RenderViewBuilder renderViewBuilder(leafNode, 0, testAspect.renderer()); + Qt3DRender::Render::OpenGL::RenderViewBuilder renderViewBuilder(leafNode, 0, testAspect.renderer()); renderViewBuilder.prepareJobs(); renderViewBuilder.buildJobHierachy(); @@ -357,7 +357,7 @@ private Q_SLOTS: } { // WHEN - Qt3DRender::Render::RenderViewBuilder renderViewBuilder(leafNode, 0, testAspect.renderer()); + Qt3DRender::Render::OpenGL::RenderViewBuilder renderViewBuilder(leafNode, 0, testAspect.renderer()); renderViewBuilder.setLayerCacheNeedsToBeRebuilt(true); renderViewBuilder.setMaterialGathererCacheNeedsToBeRebuilt(true); renderViewBuilder.prepareJobs(); @@ -441,7 +441,7 @@ private Q_SLOTS: QVERIFY(leafNode != nullptr); // WHEN - Qt3DRender::Render::RenderViewBuilder renderViewBuilder(leafNode, 0, testAspect.renderer()); + Qt3DRender::Render::OpenGL::RenderViewBuilder renderViewBuilder(leafNode, 0, testAspect.renderer()); renderViewBuilder.prepareJobs(); renderViewBuilder.buildJobHierachy(); renderViewBuilder.renderViewJob()->run(); @@ -456,7 +456,7 @@ private Q_SLOTS: Qt3DRender::QViewport *viewport = new Qt3DRender::QViewport(); Qt3DRender::QClearBuffers *clearBuffer = new Qt3DRender::QClearBuffers(viewport); Qt3DRender::TestAspect testAspect(buildSimpleScene(viewport)); - Qt3DRender::Render::Renderer *renderer = testAspect.renderer(); + Qt3DRender::Render::OpenGL::Renderer *renderer = testAspect.renderer(); // THEN Qt3DRender::Render::FrameGraphNode *leafNode = testAspect.nodeManagers()->frameGraphManager()->lookupNode(clearBuffer->id()); @@ -476,7 +476,7 @@ private Q_SLOTS: Qt3DRender::QViewport *viewport = new Qt3DRender::QViewport(); Qt3DRender::QClearBuffers *clearBuffer = new Qt3DRender::QClearBuffers(viewport); Qt3DRender::TestAspect testAspect(buildSimpleScene(viewport)); - Qt3DRender::Render::Renderer *renderer = testAspect.renderer(); + Qt3DRender::Render::OpenGL::Renderer *renderer = testAspect.renderer(); // THEN Qt3DRender::Render::FrameGraphNode *leafNode = testAspect.nodeManagers()->frameGraphManager()->lookupNode(clearBuffer->id()); @@ -495,7 +495,7 @@ private Q_SLOTS: Qt3DRender::QViewport *viewport = new Qt3DRender::QViewport(); Qt3DRender::QClearBuffers *clearBuffer = new Qt3DRender::QClearBuffers(viewport); Qt3DRender::TestAspect testAspect(buildSimpleScene(viewport)); - Qt3DRender::Render::Renderer *renderer = testAspect.renderer(); + Qt3DRender::Render::OpenGL::Renderer *renderer = testAspect.renderer(); // THEN Qt3DRender::Render::FrameGraphNode *leafNode = testAspect.nodeManagers()->frameGraphManager()->lookupNode(clearBuffer->id()); @@ -528,7 +528,7 @@ private Q_SLOTS: { // WHEN - Qt3DRender::Render::RenderViewBuilder renderViewBuilder(leafNode, 0, testAspect.renderer()); + Qt3DRender::Render::OpenGL::RenderViewBuilder renderViewBuilder(leafNode, 0, testAspect.renderer()); renderViewBuilder.prepareJobs(); renderViewBuilder.buildJobHierachy(); @@ -552,7 +552,7 @@ private Q_SLOTS: } { // WHEN - Qt3DRender::Render::RenderViewBuilder renderViewBuilder(leafNode, 0, testAspect.renderer()); + Qt3DRender::Render::OpenGL::RenderViewBuilder renderViewBuilder(leafNode, 0, testAspect.renderer()); renderViewBuilder.setLayerCacheNeedsToBeRebuilt(true); renderViewBuilder.prepareJobs(); renderViewBuilder.buildJobHierachy(); @@ -598,7 +598,7 @@ private Q_SLOTS: QVERIFY(leafNode != nullptr); // WHEN - Qt3DRender::Render::RenderViewBuilder renderViewBuilder(leafNode, 0, testAspect.renderer()); + Qt3DRender::Render::OpenGL::RenderViewBuilder renderViewBuilder(leafNode, 0, testAspect.renderer()); renderViewBuilder.prepareJobs(); renderViewBuilder.buildJobHierachy(); @@ -622,7 +622,7 @@ private Q_SLOTS: Qt3DRender::QLayer *layer = new Qt3DRender::QLayer(); layerFilter->addLayer(layer); Qt3DRender::TestAspect testAspect(buildEntityFilterTestScene(viewport, layer)); - Qt3DRender::Render::Renderer *renderer = testAspect.renderer(); + Qt3DRender::Render::OpenGL::Renderer *renderer = testAspect.renderer(); // THEN Qt3DRender::Render::FrameGraphNode *leafNode = testAspect.nodeManagers()->frameGraphManager()->lookupNode(layerFilter->id()); @@ -631,7 +631,8 @@ private Q_SLOTS: // WHEN renderer->markDirty(Qt3DRender::Render::AbstractRenderer::AllDirty, nullptr); - Qt3DRender::Render::RenderViewBuilder renderViewBuilder(leafNode, 0, testAspect.renderer()); + Qt3DRender::Render::OpenGL::RenderViewBuilder renderViewBuilder(leafNode, 0, testAspect.renderer()); + renderViewBuilder.setLayerCacheNeedsToBeRebuilt(true); renderViewBuilder.prepareJobs(); renderViewBuilder.buildJobHierachy(); @@ -653,7 +654,7 @@ private Q_SLOTS: std::sort(renderableEntity.begin(), renderableEntity.end()); // WHEN - renderableEntity = Qt3DRender::Render::RenderViewBuilder::entitiesInSubset(renderableEntity, filteredEntity); + renderableEntity = Qt3DRender::Render::OpenGL::RenderViewBuilder::entitiesInSubset(renderableEntity, filteredEntity); // THEN QCOMPARE(renderableEntity.size(), 100); diff --git a/tests/auto/render/opengl/renderviews/tst_renderviews.cpp b/tests/auto/render/opengl/renderviews/tst_renderviews.cpp index 4fef3118b..e8e4d2523 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(); @@ -311,7 +313,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; @@ -346,7 +348,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; @@ -381,7 +383,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; @@ -541,6 +543,8 @@ private Q_SLOTS: private: }; +} // OpenGL + } // Render } // Qt3DRender @@ -548,6 +552,6 @@ private: QT_END_NAMESPACE //APPLESS_ -QTEST_MAIN(Qt3DRender::Render::tst_RenderViews) +QTEST_MAIN(Qt3DRender::Render::OpenGL::tst_RenderViews) #include "tst_renderviews.moc" diff --git a/tests/auto/render/opengl/renderviewutils/tst_renderviewutils.cpp b/tests/auto/render/opengl/renderviewutils/tst_renderviewutils.cpp index 8a345d840..6b714b9e1 100644 --- a/tests/auto/render/opengl/renderviewutils/tst_renderviewutils.cpp +++ b/tests/auto/render/opengl/renderviewutils/tst_renderviewutils.cpp @@ -108,11 +108,11 @@ public: return m_scalar; } - QHash<QString, Qt3DRender::Render::ShaderUniform> buildUniformMap(const QString &blockName) + QHash<QString, Qt3DRender::Render::OpenGL::ShaderUniform> buildUniformMap(const QString &blockName) { - QHash<QString, Qt3DRender::Render::ShaderUniform> uniforms; + QHash<QString, Qt3DRender::Render::OpenGL::ShaderUniform> uniforms; - uniforms.insert(blockName + QStringLiteral(".scalar"), Qt3DRender::Render::ShaderUniform()); + uniforms.insert(blockName + QStringLiteral(".scalar"), Qt3DRender::Render::OpenGL::ShaderUniform()); return uniforms; } @@ -149,11 +149,11 @@ public: return m_texture; } - QHash<QString, Qt3DRender::Render::ShaderUniform> buildUniformMap(const QString &blockName) + QHash<QString, Qt3DRender::Render::OpenGL::ShaderUniform> buildUniformMap(const QString &blockName) { - QHash<QString, Qt3DRender::Render::ShaderUniform> uniforms; + QHash<QString, Qt3DRender::Render::OpenGL::ShaderUniform> uniforms; - uniforms.insert(blockName + QStringLiteral(".texture"), Qt3DRender::Render::ShaderUniform()); + uniforms.insert(blockName + QStringLiteral(".texture"), Qt3DRender::Render::OpenGL::ShaderUniform()); return uniforms; } @@ -190,11 +190,11 @@ public: return m_array; } - QHash<QString, Qt3DRender::Render::ShaderUniform> buildUniformMap(const QString &blockName) + QHash<QString, Qt3DRender::Render::OpenGL::ShaderUniform> buildUniformMap(const QString &blockName) { - QHash<QString, Qt3DRender::Render::ShaderUniform> uniforms; + QHash<QString, Qt3DRender::Render::OpenGL::ShaderUniform> uniforms; - uniforms.insert(blockName + QStringLiteral(".array[0]"), Qt3DRender::Render::ShaderUniform()); + uniforms.insert(blockName + QStringLiteral(".array[0]"), Qt3DRender::Render::OpenGL::ShaderUniform()); return uniforms; } @@ -245,12 +245,12 @@ public: return m_array; } - virtual QHash<QString, Qt3DRender::Render::ShaderUniform> buildUniformMap(const QString &blockName) + virtual QHash<QString, Qt3DRender::Render::OpenGL::ShaderUniform> buildUniformMap(const QString &blockName) { - QHash<QString, Qt3DRender::Render::ShaderUniform> uniforms; + QHash<QString, Qt3DRender::Render::OpenGL::ShaderUniform> uniforms; - uniforms.insert(blockName + QStringLiteral(".scalar"), Qt3DRender::Render::ShaderUniform()); - uniforms.insert(blockName + QStringLiteral(".array[0]"), Qt3DRender::Render::ShaderUniform()); + uniforms.insert(blockName + QStringLiteral(".scalar"), Qt3DRender::Render::OpenGL::ShaderUniform()); + uniforms.insert(blockName + QStringLiteral(".array[0]"), Qt3DRender::Render::OpenGL::ShaderUniform()); return uniforms; } @@ -299,17 +299,17 @@ public: return m_inner; } - QHash<QString, Qt3DRender::Render::ShaderUniform> buildUniformMap(const QString &blockName) override + QHash<QString, Qt3DRender::Render::OpenGL::ShaderUniform> buildUniformMap(const QString &blockName) override { - QHash<QString, Qt3DRender::Render::ShaderUniform> innerUniforms; + QHash<QString, Qt3DRender::Render::OpenGL::ShaderUniform> innerUniforms; StructShaderData *innerData = nullptr; if ((innerData = qobject_cast<StructShaderData *>(m_inner)) != nullptr) innerUniforms = innerData->buildUniformMap(QStringLiteral(".inner")); - QHash<QString, Qt3DRender::Render::ShaderUniform> uniforms = StructShaderData::buildUniformMap(blockName); - QHash<QString, Qt3DRender::Render::ShaderUniform>::const_iterator it = innerUniforms.begin(); - const QHash<QString, Qt3DRender::Render::ShaderUniform>::const_iterator end = innerUniforms.end(); + QHash<QString, Qt3DRender::Render::OpenGL::ShaderUniform> uniforms = StructShaderData::buildUniformMap(blockName); + QHash<QString, Qt3DRender::Render::OpenGL::ShaderUniform>::const_iterator it = innerUniforms.begin(); + const QHash<QString, Qt3DRender::Render::OpenGL::ShaderUniform>::const_iterator end = innerUniforms.end(); while (it != end) { uniforms.insert(blockName + it.key(), it.value()); @@ -362,7 +362,7 @@ void tst_RenderViewUtils::topLevelScalarValueNoUniforms() QVERIFY(backendShaderData != nullptr); // WHEB - Qt3DRender::Render::UniformBlockValueBuilder blockBuilder; + Qt3DRender::Render::OpenGL::UniformBlockValueBuilder blockBuilder; blockBuilder.shaderDataManager = manager.data(); blockBuilder.textureManager = textureManager.data(); blockBuilder.updatedPropertiesOnly = false; @@ -391,7 +391,7 @@ void tst_RenderViewUtils::topLevelScalarValue() QVERIFY(backendShaderData != nullptr); // WHEN - Qt3DRender::Render::UniformBlockValueBuilder blockBuilder; + Qt3DRender::Render::OpenGL::UniformBlockValueBuilder blockBuilder; blockBuilder.shaderDataManager = manager.data(); blockBuilder.textureManager = textureManager.data(); blockBuilder.updatedPropertiesOnly = false; @@ -404,8 +404,8 @@ void tst_RenderViewUtils::topLevelScalarValue() QCOMPARE(blockBuilder.activeUniformNamesToValue.count(), 1); // WHEN - Qt3DRender::Render::UniformBlockValueBuilderHash::const_iterator it = blockBuilder.activeUniformNamesToValue.begin(); - const Qt3DRender::Render::UniformBlockValueBuilderHash::const_iterator end = blockBuilder.activeUniformNamesToValue.end(); + Qt3DRender::Render::OpenGL::UniformBlockValueBuilderHash::const_iterator it = blockBuilder.activeUniformNamesToValue.begin(); + const Qt3DRender::Render::OpenGL::UniformBlockValueBuilderHash::const_iterator end = blockBuilder.activeUniformNamesToValue.end(); while (it != end) { // THEN @@ -433,7 +433,7 @@ void tst_RenderViewUtils::topLevelTextureValueNoUniforms() QVERIFY(backendShaderData != nullptr); // WHEB - Qt3DRender::Render::UniformBlockValueBuilder blockBuilder; + Qt3DRender::Render::OpenGL::UniformBlockValueBuilder blockBuilder; blockBuilder.shaderDataManager = manager.data(); blockBuilder.textureManager = textureManager.data(); blockBuilder.updatedPropertiesOnly = false; @@ -464,7 +464,7 @@ void tst_RenderViewUtils::topLevelTextureValue() QVERIFY(backendShaderData != nullptr); // WHEN - Qt3DRender::Render::UniformBlockValueBuilder blockBuilder; + Qt3DRender::Render::OpenGL::UniformBlockValueBuilder blockBuilder; blockBuilder.shaderDataManager = manager.data(); blockBuilder.textureManager = textureManager.data(); blockBuilder.updatedPropertiesOnly = false; @@ -477,8 +477,8 @@ void tst_RenderViewUtils::topLevelTextureValue() QCOMPARE(blockBuilder.activeUniformNamesToValue.count(), 1); // WHEN - Qt3DRender::Render::UniformBlockValueBuilderHash::const_iterator it = blockBuilder.activeUniformNamesToValue.begin(); - const Qt3DRender::Render::UniformBlockValueBuilderHash::const_iterator end = blockBuilder.activeUniformNamesToValue.end(); + Qt3DRender::Render::OpenGL::UniformBlockValueBuilderHash::const_iterator it = blockBuilder.activeUniformNamesToValue.begin(); + const Qt3DRender::Render::OpenGL::UniformBlockValueBuilderHash::const_iterator end = blockBuilder.activeUniformNamesToValue.end(); while (it != end) { // THEN @@ -506,7 +506,7 @@ void tst_RenderViewUtils::topLevelArrayValue() QVERIFY(backendShaderData != nullptr); // WHEN - Qt3DRender::Render::UniformBlockValueBuilder blockBuilder; + Qt3DRender::Render::OpenGL::UniformBlockValueBuilder blockBuilder; blockBuilder.shaderDataManager = manager.data(); blockBuilder.textureManager = textureManager.data(); blockBuilder.updatedPropertiesOnly = false; @@ -519,8 +519,8 @@ void tst_RenderViewUtils::topLevelArrayValue() QCOMPARE(blockBuilder.activeUniformNamesToValue.count(), 1); // WHEN - Qt3DRender::Render::UniformBlockValueBuilderHash::const_iterator it = blockBuilder.activeUniformNamesToValue.begin(); - const Qt3DRender::Render::UniformBlockValueBuilderHash::const_iterator end = blockBuilder.activeUniformNamesToValue.end(); + Qt3DRender::Render::OpenGL::UniformBlockValueBuilderHash::const_iterator it = blockBuilder.activeUniformNamesToValue.begin(); + const Qt3DRender::Render::OpenGL::UniformBlockValueBuilderHash::const_iterator end = blockBuilder.activeUniformNamesToValue.end(); while (it != end) { // THEN @@ -571,13 +571,13 @@ void tst_RenderViewUtils::nestedShaderDataValue() QVERIFY(backendShaderData3 != nullptr); // WHEN - Qt3DRender::Render::UniformBlockValueBuilder blockBuilder; + Qt3DRender::Render::OpenGL::UniformBlockValueBuilder blockBuilder; blockBuilder.shaderDataManager = manager.data(); blockBuilder.textureManager = textureManager.data(); blockBuilder.updatedPropertiesOnly = false; - blockBuilder.uniforms.insert(QStringLiteral("MyBlock.array[0].scalar"), Qt3DRender::Render::ShaderUniform()); - blockBuilder.uniforms.insert(QStringLiteral("MyBlock.array[1].scalar"), Qt3DRender::Render::ShaderUniform()); - blockBuilder.uniforms.insert(QStringLiteral("MyBlock.array[2].scalar"), Qt3DRender::Render::ShaderUniform()); + blockBuilder.uniforms.insert(QStringLiteral("MyBlock.array[0].scalar"), Qt3DRender::Render::OpenGL::ShaderUniform()); + blockBuilder.uniforms.insert(QStringLiteral("MyBlock.array[1].scalar"), Qt3DRender::Render::OpenGL::ShaderUniform()); + blockBuilder.uniforms.insert(QStringLiteral("MyBlock.array[2].scalar"), Qt3DRender::Render::OpenGL::ShaderUniform()); // build name-value map blockBuilder.buildActiveUniformNameValueMapStructHelper(backendArrayShaderData, QStringLiteral("MyBlock")); @@ -647,7 +647,7 @@ void tst_RenderViewUtils::topLevelStructValue() QVERIFY(backendShaderData != nullptr); // WHEN - Qt3DRender::Render::UniformBlockValueBuilder blockBuilder; + Qt3DRender::Render::OpenGL::UniformBlockValueBuilder blockBuilder; blockBuilder.shaderDataManager = manager.data(); blockBuilder.textureManager = textureManager.data(); blockBuilder.updatedPropertiesOnly = false; @@ -660,8 +660,8 @@ void tst_RenderViewUtils::topLevelStructValue() QCOMPARE(blockBuilder.activeUniformNamesToValue.count(), blockBuilder.uniforms.count()); // WHEN - Qt3DRender::Render::UniformBlockValueBuilderHash::const_iterator it = blockBuilder.activeUniformNamesToValue.begin(); - const Qt3DRender::Render::UniformBlockValueBuilderHash::const_iterator end = blockBuilder.activeUniformNamesToValue.end(); + Qt3DRender::Render::OpenGL::UniformBlockValueBuilderHash::const_iterator it = blockBuilder.activeUniformNamesToValue.begin(); + const Qt3DRender::Render::OpenGL::UniformBlockValueBuilderHash::const_iterator end = blockBuilder.activeUniformNamesToValue.end(); while (it != end) { // THEN @@ -693,13 +693,13 @@ void tst_RenderViewUtils::topLevelDynamicProperties() QVERIFY(backendShaderData != nullptr); // WHEN - Qt3DRender::Render::UniformBlockValueBuilder blockBuilder; + Qt3DRender::Render::OpenGL::UniformBlockValueBuilder blockBuilder; blockBuilder.shaderDataManager = manager.data(); blockBuilder.textureManager = textureManager.data(); blockBuilder.updatedPropertiesOnly = false; - blockBuilder.uniforms.insert(QStringLiteral("MyBlock.scalar"), Qt3DRender::Render::ShaderUniform()); - blockBuilder.uniforms.insert(QStringLiteral("MyBlock.array[0]"), Qt3DRender::Render::ShaderUniform()); - blockBuilder.uniforms.insert(QStringLiteral("MyBlock.texture"), Qt3DRender::Render::ShaderUniform()); + blockBuilder.uniforms.insert(QStringLiteral("MyBlock.scalar"), Qt3DRender::Render::OpenGL::ShaderUniform()); + blockBuilder.uniforms.insert(QStringLiteral("MyBlock.array[0]"), Qt3DRender::Render::OpenGL::ShaderUniform()); + blockBuilder.uniforms.insert(QStringLiteral("MyBlock.texture"), Qt3DRender::Render::OpenGL::ShaderUniform()); // build name-value map blockBuilder.buildActiveUniformNameValueMapStructHelper(backendShaderData, QStringLiteral("MyBlock")); diff --git a/tests/auto/render/opengl/textures/tst_textures.cpp b/tests/auto/render/opengl/textures/tst_textures.cpp index bc32f9325..eca0da6cb 100644 --- a/tests/auto/render/opengl/textures/tst_textures.cpp +++ b/tests/auto/render/opengl/textures/tst_textures.cpp @@ -218,7 +218,7 @@ private Q_SLOTS: { QSKIP("Texture Sharing is now disabled"); QScopedPointer<Qt3DRender::Render::NodeManagers> mgrs(new Qt3DRender::Render::NodeManagers()); - Qt3DRender::Render::Renderer renderer(Qt3DRender::QRenderAspect::Synchronous); + Qt3DRender::Render::OpenGL::Renderer renderer(Qt3DRender::QRenderAspect::Synchronous); renderer.setNodeManagers(mgrs.data()); // GIVEN @@ -246,7 +246,7 @@ private Q_SLOTS: void shouldCreateDifferentGLTexturess() { QScopedPointer<Qt3DRender::Render::NodeManagers> mgrs(new Qt3DRender::Render::NodeManagers()); - Qt3DRender::Render::Renderer renderer(Qt3DRender::QRenderAspect::Synchronous); + Qt3DRender::Render::OpenGL::Renderer renderer(Qt3DRender::QRenderAspect::Synchronous); renderer.setNodeManagers(mgrs.data()); // GIVEN @@ -277,7 +277,7 @@ private Q_SLOTS: QVERIFY(renderer.glResourceManagers()->glTextureManager()->lookupResource(backend[i]->peerId()) != renderer.glResourceManagers()->glTextureManager()->lookupResource(backend[k]->peerId())); - QVector<Qt3DRender::Render::GLTexture *> glTextures; + QVector<Qt3DRender::Render::OpenGL::GLTexture *> glTextures; for (Qt3DRender::Render::Texture *t : backend) glTextures.push_back(renderer.glResourceManagers()->glTextureManager()->lookupResource(t->peerId())); @@ -302,10 +302,10 @@ private Q_SLOTS: void shouldCreateDifferentGLTexturesWhenUsingSharedTextureIds() { QScopedPointer<Qt3DRender::Render::NodeManagers> mgrs(new Qt3DRender::Render::NodeManagers()); - Qt3DRender::Render::Renderer renderer(Qt3DRender::QRenderAspect::Synchronous); + Qt3DRender::Render::OpenGL::Renderer renderer(Qt3DRender::QRenderAspect::Synchronous); renderer.setNodeManagers(mgrs.data()); - Qt3DRender::Render::GLResourceManagers *glMgrs = renderer.glResourceManagers(); + Qt3DRender::Render::OpenGL::GLResourceManagers *glMgrs = renderer.glResourceManagers(); // both texture having the same sharedTextureId { @@ -331,8 +331,8 @@ private Q_SLOTS: renderer.updateTexture(bt2); // THEN - Qt3DRender::Render::GLTexture *glt1 = glMgrs->glTextureManager()->lookupResource(bt1->peerId()); - Qt3DRender::Render::GLTexture *glt2 = glMgrs->glTextureManager()->lookupResource(bt2->peerId()); + Qt3DRender::Render::OpenGL::GLTexture *glt1 = glMgrs->glTextureManager()->lookupResource(bt1->peerId()); + Qt3DRender::Render::OpenGL::GLTexture *glt2 = glMgrs->glTextureManager()->lookupResource(bt2->peerId()); QVERIFY(glt1 != glt2); QCOMPARE(glt1->sharedTextureId(), bt1->sharedTextureId()); QCOMPARE(glt2->sharedTextureId(), bt2->sharedTextureId()); @@ -362,8 +362,8 @@ private Q_SLOTS: renderer.updateTexture(bt2); // THEN - Qt3DRender::Render::GLTexture *glt1 = glMgrs->glTextureManager()->lookupResource(bt1->peerId()); - Qt3DRender::Render::GLTexture *glt2 = glMgrs->glTextureManager()->lookupResource(bt2->peerId()); + Qt3DRender::Render::OpenGL::GLTexture *glt1 = glMgrs->glTextureManager()->lookupResource(bt1->peerId()); + Qt3DRender::Render::OpenGL::GLTexture *glt2 = glMgrs->glTextureManager()->lookupResource(bt2->peerId()); QVERIFY(glt1 != glt2); QCOMPARE(glt1->sharedTextureId(), bt1->sharedTextureId()); QCOMPARE(glt2->sharedTextureId(), bt2->sharedTextureId()); @@ -375,7 +375,7 @@ private Q_SLOTS: void generatorsShouldCreateSameData() { QScopedPointer<Qt3DRender::Render::NodeManagers> mgrs(new Qt3DRender::Render::NodeManagers()); - Qt3DRender::Render::Renderer renderer(Qt3DRender::QRenderAspect::Synchronous); + Qt3DRender::Render::OpenGL::Renderer renderer(Qt3DRender::QRenderAspect::Synchronous); renderer.setNodeManagers(mgrs.data()); // GIVEN @@ -434,7 +434,7 @@ private Q_SLOTS: void checkTextureImageCleanupState() { // GIVEN - Qt3DRender::Render::Renderer renderer(Qt3DRender::QRenderAspect::Synchronous); + Qt3DRender::Render::OpenGL::Renderer renderer(Qt3DRender::QRenderAspect::Synchronous); TestTextureImage img(1); img.setLayer(2); img.setMipLevel(3); @@ -458,7 +458,7 @@ private Q_SLOTS: void checkTextureImageInitializeFromPeer() { // GIVEN - Qt3DRender::Render::Renderer renderer(Qt3DRender::QRenderAspect::Synchronous); + Qt3DRender::Render::OpenGL::Renderer renderer(Qt3DRender::QRenderAspect::Synchronous); TestTextureImage img(1); { @@ -590,7 +590,7 @@ private Q_SLOTS: void checkTextureImageProperlyReleaseGenerator() { QScopedPointer<Qt3DRender::Render::NodeManagers> mgrs(new Qt3DRender::Render::NodeManagers()); - Qt3DRender::Render::Renderer renderer(Qt3DRender::QRenderAspect::Synchronous); + Qt3DRender::Render::OpenGL::Renderer renderer(Qt3DRender::QRenderAspect::Synchronous); Qt3DRender::Render::TextureManager *texMgr = mgrs->textureManager(); Qt3DRender::Render::TextureImageManager *texImgMgr = mgrs->textureImageManager(); renderer.setNodeManagers(mgrs.data()); @@ -630,7 +630,7 @@ private Q_SLOTS: void checkTextureIsMarkedForDeletion() { QScopedPointer<Qt3DRender::Render::NodeManagers> mgrs(new Qt3DRender::Render::NodeManagers()); - Qt3DRender::Render::Renderer renderer(Qt3DRender::QRenderAspect::Synchronous); + Qt3DRender::Render::OpenGL::Renderer renderer(Qt3DRender::QRenderAspect::Synchronous); Qt3DRender::Render::TextureManager *texMgr = mgrs->textureManager(); renderer.setNodeManagers(mgrs.data()); @@ -664,7 +664,7 @@ private Q_SLOTS: void checkTextureDestructionReconstructionWithinSameLoop() { QScopedPointer<Qt3DRender::Render::NodeManagers> mgrs(new Qt3DRender::Render::NodeManagers()); - Qt3DRender::Render::Renderer renderer(Qt3DRender::QRenderAspect::Synchronous); + Qt3DRender::Render::OpenGL::Renderer renderer(Qt3DRender::QRenderAspect::Synchronous); Qt3DRender::Render::TextureManager *texMgr = mgrs->textureManager(); renderer.setNodeManagers(mgrs.data()); @@ -703,7 +703,7 @@ private Q_SLOTS: { // GIVEN QScopedPointer<Qt3DRender::Render::NodeManagers> mgrs(new Qt3DRender::Render::NodeManagers()); - Qt3DRender::Render::Renderer renderer(Qt3DRender::QRenderAspect::Synchronous); + Qt3DRender::Render::OpenGL::Renderer renderer(Qt3DRender::QRenderAspect::Synchronous); Qt3DRender::Render::TextureManager *texMgr = mgrs->textureManager(); Qt3DRender::Render::TextureImageManager *texImgMgr = mgrs->textureImageManager(); renderer.setNodeManagers(mgrs.data()); diff --git a/tests/benchmarks/render/jobs/tst_bench_jobs.cpp b/tests/benchmarks/render/jobs/tst_bench_jobs.cpp index 87689e46c..85b5e8c89 100644 --- a/tests/benchmarks/render/jobs/tst_bench_jobs.cpp +++ b/tests/benchmarks/render/jobs/tst_bench_jobs.cpp @@ -87,32 +87,32 @@ namespace Qt3DRender { QVector<Qt3DCore::QAspectJobPtr> worldTransformJob() { - static_cast<Render::Renderer *>(d_func()->m_renderer)->m_worldTransformJob->setRoot(d_func()->m_renderer->sceneRoot()); - return QVector<Qt3DCore::QAspectJobPtr>() << static_cast<Render::Renderer *>(d_func()->m_renderer)->m_worldTransformJob; + static_cast<Render::OpenGL::Renderer *>(d_func()->m_renderer)->m_worldTransformJob->setRoot(d_func()->m_renderer->sceneRoot()); + return QVector<Qt3DCore::QAspectJobPtr>() << static_cast<Render::OpenGL::Renderer *>(d_func()->m_renderer)->m_worldTransformJob; } QVector<Qt3DCore::QAspectJobPtr> updateBoundingJob() { - static_cast<Render::Renderer *>(d_func()->m_renderer)->m_updateWorldBoundingVolumeJob->setManager(d_func()->m_renderer->nodeManagers()->renderNodesManager()); - return QVector<Qt3DCore::QAspectJobPtr>() << static_cast<Render::Renderer *>(d_func()->m_renderer)->m_updateWorldBoundingVolumeJob; + static_cast<Render::OpenGL::Renderer *>(d_func()->m_renderer)->m_updateWorldBoundingVolumeJob->setManager(d_func()->m_renderer->nodeManagers()->renderNodesManager()); + return QVector<Qt3DCore::QAspectJobPtr>() << static_cast<Render::OpenGL::Renderer *>(d_func()->m_renderer)->m_updateWorldBoundingVolumeJob; } QVector<Qt3DCore::QAspectJobPtr> calculateBoundingVolumeJob() { - static_cast<Render::Renderer *>(d_func()->m_renderer)->m_calculateBoundingVolumeJob->setRoot(d_func()->m_renderer->sceneRoot()); - return QVector<Qt3DCore::QAspectJobPtr>() << static_cast<Render::Renderer *>(d_func()->m_renderer)->m_calculateBoundingVolumeJob; + static_cast<Render::OpenGL::Renderer *>(d_func()->m_renderer)->m_calculateBoundingVolumeJob->setRoot(d_func()->m_renderer->sceneRoot()); + return QVector<Qt3DCore::QAspectJobPtr>() << static_cast<Render::OpenGL::Renderer *>(d_func()->m_renderer)->m_calculateBoundingVolumeJob; } QVector<Qt3DCore::QAspectJobPtr> framePreparationJob() { - static_cast<Render::Renderer *>(d_func()->m_renderer)->m_updateShaderDataTransformJob->setManagers(d_func()->m_renderer->nodeManagers()); - return QVector<Qt3DCore::QAspectJobPtr>() << static_cast<Render::Renderer *>(d_func()->m_renderer)->m_updateShaderDataTransformJob; + static_cast<Render::OpenGL::Renderer *>(d_func()->m_renderer)->m_updateShaderDataTransformJob->setManagers(d_func()->m_renderer->nodeManagers()); + return QVector<Qt3DCore::QAspectJobPtr>() << static_cast<Render::OpenGL::Renderer *>(d_func()->m_renderer)->m_updateShaderDataTransformJob; } QVector<Qt3DCore::QAspectJobPtr> frameCleanupJob() { - static_cast<Render::Renderer *>(d_func()->m_renderer)->m_cleanupJob->setRoot(d_func()->m_renderer->sceneRoot()); - return QVector<Qt3DCore::QAspectJobPtr>() << static_cast<Render::Renderer *>(d_func()->m_renderer)->m_cleanupJob; + static_cast<Render::OpenGL::Renderer *>(d_func()->m_renderer)->m_cleanupJob->setRoot(d_func()->m_renderer->sceneRoot()); + return QVector<Qt3DCore::QAspectJobPtr>() << static_cast<Render::OpenGL::Renderer *>(d_func()->m_renderer)->m_cleanupJob; } QVector<Qt3DCore::QAspectJobPtr> renderBinJobs() @@ -140,7 +140,7 @@ namespace Qt3DRender { for (const auto &node: nodes) d_func()->createBackendNode(node); - static_cast<Qt3DRender::Render::Renderer *>(d_func()->m_renderer)->m_renderSceneRoot = + static_cast<Qt3DRender::Render::OpenGL::Renderer *>(d_func()->m_renderer)->m_renderSceneRoot = d_func()->m_renderer->nodeManagers() ->lookupResource<Qt3DRender::Render::Entity, Qt3DRender::Render::EntityManager>(root->id()); } diff --git a/tests/benchmarks/render/materialparametergathering/tst_bench_materialparametergathering.cpp b/tests/benchmarks/render/materialparametergathering/tst_bench_materialparametergathering.cpp index 644c4d74c..340bfdda4 100644 --- a/tests/benchmarks/render/materialparametergathering/tst_bench_materialparametergathering.cpp +++ b/tests/benchmarks/render/materialparametergathering/tst_bench_materialparametergathering.cpp @@ -90,9 +90,9 @@ public: return d_func()->m_renderer->nodeManagers(); } - Render::MaterialParameterGathererJobPtr materialGathererJob() const + Render::OpenGL::MaterialParameterGathererJobPtr materialGathererJob() const { - Render::MaterialParameterGathererJobPtr job = Render::MaterialParameterGathererJobPtr::create(); + Render::OpenGL::MaterialParameterGathererJobPtr job = Render::OpenGL::MaterialParameterGathererJobPtr::create(); job->setNodeManagers(nodeManagers()); return job; } @@ -136,7 +136,7 @@ private Q_SLOTS: QScopedPointer<Qt3DRender::TestAspect> aspect(new Qt3DRender::TestAspect(buildTestScene(2000))); // WHEN - Qt3DRender::Render::MaterialParameterGathererJobPtr gatheringJob = aspect->materialGathererJob(); + Qt3DRender::Render::OpenGL::MaterialParameterGathererJobPtr gatheringJob = aspect->materialGathererJob(); gatheringJob->setHandles(aspect->nodeManagers()->materialManager()->activeHandles()); QBENCHMARK { |