diff options
Diffstat (limited to 'src/plugins/renderers/opengl/renderer/renderer.cpp')
| -rw-r--r-- | src/plugins/renderers/opengl/renderer/renderer.cpp | 19 |
1 files changed, 10 insertions, 9 deletions
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 |