From cbe4f6720b965b88bdc5b9e47c76d40215ed7e24 Mon Sep 17 00:00:00 2001
From: Paul Lemire <paul.lemire@kdab.com>
Date: Mon, 6 Jul 2020 13:59:31 +0200
Subject: Move and adapt RendererCache to share amongst renderer plugins

Change-Id: I4e6e48abdd79b59fe98a916c7f2da6ba92e8ff82
Reviewed-by: Mike Krus <mike.krus@kdab.com>
---
 .../renderers/opengl/renderer/renderercache_p.h    | 123 ---------------------
 1 file changed, 123 deletions(-)
 delete mode 100644 src/plugins/renderers/opengl/renderer/renderercache_p.h

(limited to 'src/plugins/renderers/opengl/renderer/renderercache_p.h')

diff --git a/src/plugins/renderers/opengl/renderer/renderercache_p.h b/src/plugins/renderers/opengl/renderer/renderercache_p.h
deleted file mode 100644
index 57af93b6a..000000000
--- a/src/plugins/renderers/opengl/renderer/renderercache_p.h
+++ /dev/null
@@ -1,123 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2017 The Qt Company Ltd.
-** 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_OPENGL_RENDERERCACHE_P_H
-#define QT3DRENDER_RENDER_OPENGL_RENDERERCACHE_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/QFrameGraphNode>
-
-#include <Qt3DRender/private/entity_p.h>
-#include <Qt3DRender/private/renderviewjobutils_p.h>
-#include <Qt3DRender/private/lightsource_p.h>
-#include <rendercommand_p.h>
-
-QT_BEGIN_NAMESPACE
-
-namespace Qt3DRender {
-
-namespace Render {
-
-namespace OpenGL {
-
-struct RendererCache
-{
-    struct LeafNodeData
-    {
-        Matrix4x4 viewProjectionMatrix;
-        // Set by the FilterLayerJob
-        // Contains all Entities that satisfy the layer filtering for the RV
-        std::vector<Entity *> filterEntitiesByLayer;
-
-        // Set by the MaterialParameterGatherJob
-        MaterialParameterGathererData materialParameterGatherer;
-
-        // Set by the SyncRenderViewPreCommandUpdateJob
-        // Contains caches of different filtering stages that can
-        // be cached across frame
-        std::vector<Entity *> layeredFilteredRenderables; // Changes rarely
-        std::vector<Entity *> filteredAndCulledRenderables; // Changes if camera is modified
-        std::vector<LightSource> layeredFilteredLightSources;
-
-        // Cache of RenderCommands
-        EntityRenderCommandDataViewPtr filteredRenderCommandDataViews;
-    };
-
-    // Variabled below are shared amongst all RV
-
-    // Set by CachingRenderableEntityFilterJob
-    std::vector<Entity *> renderableEntities;
-
-    // Set by CachingComputableEntityFilterJob
-    std::vector<Entity *> computeEntities;
-
-    // Set by CachingLightGathererJob
-    std::vector<LightSource> gatheredLights;
-
-    EnvironmentLight* environmentLight;
-
-    // Per RV cache
-    // Leaves inserted by SyncRenderViewPostInitialization
-    QHash<FrameGraphNode *, LeafNodeData> leafNodeCache;
-
-    QMutex *mutex() { return &m_mutex; }
-
-private:
-    QMutex m_mutex;
-};
-
-} // namespace OpenGL
-
-} // namespace Render
-
-} // namespace Qt3DRender
-
-QT_END_NAMESPACE
-
-#endif // QT3DRENDER_RENDER_OPENGL_RENDERERCACHE_P_H
-- 
cgit v1.2.3