Remove CommandThread/GLCommands

This has always been disabled, no point in keeping something we don't use.
Can always be reverted later if we find it's actually required.

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

7 files changed, 1 insertions, 502 deletions

diff --git a/src/render/renderers/opengl/renderer/commandthread.cpp b/src/render/renderers/opengl/renderer/commandthread.cpp
deleted file mode 100644
index a518d3b68..000000000
--- a/src/render/renderers/opengl/renderer/commandthread.cpp
+++ /dev/null
@@ -1,204 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2017 Klaralvdalens Datakonsult AB (KDAB).
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the Qt3D module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL3 included in the
-** packaging of this file. Please review the following information to
-** ensure the GNU Lesser General Public License version 3 requirements
-** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 2.0 or (at your option) the GNU General
-** Public license version 3 or any later version approved by the KDE Free
-** Qt Foundation. The licenses are as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-2.0.html and
-** https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include "commandthread_p.h"
-#include <Qt3DRender/private/glcommands_p.h>
-#include <Qt3DRender/private/offscreensurfacehelper_p.h>
-#include <Qt3DRender/private/graphicscontext_p.h>
-#include <Qt3DRender/private/shadercache_p.h>
-#include <QOpenGLContext>
-#include <QOffscreenSurface>
-#include <QDebug>
-
-QT_BEGIN_NAMESPACE
-
-namespace Qt3DRender {
-
-namespace Render {
-
-CommandThread::CommandThread(Renderer *renderer)
-    : QThread()
-    , m_renderer(renderer)
-    , m_waitForStartSemaphore(0)
-    , m_initializedSemaphore(0)
-    , m_commandRequestedSemaphore(0)
-    , m_commandExecutionSemaphore(0)
-    , m_mainContext(nullptr)
-    , m_shaderCache(nullptr)
-    , m_offsreenSurfaceHelper(nullptr)
-    , m_currentCommand(nullptr)
-    , m_running(0)
-{
-}
-
-CommandThread::~CommandThread()
-{
-    Q_ASSERT(!isRunning());
-}
-
-void CommandThread::setShaderCache(ShaderCache *shaderCache)
-{
-    m_shaderCache = shaderCache;
-}
-
-// Called by RenderThread or MainThread (Scene3d)
-void CommandThread::initialize(QOpenGLContext *mainContext, OffscreenSurfaceHelper *offsreenSurfaceHelper)
-{
-    // Start the thread
-    start();
-
-    // Wait for thread to be started
-    m_waitForStartSemaphore.acquire();
-
-    m_mainContext = mainContext;
-    m_offsreenSurfaceHelper = offsreenSurfaceHelper;
-    Q_ASSERT(m_mainContext && offsreenSurfaceHelper);
-
-    // Initialize shared context and resources for the thread. This must be
-    // done here since some platforms do not allow context sharing to be set up
-    // with contexts created on different threads. (Windows with WGL, in
-    // particular; resource sharing works fine later on, what matters is the
-    // thread the wglShareLists call is made on)
-    m_localContext.reset(new QOpenGLContext());
-    m_localContext->setFormat(m_mainContext->format());
-    m_localContext->setShareContext(m_mainContext);
-    if (!m_localContext->create())
-        qWarning("CommandThread: Failed to create local context");
-    m_localContext->moveToThread(this);
-
-    m_running.fetchAndStoreOrdered(1);
-
-    // Allow thread to proceed
-    m_initializedSemaphore.release();
-}
-
-// Called by RenderThread or MainThread (Scene3D)
-void CommandThread::shutdown()
-{
-    m_running.fetchAndStoreOrdered(0);
-
-    // Unblock thread
-    m_commandRequestedSemaphore.release(1);
-
-    // Wait for thread to exit
-    wait();
-
-    // Reset semaphores (in case we ever want to restart)
-    m_waitForStartSemaphore.acquire(m_waitForStartSemaphore.available());
-    m_initializedSemaphore.acquire(m_initializedSemaphore.available());
-    m_commandRequestedSemaphore.acquire(m_commandRequestedSemaphore.available());
-    m_commandExecutionSemaphore.acquire(m_commandExecutionSemaphore.available());
-    m_localContext.reset();
-}
-
-// Any thread can call this, this is a blocking command
-void CommandThread::executeCommand(GLCommand *command)
-{
-    if (!isRunning())
-        return;
-
-    // We lock to prevent any other call to executeCommand to be executed
-    // before we have received the result of our command
-    m_blockingCallerMutex.lock();
-
-    // Store command to be executed
-    m_currentCommand = command;
-
-    // Allow thread to proceed and execute command
-    m_commandRequestedSemaphore.release();
-
-    // Wait for thread to be done
-    m_commandExecutionSemaphore.acquire();
-
-    // Reset command
-    m_currentCommand = nullptr;
-
-    // Unlock blocking semaphore so that other calls to executeCommand
-    // can proceed
-    m_blockingCallerMutex.unlock();
-}
-
-void CommandThread::run()
-{
-    // Allow initialize to proceed
-    m_waitForStartSemaphore.release();
-
-    // Wait for initialize to be completed
-    m_initializedSemaphore.acquire();
-
-    Q_ASSERT(m_mainContext && m_shaderCache);
-
-    // Initialize GraphicsContext
-    m_graphicsContext.reset(new GraphicsContext());
-    m_graphicsContext->setShaderCache(m_shaderCache);
-    m_graphicsContext->setOpenGLContext(m_localContext.data());
-
-    bool initialized = false;
-    while (true) {
-
-        // Wait for command
-        m_commandRequestedSemaphore.acquire();
-
-        // Are we still running?
-        if (!m_running.loadRelaxed()) {
-            m_graphicsContext->doneCurrent();
-            // to prevent executeCommand being locked
-            m_commandExecutionSemaphore.release();
-            break;
-        }
-
-        if (Q_UNLIKELY(!initialized)) {
-            QOffscreenSurface *offscreenSurface = m_offsreenSurfaceHelper->offscreenSurface();
-            Q_ASSERT(offscreenSurface);
-            m_graphicsContext->makeCurrent(offscreenSurface);
-            initialized = true;
-        }
-
-        m_currentCommand->execute(m_renderer, m_graphicsContext.data());
-
-        // Allow caller to proceed as we are done with the command
-        m_commandExecutionSemaphore.release();
-    }
-}
-
-} // Render
-
-} // Qt3DRender
-
-QT_END_NAMESPACE
diff --git a/src/render/renderers/opengl/renderer/commandthread_p.h b/src/render/renderers/opengl/renderer/commandthread_p.h
deleted file mode 100644
index 0508675c4..000000000
--- a/src/render/renderers/opengl/renderer/commandthread_p.h
+++ /dev/null
@@ -1,115 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2017 Klaralvdalens Datakonsult AB (KDAB).
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the Qt3D module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL3 included in the
-** packaging of this file. Please review the following information to
-** ensure the GNU Lesser General Public License version 3 requirements
-** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 2.0 or (at your option) the GNU General
-** Public license version 3 or any later version approved by the KDE Free
-** Qt Foundation. The licenses are as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-2.0.html and
-** https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef QT3DRENDER_RENDER_COMMANDTHREAD_P_H
-#define QT3DRENDER_RENDER_COMMANDTHREAD_P_H
-
-//
-//  W A R N I N G
-//  -------------
-//
-// This file is not part of the Qt API.  It exists for the convenience
-// of other Qt classes.  This header file may change from version to
-// version without notice, or even be removed.
-//
-// We mean it.
-//
-
-#include <QtCore/QThread>
-#include <QtCore/QSemaphore>
-#include <QtCore/QMutex>
-
-QT_BEGIN_NAMESPACE
-
-class QOpenGLContext;
-
-namespace Qt3DRender {
-
-namespace Render {
-
-class Renderer;
-class GLCommand;
-class OffscreenSurfaceHelper;
-class GraphicsContext;
-class ShaderCache;
-
-class CommandThread : public QThread
-{
-    Q_OBJECT
-public:
-    explicit CommandThread(Renderer *renderer);
-    ~CommandThread();
-
-    Render::Renderer* renderer() const { return m_renderer; }
-
-    void setShaderCache(ShaderCache *shaderCache);
-    ShaderCache *shaderCache() const { return m_shaderCache; }
-
-    void initialize(QOpenGLContext *mainContext, OffscreenSurfaceHelper *offsreenSurfaceHelper);
-    void shutdown();
-
-    void executeCommand(GLCommand *command);
-
-private:
-    void run() override;
-    void executeCommandInternal(Qt3DRender::Render::GLCommand *command);
-
-private:
-    Renderer* m_renderer;
-    QSemaphore m_waitForStartSemaphore;
-    QSemaphore m_initializedSemaphore;
-    QSemaphore m_commandRequestedSemaphore;
-    QSemaphore m_commandExecutionSemaphore;
-    QMutex m_blockingCallerMutex;
-    QOpenGLContext *m_mainContext;
-    ShaderCache *m_shaderCache;
-    OffscreenSurfaceHelper *m_offsreenSurfaceHelper;
-    QScopedPointer<QOpenGLContext> m_localContext;
-    QScopedPointer<GraphicsContext> m_graphicsContext;
-    GLCommand *m_currentCommand;
-    QAtomicInt m_running;
-};
-
-} // Render
-
-} // Qt3DRender
-
-QT_END_NAMESPACE
-
-#endif // QT3DRENDER_RENDER_COMMANDTHREAD_P_H
diff --git a/src/render/renderers/opengl/renderer/glcommands.cpp b/src/render/renderers/opengl/renderer/glcommands.cpp
deleted file mode 100644
index fd7ee9fe8..000000000
--- a/src/render/renderers/opengl/renderer/glcommands.cpp
+++ /dev/null
@@ -1,67 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2017 Klaralvdalens Datakonsult AB (KDAB).
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the Qt3D module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL3 included in the
-** packaging of this file. Please review the following information to
-** ensure the GNU Lesser General Public License version 3 requirements
-** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 2.0 or (at your option) the GNU General
-** Public license version 3 or any later version approved by the KDE Free
-** Qt Foundation. The licenses are as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-2.0.html and
-** https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include "glcommands_p.h"
-#include <Qt3DRender/private/renderer_p.h>
-#include <Qt3DRender/private/graphicscontext_p.h>
-#include <Qt3DRender/private/nodemanagers_p.h>
-
-QT_BEGIN_NAMESPACE
-
-namespace Qt3DRender {
-
-namespace Render {
-
-LoadShaderCommand::LoadShaderCommand(Shader *shader)
-    : m_shader(shader)
-{
-    Q_ASSERT(m_shader);
-}
-
-void LoadShaderCommand::execute(Renderer *renderer, GraphicsContext *ctx)
-{
-    NodeManagers *nodeManagers = renderer->nodeManagers();
-    ctx->loadShader(m_shader, nodeManagers->shaderManager());
-}
-
-} // Render
-
-} // Qt3DRender
-
-QT_END_NAMESPACE
diff --git a/src/render/renderers/opengl/renderer/glcommands_p.h b/src/render/renderers/opengl/renderer/glcommands_p.h
deleted file mode 100644
index 5ed360759..000000000
--- a/src/render/renderers/opengl/renderer/glcommands_p.h
+++ /dev/null
@@ -1,89 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2017 Klaralvdalens Datakonsult AB (KDAB).
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the Qt3D module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL3 included in the
-** packaging of this file. Please review the following information to
-** ensure the GNU Lesser General Public License version 3 requirements
-** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 2.0 or (at your option) the GNU General
-** Public license version 3 or any later version approved by the KDE Free
-** Qt Foundation. The licenses are as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-2.0.html and
-** https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef QT3DRENDER_RENDER_GLCOMMANDS_P_H
-#define QT3DRENDER_RENDER_GLCOMMANDS_P_H
-
-//
-//  W A R N I N G
-//  -------------
-//
-// This file is not part of the Qt API.  It exists for the convenience
-// of other Qt classes.  This header file may change from version to
-// version without notice, or even be removed.
-//
-// We mean it.
-//
-
-#include <Qt3DRender/qt3drender_global.h>
-
-QT_BEGIN_NAMESPACE
-
-
-namespace Qt3DRender {
-
-namespace Render {
-
-class GraphicsContext;
-class Renderer;
-class Shader;
-
-class GLCommand
-{
-public:
-    virtual void execute(Renderer *renderer, GraphicsContext *ctx) = 0;
-};
-
-class Q_AUTOTEST_EXPORT LoadShaderCommand : public GLCommand
-{
-public:
-    explicit LoadShaderCommand(Shader *shader);
-    Shader *shader() const { return m_shader; }
-    void execute(Renderer *renderer, GraphicsContext *ctx) Q_DECL_OVERRIDE;
-
-private:
-    Shader *m_shader = nullptr;
-};
-} // Render
-
-} // Qt3DRender
-
-QT_END_NAMESPACE
-
-#endif // QT3DRENDER_RENDER_GLCOMMANDS_P_H
diff --git a/src/render/renderers/opengl/renderer/renderer.cpp b/src/render/renderers/opengl/renderer/renderer.cpp
index 9d9a448f8..733d7d1db 100644
--- a/src/render/renderers/opengl/renderer/renderer.cpp
+++ b/src/render/renderers/opengl/renderer/renderer.cpp
@@ -89,8 +89,6 @@
 #include <Qt3DRender/private/buffercapture_p.h>
 #include <Qt3DRender/private/offscreensurfacehelper_p.h>
 #include <Qt3DRender/private/renderviewbuilder_p.h>
-#include <Qt3DRender/private/commandthread_p.h>
-#include <Qt3DRender/private/glcommands_p.h>
 #include <Qt3DRender/private/setfence_p.h>
 #include <Qt3DRender/private/subtreeenabler_p.h>
 
@@ -166,7 +164,6 @@ Renderer::Renderer(QRenderAspect::RenderType type)
     , m_submissionContext(nullptr)
     , m_renderQueue(new RenderQueue())
     , m_renderThread(type == QRenderAspect::Threaded ? new RenderThread(this) : nullptr)
-    , m_commandThread(new CommandThread(this))
     , m_vsyncFrameAdvanceService(new VSyncFrameAdvanceService(m_renderThread != nullptr))
     , m_waitForInitializationToBeCompleted(0)
     , m_hasBeenInitializedMutex()
@@ -334,18 +331,11 @@ QOpenGLContext *Renderer::shareContext() const
                              : nullptr);
 }
 
-// Executed in the command thread
+// Executed in the reloadDirtyShader job
 void Renderer::loadShader(Shader *shader, HShader shaderHandle)
 {
-#ifdef SHADER_LOADING_IN_COMMAND_THREAD
-    Q_UNUSED(shaderHandle);
-    Profiling::GLTimeRecorder recorder(Profiling::ShaderUpload);
-    LoadShaderCommand cmd(shader);
-    m_commandThread->executeCommand(&cmd);
-#else
     Q_UNUSED(shader);
     m_dirtyShaders.push_back(shaderHandle);
-#endif
 }
 
 void Renderer::setOpenGLContext(QOpenGLContext *context)
@@ -406,7 +396,6 @@ void Renderer::initialize()
 
         // Set shader cache on submission context and command thread
         m_submissionContext->setShaderCache(m_shaderCache);
-        m_commandThread->setShaderCache(m_shaderCache);
 
         // Note: we don't have a surface at this point
         // The context will be made current later on (at render time)
@@ -419,13 +408,6 @@ void Renderer::initialize()
         // (MS Windows), an offscreen surface is just a hidden QWindow.
         m_format = ctx->format();
         QMetaObject::invokeMethod(m_offscreenHelper, "createOffscreenSurface");
-
-        // Initialize command thread (uses the offscreen surface to make its own ctx current)
-        m_commandThread->initialize(ctx, m_offscreenHelper);
-        // Note: the offscreen surface is also used at shutdown time to release resources
-        // of the submission gl context (when the window is already gone).
-        // By that time (in releaseGraphicResources), the commandThread has been destroyed
-        // and the offscreenSurface can be reused
     }
 
     // Awake setScenegraphRoot in case it was waiting
@@ -457,8 +439,6 @@ void Renderer::shutdown()
     m_renderQueue->reset();
     lockRenderQueue.unlock();
 
-    m_commandThread->shutdown();
-
     if (!m_renderThread) {
         releaseGraphicsResources();
     } else {
diff --git a/src/render/renderers/opengl/renderer/renderer.pri b/src/render/renderers/opengl/renderer/renderer.pri
index 34f6064bd..849bac702 100644
--- a/src/render/renderers/opengl/renderer/renderer.pri
+++ b/src/render/renderers/opengl/renderer/renderer.pri
@@ -1,8 +1,6 @@
 INCLUDEPATH += $$PWD
 
 SOURCES += \
-    $$PWD/commandthread.cpp \
-    $$PWD/glcommands.cpp \
     $$PWD/openglvertexarrayobject.cpp \
     $$PWD/rendercommand.cpp \
     $$PWD/renderer.cpp \
@@ -12,8 +10,6 @@ SOURCES += \
     $$PWD/shaderparameterpack.cpp
 
 HEADERS += \
-    $$PWD/commandthread_p.h \
-    $$PWD/glcommands_p.h \
     $$PWD/openglvertexarrayobject_p.h \
     $$PWD/renderercache_p.h \
     $$PWD/rendercommand_p.h \
diff --git a/src/render/renderers/opengl/renderer/renderer_p.h b/src/render/renderers/opengl/renderer/renderer_p.h
index 72739caaf..41a071290 100644
--- a/src/render/renderers/opengl/renderer/renderer_p.h
+++ b/src/render/renderers/opengl/renderer/renderer_p.h
@@ -144,7 +144,6 @@ class RenderView;
 class Effect;
 class RenderPass;
 class RenderThread;
-class CommandThread;
 class RenderStateSet;
 class VSyncFrameAdvanceService;
 class PickEventFilter;
@@ -320,7 +319,6 @@ private:
 
     RenderQueue *m_renderQueue;
     QScopedPointer<RenderThread> m_renderThread;
-    QScopedPointer<CommandThread> m_commandThread;
     QScopedPointer<VSyncFrameAdvanceService> m_vsyncFrameAdvanceService;
 
     QSemaphore m_submitRenderViewsSemaphore;