Merge remote-tracking branch 'origin/5.15' into dev

Change-Id: Id669d5c1aab29965eac0dabd1cb497e908dac23e

1 files changed, 3 insertions, 8 deletions

diff --git a/src/render/backend/abstractrenderer_p.h b/src/render/backend/abstractrenderer_p.h
index 020aa6c9f..0dd24dcd8 100644
--- a/src/render/backend/abstractrenderer_p.h
+++ b/src/render/backend/abstractrenderer_p.h
@@ -54,6 +54,7 @@
 #include <QtCore/qmutex.h>
 #include <Qt3DRender/private/qt3drender_global_p.h>
 #include <Qt3DRender/private/handle_types_p.h>
+#include <Qt3DRender/qrenderapi.h>
 #include <Qt3DCore/qaspectjob.h>
 #include <Qt3DCore/qnodeid.h>
 #include <QtGui/qsurfaceformat.h>
@@ -80,6 +81,7 @@ class QAspectManager;
 namespace Qt3DRender {
 
 class QRenderAspect;
+struct GraphicsApiFilterData;
 
 namespace Render {
 
@@ -91,18 +93,11 @@ class BackendNode;
 class OffscreenSurfaceHelper;
 class Shader;
 class RenderBackendResourceAccessor;
-
 class Q_3DRENDERSHARED_PRIVATE_EXPORT AbstractRenderer
 {
 public:
     virtual ~AbstractRenderer() {}
 
-    enum API {
-        OpenGL,
-        Vulkan,
-        DirectX
-    };
-
     // Changes made to backend nodes are reported to the Renderer
     enum BackendNodeDirtyFlag {
         TransformDirty      = 1 << 0,
@@ -190,7 +185,7 @@ public:
     virtual void setOffscreenSurfaceHelper(OffscreenSurfaceHelper *helper) = 0;
     virtual QSurfaceFormat format() = 0;
     virtual QOpenGLContext *shareContext() const = 0;
-
+    virtual const GraphicsApiFilterData *contextInfo() const = 0;
 
     // These commands are executed in a dedicated command thread
     // More will be added later