2 files changed, 70 insertions, 3 deletions
diff --git a/src/quick/scenegraph/coreapi/qsgrendererinterface.cpp b/src/quick/scenegraph/coreapi/qsgrendererinterface.cpp
index 2920a187e2..ffde9d8930 100644
--- a/src/quick/scenegraph/coreapi/qsgrendererinterface.cpp
+++ b/src/quick/scenegraph/coreapi/qsgrendererinterface.cpp
@@ -63,7 +63,7 @@ QT_BEGIN_NAMESPACE
  */
 
 /*!
-    \enum QSGRenderNode::GraphicsApi
+    \enum QSGRendererInterface::GraphicsApi
     \value Unknown An unknown graphics API is in use
     \value Software The Qt Quick 2D Renderer is in use
     \value OpenGL OpenGL ES 2.0 or higher
@@ -73,7 +73,7 @@ QT_BEGIN_NAMESPACE
   */
 
 /*!
-    \enum QSGRenderNode::Resource
+    \enum QSGRendererInterface::Resource
     \value Device The graphics device
     \value CommandQueue The graphics command queue used by the scenergaph
     \value CommandList The command list or buffer used by the scenegraph
@@ -84,7 +84,7 @@ QSGRendererInterface::~QSGRendererInterface()
 }
 
 /*!
-    \fn QSGRenderNode::GraphicsApi QSGRenderNode::graphicsApi() const
+    \fn QSGRendererInterface::GraphicsApi QSGRendererInterface::graphicsApi() const
 
     Returns the graphics API that is in use by the Qt Quick scenegraph.
 
@@ -125,4 +125,45 @@ void *QSGRendererInterface::getResource(const char *resource) const
     return nullptr;
 }
 
+/*!
+    \fn QSGRendererInterface::ShaderType QSGRendererInterface::shaderType() const
+
+    \return the shading language supported by the Qt Quick backend the
+    application is using.
+
+    \note This function can be called on any thread. However, the renderer
+    interface's lifetime may be tied to the render thread and therefore calling
+    this function from other threads during the process of application shutdown
+    or QQuickWindow closing is likely to become invalid.
+
+    \sa QtQuick::GraphicsInfo
+ */
+
+/*!
+    \fn QSGRendererInterface::ShaderCompilationTypes QSGRendererInterface::shaderCompilationType() const
+
+    \return a bitmask of the shader compilation approaches supported by the Qt
+    Quick backend the application is using.
+
+    \note This function can be called on any thread. However, the renderer
+    interface's lifetime may be tied to the render thread and therefore calling
+    this function from other threads during the process of application shutdown
+    or QQuickWindow closing is likely to become invalid.
+
+    \sa QtQuick::GraphicsInfo
+ */
+
+/*!
+    \fn QSGRendererInterface::ShaderSourceTypes QSGRendererInterface::shaderSourceType() const
+
+    \return a bitmask of the supported ways of providing shader sources.
+
+    \note This function can be called on any thread. However, the renderer
+    interface's lifetime may be tied to the render thread and therefore calling
+    this function from other threads during the process of application shutdown
+    or QQuickWindow closing is likely to become invalid.
+
+    \sa QtQuick::GraphicsInfo
+ */
+
 QT_END_NAMESPACE
diff --git a/src/quick/scenegraph/coreapi/qsgrendererinterface.h b/src/quick/scenegraph/coreapi/qsgrendererinterface.h
index 75b79336fd..234a061d0e 100644
--- a/src/quick/scenegraph/coreapi/qsgrendererinterface.h
+++ b/src/quick/scenegraph/coreapi/qsgrendererinterface.h
@@ -60,14 +60,40 @@ public:
         CommandList
     };
 
+    enum ShaderType {
+        UnknownShadingLanguage,
+        GLSL,
+        HLSL
+    };
+
+    enum ShaderCompilationType {
+        RuntimeCompilation = 0x01,
+        OfflineCompilation = 0x02
+    };
+    Q_DECLARE_FLAGS(ShaderCompilationTypes, ShaderCompilationType)
+
+    enum ShaderSourceType {
+        ShaderSourceString = 0x01,
+        ShaderSourceFile = 0x02,
+        ShaderByteCode = 0x04
+    };
+    Q_DECLARE_FLAGS(ShaderSourceTypes, ShaderSourceType)
+
     virtual ~QSGRendererInterface();
 
     virtual GraphicsApi graphicsApi() const = 0;
 
     virtual void *getResource(Resource resource) const;
     virtual void *getResource(const char *resource) const;
+
+    virtual ShaderType shaderType() const = 0;
+    virtual ShaderCompilationTypes shaderCompilationType() const = 0;
+    virtual ShaderSourceTypes shaderSourceType() const = 0;
 };
 
+Q_DECLARE_OPERATORS_FOR_FLAGS(QSGRendererInterface::ShaderCompilationTypes)
+Q_DECLARE_OPERATORS_FOR_FLAGS(QSGRendererInterface::ShaderSourceTypes)
+
 QT_END_NAMESPACE
 
 #endif