Add dedicated managers holder for GL Resources

That way NodeManagers only refers to managers holding nodes (so can be used by
aspect and all renderer) and GLResourceManagers refers to renderer specific
resources.

Note: the Scene2D resourceaccessor was making direct access to GL resource
through the managers, this has been commented and will be restored later

Change-Id: Ic32784f60eac35aab8c066d1769f078639fa25b8

1 files changed, 0 insertions, 22 deletions

diff --git a/src/render/backend/nodemanagers.cpp b/src/render/backend/nodemanagers.cpp
index 5e452f886..8603d4fb9 100644
--- a/src/render/backend/nodemanagers.cpp
+++ b/src/render/backend/nodemanagers.cpp
@@ -42,14 +42,12 @@
 #include <Qt3DRender/private/managers_p.h>
 #include <Qt3DRender/private/scenemanager_p.h>
 #include <Qt3DRender/private/buffermanager_p.h>
-#include <Qt3DRender/private/gltexturemanager_p.h>
 #include <Qt3DRender/private/geometryrenderermanager_p.h>
 #include <Qt3DRender/private/techniquemanager_p.h>
 #include <Qt3DRender/private/armature_p.h>
 #include <Qt3DRender/private/skeleton_p.h>
 #include <private/resourceaccessor_p.h>
 
-#include <QOpenGLVertexArrayObject>
 
 QT_BEGIN_NAMESPACE
 
@@ -62,7 +60,6 @@ NodeManagers::NodeManagers()
     , m_renderNodesManager(new EntityManager())
     , m_materialManager(new MaterialManager())
     , m_worldMatrixManager(new MatrixManager())
-    , m_vaoManager(new VAOManager())
     , m_shaderManager(new ShaderManager())
     , m_shaderBuilderManager(new ShaderBuilderManager())
     , m_techniqueManager(new TechniqueManager())
@@ -70,7 +67,6 @@ NodeManagers::NodeManagers()
     , m_renderPassManager(new RenderPassManager())
     , m_textureManager(new TextureManager())
     , m_textureImageManager(new TextureImageManager())
-    , m_glTextureManager(new GLTextureManager())
     , m_layerManager(new LayerManager())
     , m_levelOfDetailManager(new LevelOfDetailManager())
     , m_filterKeyManager(new FilterKeyManager())
@@ -81,8 +77,6 @@ NodeManagers::NodeManagers()
     , m_attachmentManager(new AttachmentManager())
     , m_parameterManager(new ParameterManager())
     , m_shaderDataManager(new ShaderDataManager())
-    , m_glBufferManager(new GLBufferManager())
-    , m_glFenceManager(new GLFenceManager())
     , m_bufferManager(new BufferManager())
     , m_attributeManager(new AttributeManager())
     , m_geometryManager(new GeometryManager())
@@ -107,13 +101,11 @@ NodeManagers::~NodeManagers()
     delete m_cameraManager;
     delete m_materialManager;
     delete m_worldMatrixManager;
-    delete m_vaoManager;
     delete m_shaderManager;
     delete m_shaderBuilderManager;
     delete m_techniqueManager;
     delete m_effectManager;
     delete m_renderPassManager;
-    delete m_glTextureManager;
     delete m_textureManager;
     delete m_layerManager;
     delete m_levelOfDetailManager;
@@ -124,8 +116,6 @@ NodeManagers::~NodeManagers()
     delete m_attachmentManager;
     delete m_parameterManager;
     delete m_shaderDataManager;
-    delete m_glBufferManager;
-    delete m_glFenceManager;
     delete m_textureImageManager;
     delete m_bufferManager;
     delete m_attributeManager;
@@ -179,12 +169,6 @@ MatrixManager *NodeManagers::manager<Matrix4x4>() const noexcept
 }
 
 template<>
-VAOManager *NodeManagers::manager<OpenGLVertexArrayObject>() const noexcept
-{
-    return m_vaoManager;
-}
-
-template<>
 ShaderManager *NodeManagers::manager<Shader>() const noexcept
 {
     return m_shaderManager;
@@ -281,12 +265,6 @@ ShaderDataManager *NodeManagers::manager<ShaderData>() const noexcept
 }
 
 template<>
-GLBufferManager *NodeManagers::manager<GLBuffer>() const noexcept
-{
-    return m_glBufferManager;
-}
-
-template<>
 TextureImageManager *NodeManagers::manager<TextureImage>() const noexcept
 {
     return m_textureImageManager;