Enable building Qt Quick module with QT_NO_OPENGL defined

Currently the Qt Quick module depends on either the OpenGL or OpenGLES
headers being available at build time.  Since we are adding support for
adaptations that do not depend on OpenGL, it should be possible to build
Qt Quick in environments that do not have OpenGL development headers.

This does present many challenges though because in some cases GL types,
and classes that require OpenGL are part of the public APIs.  However
since these classes were never available when QT_NO_OPENGL was defined,
it should be possible to redefine the function signatures under this
scenario, since it's not possible to break binary compatibility if there
never were any binaries to break compatibility with.

One of the bigger changes that was necessary to facilitate this change
is creating interfaces out of QSGContext and QSGRenderContext.  Here the
default behavior was usage of OpenGL directly, even though subclasses
could override all OpenGL usage. Making them interfaces should bring
QSGContext and QSGRenderContext more in line with the other classes
present in the adaptation layer.

Change-Id: Iaa54dc0f6cfd18d2da1d059548abf509bd71f200
Reviewed-by: Laszlo Agocs <laszlo.agocs@theqtcompany.com>

11 files changed, 118 insertions, 60 deletions

diff --git a/src/quick/scenegraph/coreapi/qsgabstractrenderer.h b/src/quick/scenegraph/coreapi/qsgabstractrenderer.h
index e02fb819fe..50b9879659 100644
--- a/src/quick/scenegraph/coreapi/qsgabstractrenderer.h
+++ b/src/quick/scenegraph/coreapi/qsgabstractrenderer.h
@@ -42,6 +42,10 @@
 
 #include <QtQuick/qsgnode.h>
 
+#ifndef GLuint
+#define GLuint uint
+#endif
+
 QT_BEGIN_NAMESPACE
 
 class QSGAbstractRendererPrivate;
diff --git a/src/quick/scenegraph/coreapi/qsgbatchrenderer.cpp b/src/quick/scenegraph/coreapi/qsgbatchrenderer.cpp
index bb5476c3e2..8f08020374 100644
--- a/src/quick/scenegraph/coreapi/qsgbatchrenderer.cpp
+++ b/src/quick/scenegraph/coreapi/qsgbatchrenderer.cpp
@@ -154,8 +154,8 @@ ShaderManager::Shader *ShaderManager::prepareMaterial(QSGMaterial *material)
             p->bindAttributeLocation(attr[i], i);
     }
     p->bindAttributeLocation("_qt_order", i);
-    context->compile(s, material, qsgShaderRewriter_insertZAttributes(s->vertexShader(), profile), 0);
-    context->initialize(s);
+    context->compileShader(s, material, qsgShaderRewriter_insertZAttributes(s->vertexShader(), profile), 0);
+    context->initializeShader(s);
     if (!p->isLinked())
         return 0;
 
@@ -188,8 +188,8 @@ ShaderManager::Shader *ShaderManager::prepareMaterialNoRewrite(QSGMaterial *mate
     Q_QUICK_SG_PROFILE_START(QQuickProfiler::SceneGraphContextFrame);
 
     QSGMaterialShader *s = static_cast<QSGMaterialShader *>(material->createShader());
-    context->compile(s, material);
-    context->initialize(s);
+    context->compileShader(s, material);
+    context->initializeShader(s);
 
     shader = new Shader();
     shader->program = s;
@@ -751,8 +751,9 @@ static int qsg_countNodesInBatches(const QDataBuffer<Batch *> &batches)
     return sum;
 }
 
-Renderer::Renderer(QSGRenderContext *ctx)
+Renderer::Renderer(QSGDefaultRenderContext *ctx)
     : QSGRenderer(ctx)
+    , m_context(ctx)
     , m_opaqueRenderList(64)
     , m_alphaRenderList(64)
     , m_nextRenderOrder(0)
@@ -812,7 +813,7 @@ Renderer::Renderer(QSGRenderContext *ctx)
 
     // If rendering with an OpenGL Core profile context, we need to create a VAO
     // to hold our vertex specification state.
-    if (context()->openglContext()->format().profile() == QSurfaceFormat::CoreProfile) {
+    if (m_context->openglContext()->format().profile() == QSurfaceFormat::CoreProfile) {
         m_vao = new QOpenGLVertexArrayObject(this);
         m_vao->create();
     }
@@ -1106,7 +1107,7 @@ void Renderer::nodeWasRemoved(Node *node)
 
             if (m_renderNodeElements.isEmpty()) {
                 static bool useDepth = qEnvironmentVariableIsEmpty("QSG_NO_DEPTH_BUFFER");
-                m_useDepthBuffer = useDepth && context()->openglContext()->format().depthBufferSize() > 0;
+                m_useDepthBuffer = useDepth && m_context->openglContext()->format().depthBufferSize() > 0;
             }
         }
     }
diff --git a/src/quick/scenegraph/coreapi/qsgbatchrenderer_p.h b/src/quick/scenegraph/coreapi/qsgbatchrenderer_p.h
index afc564710e..1c62b69769 100644
--- a/src/quick/scenegraph/coreapi/qsgbatchrenderer_p.h
+++ b/src/quick/scenegraph/coreapi/qsgbatchrenderer_p.h
@@ -54,6 +54,7 @@
 //
 
 #include <private/qsgrenderer_p.h>
+#include <private/qsgdefaultrendercontext_p.h>
 #include <private/qsgnodeupdater_p.h>
 #include <private/qdatabuffer_p.h>
 
@@ -61,6 +62,8 @@
 
 #include <QtCore/QBitArray>
 
+#include <QtGui/QOpenGLFunctions>
+
 QT_BEGIN_NAMESPACE
 
 class QOpenGLVertexArrayObject;
@@ -534,7 +537,7 @@ public:
         float lastOpacity;
     };
 
-    ShaderManager(QSGRenderContext *ctx) : blitProgram(0), visualizeProgram(0), context(ctx) { }
+    ShaderManager(QSGDefaultRenderContext *ctx) : blitProgram(0), visualizeProgram(0), context(ctx) { }
     ~ShaderManager() {
         qDeleteAll(rewrittenShaders);
         qDeleteAll(stockShaders);
@@ -552,13 +555,13 @@ public:
 
     QOpenGLShaderProgram *blitProgram;
     QOpenGLShaderProgram *visualizeProgram;
-    QSGRenderContext *context;
+    QSGDefaultRenderContext *context;
 };
 
 class Q_QUICK_PRIVATE_EXPORT Renderer : public QSGRenderer, public QOpenGLFunctions
 {
 public:
-    Renderer(QSGRenderContext *);
+    Renderer(QSGDefaultRenderContext *);
     ~Renderer();
 
     enum VisualizeMode {
@@ -642,6 +645,7 @@ private:
     void visualizeDrawGeometry(const QSGGeometry *g);
     void setCustomRenderMode(const QByteArray &mode) Q_DECL_OVERRIDE;
 
+    QSGDefaultRenderContext *m_context;
     QSet<Node *> m_taggedRoots;
     QDataBuffer<Element *> m_opaqueRenderList;
     QDataBuffer<Element *> m_alphaRenderList;
diff --git a/src/quick/scenegraph/coreapi/qsggeometry.cpp b/src/quick/scenegraph/coreapi/qsggeometry.cpp
index d1e1bc0176..64635edc4f 100644
--- a/src/quick/scenegraph/coreapi/qsggeometry.cpp
+++ b/src/quick/scenegraph/coreapi/qsggeometry.cpp
@@ -39,10 +39,11 @@
 
 #include "qsggeometry.h"
 #include "qsggeometry_p.h"
-
-#include <qopenglcontext.h>
-#include <qopenglfunctions.h>
-#include <private/qopenglextensions_p.h>
+#ifndef QT_NO_OPENGL
+# include <qopenglcontext.h>
+# include <qopenglfunctions.h>
+# include <private/qopenglextensions_p.h>
+#endif
 
 #ifdef Q_OS_QNX
 #include <malloc.h>
@@ -77,7 +78,7 @@ QSGGeometry::Attribute QSGGeometry::Attribute::createWithSemantic(int pos, int t
 const QSGGeometry::AttributeSet &QSGGeometry::defaultAttributes_Point2D()
 {
     static Attribute data[] = {
-        Attribute::createWithSemantic(0, 2, GL_FLOAT, Attribute::POSITION)
+        Attribute::createWithSemantic(0, 2, TypeFloat, Attribute::POSITION)
     };
     static AttributeSet attrs = { 1, sizeof(float) * 2, data };
     return attrs;
@@ -90,8 +91,8 @@ const QSGGeometry::AttributeSet &QSGGeometry::defaultAttributes_Point2D()
 const QSGGeometry::AttributeSet &QSGGeometry::defaultAttributes_TexturedPoint2D()
 {
     static Attribute data[] = {
-        Attribute::createWithSemantic(0, 2, GL_FLOAT, Attribute::POSITION),
-        Attribute::createWithSemantic(1, 2, GL_FLOAT, Attribute::TEXCOORD)
+        Attribute::createWithSemantic(0, 2, TypeFloat, Attribute::POSITION),
+        Attribute::createWithSemantic(1, 2, TypeFloat, Attribute::TEXCOORD)
     };
     static AttributeSet attrs = { 2, sizeof(float) * 4, data };
     return attrs;
@@ -104,8 +105,8 @@ const QSGGeometry::AttributeSet &QSGGeometry::defaultAttributes_TexturedPoint2D(
 const QSGGeometry::AttributeSet &QSGGeometry::defaultAttributes_ColoredPoint2D()
 {
     static Attribute data[] = {
-        Attribute::createWithSemantic(0, 2, GL_FLOAT, Attribute::POSITION),
-        Attribute::createWithSemantic(1, 4, GL_UNSIGNED_BYTE, Attribute::COLOR)
+        Attribute::createWithSemantic(0, 2, TypeFloat, Attribute::POSITION),
+        Attribute::createWithSemantic(1, 4, TypeUnsignedByte, Attribute::COLOR)
     };
     static AttributeSet attrs = { 2, 2 * sizeof(float) + 4 * sizeof(char), data };
     return attrs;
@@ -405,7 +406,7 @@ QSGGeometry::QSGGeometry(const QSGGeometry::AttributeSet &attributes,
                          int vertexCount,
                          int indexCount,
                          int indexType)
-    : m_drawing_mode(GL_TRIANGLE_STRIP)
+    : m_drawing_mode(DrawTriangleStrip)
     , m_vertex_count(0)
     , m_index_count(0)
     , m_index_type(indexType)
@@ -421,21 +422,20 @@ QSGGeometry::QSGGeometry(const QSGGeometry::AttributeSet &attributes,
     Q_UNUSED(m_reserved_bits);
     Q_ASSERT(m_attributes.count > 0);
     Q_ASSERT(m_attributes.stride > 0);
-
+#ifndef QT_NO_OPENGL
     Q_ASSERT_X(indexType != GL_UNSIGNED_INT
                || static_cast<QOpenGLExtensions *>(QOpenGLContext::currentContext()->functions())
                   ->hasOpenGLExtension(QOpenGLExtensions::ElementIndexUint),
                "QSGGeometry::QSGGeometry",
                "GL_UNSIGNED_INT is not supported, geometry will not render"
                );
-
-    if (indexType != GL_UNSIGNED_BYTE
-        && indexType != GL_UNSIGNED_SHORT
-        && indexType != GL_UNSIGNED_INT) {
+#endif
+    if (indexType != TypeUnsignedByte
+        && indexType != TypeUnsignedShort
+        && indexType != TypeUnsignedInt) {
         qFatal("QSGGeometry: Unsupported index type, %x.\n", indexType);
     }
 
-
     // Because allocate reads m_vertex_count, m_index_count and m_owns_data, these
     // need to be set before calling allocate...
     allocate(vertexCount, indexCount);
@@ -531,11 +531,17 @@ const void *QSGGeometry::indexData() const
 
     The default value is \c GL_TRIANGLE_STRIP.
  */
+#ifndef QT_NO_OPENGL
 void QSGGeometry::setDrawingMode(GLenum mode)
 {
     m_drawing_mode = mode;
 }
-
+#else
+void QSGGeometry::setDrawingMode(int mode)
+{
+    m_drawing_mode = mode;
+}
+#endif
 /*!
     Gets the current line or point width or to be used for this geometry. This property
     only applies to line width when the drawingMode is \c GL_LINES, \c GL_LINE_STRIP, or
@@ -612,8 +618,8 @@ void QSGGeometry::allocate(int vertexCount, int indexCount)
         m_index_data_offset = -1;
         m_owns_data = false;
     } else {
-        Q_ASSERT(m_index_type == GL_UNSIGNED_INT || m_index_type == GL_UNSIGNED_SHORT);
-        int indexByteSize = indexCount * (m_index_type == GL_UNSIGNED_SHORT ? sizeof(quint16) : sizeof(quint32));
+        Q_ASSERT(m_index_type == TypeUnsignedInt || m_index_type == TypeUnsignedShort);
+        int indexByteSize = indexCount * (m_index_type == TypeUnsignedShort ? sizeof(quint16) : sizeof(quint32));
         m_data = (void *) malloc(vertexByteSize + indexByteSize);
         m_index_data_offset = vertexByteSize;
         m_owns_data = true;
diff --git a/src/quick/scenegraph/coreapi/qsggeometry.h b/src/quick/scenegraph/coreapi/qsggeometry.h
index 5d1ed7b263..8d0cd03968 100644
--- a/src/quick/scenegraph/coreapi/qsggeometry.h
+++ b/src/quick/scenegraph/coreapi/qsggeometry.h
@@ -144,9 +144,14 @@ public:
                 int indexType = TypeUnsignedShort);
     virtual ~QSGGeometry();
 
+#ifndef QT_NO_OPENGL
     // ### Qt 6: GL types to be removed from the public API
     void setDrawingMode(GLenum mode);
     inline GLenum drawingMode() const { return m_drawing_mode; }
+#else
+    void setDrawingMode(int mode);
+    inline int drawingMode() const { return m_drawing_mode; }
+#endif
 
     void allocate(int vertexCount, int indexCount = 0);
 
diff --git a/src/quick/scenegraph/coreapi/qsgmaterial.cpp b/src/quick/scenegraph/coreapi/qsgmaterial.cpp
index ceb53d0d14..42a4c4abd3 100644
--- a/src/quick/scenegraph/coreapi/qsgmaterial.cpp
+++ b/src/quick/scenegraph/coreapi/qsgmaterial.cpp
@@ -40,7 +40,13 @@
 #include "qsgmaterial.h"
 #include "qsgrenderer_p.h"
 #include "qsgmaterialshader_p.h"
-#include <private/qsgshadersourcebuilder_p.h>
+#ifndef QT_NO_OPENGL
+# include <private/qsgshadersourcebuilder_p.h>
+# include <private/qsgdefaultcontext_p.h>
+# include <private/qsgdefaultrendercontext_p.h>
+# include <QtGui/QOpenGLFunctions>
+# include <QtGui/QOpenGLContext>
+#endif
 
 QT_BEGIN_NAMESPACE
 
@@ -58,7 +64,7 @@ void qsg_set_material_failure()
     qsg_material_failure = true;
 }
 #endif
-
+#ifndef QT_NO_OPENGL
 const char *QSGMaterialShaderPrivate::loadShaderSource(QOpenGLShader::ShaderType type) const
 {
     QStringList files = m_sourceFiles[type];
@@ -68,6 +74,7 @@ const char *QSGMaterialShaderPrivate::loadShaderSource(QOpenGLShader::ShaderType
     m_sources[type] = builder.source();
     return m_sources[type].constData();
 }
+#endif
 
 #ifndef QT_NO_DEBUG
 static const bool qsg_leak_check = !qEnvironmentVariableIsEmpty("QML_LEAK_CHECK");
@@ -220,7 +227,7 @@ QSGMaterialShader::~QSGMaterialShader()
     defines the attribute register position in the vertex shader.
  */
 
-
+#ifndef QT_NO_OPENGL
 /*!
     \fn const char *QSGMaterialShader::vertexShader() const
 
@@ -256,7 +263,7 @@ const char *QSGMaterialShader::fragmentShader() const
 
     Returns the shader program used by this QSGMaterialShader.
  */
-
+#endif
 
 /*!
     \fn void QSGMaterialShader::initialize()
@@ -313,6 +320,7 @@ void QSGMaterialShader::updateState(const RenderState & /* state */, QSGMaterial
 {
 }
 
+#ifndef QT_NO_OPENGL
 /*!
     Sets the GLSL source file for the shader stage \a type to \a sourceFile. The
     default implementation of the vertexShader() and fragmentShader() functions
@@ -388,7 +396,7 @@ void QSGMaterialShader::compile()
     }
 }
 
-
+#endif
 
 /*!
     \class QSGMaterialShader::RenderState
@@ -542,7 +550,7 @@ QRect QSGMaterialShader::RenderState::deviceRect() const
     return static_cast<const QSGRenderer *>(m_data)->deviceRect();
 }
 
-
+#ifndef QT_NO_OPENGL
 
 /*!
     Returns the QOpenGLContext that is being used for rendering
@@ -550,9 +558,15 @@ QRect QSGMaterialShader::RenderState::deviceRect() const
 
 QOpenGLContext *QSGMaterialShader::RenderState::context() const
 {
-    return static_cast<const QSGRenderer *>(m_data)->context()->openglContext();
+    // Only the QSGDefaultRenderContext will have an OpenGL Context to query
+    auto openGLRenderContext = static_cast<const QSGDefaultRenderContext *>(static_cast<const QSGRenderer *>(m_data)->context());
+    if (openGLRenderContext != nullptr)
+        return openGLRenderContext->openglContext();
+    else
+        return nullptr;
 }
 
+#endif
 
 #ifndef QT_NO_DEBUG
 static int qt_material_count = 0;
diff --git a/src/quick/scenegraph/coreapi/qsgmaterial.h b/src/quick/scenegraph/coreapi/qsgmaterial.h
index 0a6a340092..13d15a089e 100644
--- a/src/quick/scenegraph/coreapi/qsgmaterial.h
+++ b/src/quick/scenegraph/coreapi/qsgmaterial.h
@@ -41,7 +41,11 @@
 #define QSGMATERIAL_H
 
 #include <QtQuick/qtquickglobal.h>
-#include <QtGui/qopenglshaderprogram.h>
+#ifndef QT_NO_OPENGL
+# include <QtGui/qopenglshaderprogram.h>
+#endif
+#include <QtGui/QMatrix4x4>
+#include <QtCore/QRect>
 
 QT_BEGIN_NAMESPACE
 
@@ -77,9 +81,9 @@ public:
         QRect deviceRect() const;
         float determinant() const;
         float devicePixelRatio() const;
-
+#ifndef QT_NO_OPENGL
         QOpenGLContext *context() const;
-
+#endif
     private:
         friend class QSGRenderer;
         DirtyStates m_dirty;
@@ -94,27 +98,30 @@ public:
     // First time a material is used, oldMaterial is null.
     virtual void updateState(const RenderState &state, QSGMaterial *newMaterial, QSGMaterial *oldMaterial);
     virtual char const *const *attributeNames() const = 0; // Array must end with null.
-
+#ifndef QT_NO_OPENGL
     inline QOpenGLShaderProgram *program() { return &m_program; }
-
+#endif
 protected:
     Q_DECLARE_PRIVATE(QSGMaterialShader)
     QSGMaterialShader(QSGMaterialShaderPrivate &dd);
 
-    friend class QSGRenderContext;
+    friend class QSGDefaultRenderContext;
     friend class QSGBatchRenderer::ShaderManager;
-
+#ifndef QT_NO_OPENGL
     void setShaderSourceFile(QOpenGLShader::ShaderType type, const QString &sourceFile);
     void setShaderSourceFiles(QOpenGLShader::ShaderType type, const QStringList &sourceFiles);
 
     virtual void compile();
+#endif
     virtual void initialize() { }
-
+#ifndef QT_NO_OPENGL
     virtual const char *vertexShader() const;
     virtual const char *fragmentShader() const;
-
+#endif
 private:
+#ifndef QT_NO_OPENGL
     QOpenGLShaderProgram m_program;
+#endif
     QScopedPointer<QSGMaterialShaderPrivate> d_ptr;
 };
 
diff --git a/src/quick/scenegraph/coreapi/qsgmaterialshader_p.h b/src/quick/scenegraph/coreapi/qsgmaterialshader_p.h
index 291c0cc57c..0dbce010db 100644
--- a/src/quick/scenegraph/coreapi/qsgmaterialshader_p.h
+++ b/src/quick/scenegraph/coreapi/qsgmaterialshader_p.h
@@ -59,10 +59,12 @@ QT_BEGIN_NAMESPACE
 class Q_QUICK_PRIVATE_EXPORT QSGMaterialShaderPrivate
 {
 public:
+#ifndef QT_NO_OPENGL
     const char *loadShaderSource(QOpenGLShader::ShaderType type) const;
 
     QHash<QOpenGLShader::ShaderType, QStringList> m_sourceFiles;
     mutable QHash<QOpenGLShader::ShaderType, QByteArray> m_sources;
+#endif
 };
 
 #ifndef QT_NO_DEBUG
diff --git a/src/quick/scenegraph/coreapi/qsgnode.cpp b/src/quick/scenegraph/coreapi/qsgnode.cpp
index 223c555f3e..02c0414bc4 100644
--- a/src/quick/scenegraph/coreapi/qsgnode.cpp
+++ b/src/quick/scenegraph/coreapi/qsgnode.cpp
@@ -1472,15 +1472,15 @@ QDebug operator<<(QDebug d, const QSGGeometryNode *n)
     } else {
 
         switch (g->drawingMode()) {
-        case GL_TRIANGLE_STRIP: d << "strip"; break;
-        case GL_TRIANGLE_FAN: d << "fan"; break;
-        case GL_TRIANGLES: d << "triangles"; break;
+        case QSGGeometry::DrawTriangleStrip: d << "strip"; break;
+        case QSGGeometry::DrawTriangleFan: d << "fan"; break;
+        case QSGGeometry::DrawTriangles: d << "triangles"; break;
         default: break;
         }
 
         d << "#V:" << g->vertexCount() << "#I:" << g->indexCount();
 
-        if (g->attributeCount() > 0 && g->attributes()->type == GL_FLOAT) {
+        if (g->attributeCount() > 0 && g->attributes()->type == QSGGeometry::TypeFloat) {
             float x1 = 1e10, x2 = -1e10, y1=1e10, y2=-1e10;
             int stride = g->sizeOfVertex();
             for (int i = 0; i < g->vertexCount(); ++i) {
diff --git a/src/quick/scenegraph/coreapi/qsgrenderer.cpp b/src/quick/scenegraph/coreapi/qsgrenderer.cpp
index ace10661c0..220e6ab212 100644
--- a/src/quick/scenegraph/coreapi/qsgrenderer.cpp
+++ b/src/quick/scenegraph/coreapi/qsgrenderer.cpp
@@ -39,11 +39,15 @@
 
 #include "qsgrenderer_p.h"
 #include "qsgnodeupdater_p.h"
-
-#include <qopenglframebufferobject.h>
-
+#ifndef QT_NO_OPENGL
+# include <QtGui/QOpenGLFramebufferObject>
+# include <QtGui/QOpenGLContext>
+# include <QtGui/QOpenGLFunctions>
+#endif
 #include <private/qquickprofiler_p.h>
 
+#include <QtCore/QElapsedTimer>
+
 QT_BEGIN_NAMESPACE
 
 static const bool qsg_sanity_check = qEnvironmentVariableIntValue("QSG_SANITY_CHECK");
@@ -63,19 +67,25 @@ int qt_sg_envInt(const char *name, int defaultValue)
 
 void QSGBindable::clear(QSGAbstractRenderer::ClearMode mode) const
 {
+#ifndef QT_NO_OPENGL
     GLuint bits = 0;
     if (mode & QSGAbstractRenderer::ClearColorBuffer) bits |= GL_COLOR_BUFFER_BIT;
     if (mode & QSGAbstractRenderer::ClearDepthBuffer) bits |= GL_DEPTH_BUFFER_BIT;
     if (mode & QSGAbstractRenderer::ClearStencilBuffer) bits |= GL_STENCIL_BUFFER_BIT;
     QOpenGLContext::currentContext()->functions()->glClear(bits);
+#else
+    Q_UNUSED(mode)
+#endif
 }
 
 // Reactivate the color buffer after switching to the stencil.
 void QSGBindable::reactivate() const
 {
+#ifndef QT_NO_OPENGL
     QOpenGLContext::currentContext()->functions()->glColorMask(GL_TRUE, GL_TRUE, GL_TRUE, GL_TRUE);
+#endif
 }
-
+#ifndef QT_NO_OPENGL
 QSGBindableFboId::QSGBindableFboId(GLuint id)
     : m_id(id)
 {
@@ -86,7 +96,7 @@ void QSGBindableFboId::bind() const
 {
     QOpenGLContext::currentContext()->functions()->glBindFramebuffer(GL_FRAMEBUFFER, m_id);
 }
-
+#endif
 /*!
     \class QSGRenderer
     \brief The renderer class is the abstract baseclass use for rendering the
@@ -169,8 +179,9 @@ bool QSGRenderer::isMirrored() const
     return matrix(0, 0) * matrix(1, 1) - matrix(0, 1) * matrix(1, 0) > 0;
 }
 
-void QSGRenderer::renderScene(GLuint fboId)
+void QSGRenderer::renderScene(uint fboId)
 {
+#ifndef QT_NO_OPENGL
     if (fboId) {
         QSGBindableFboId bindable(fboId);
         renderScene(bindable);
@@ -182,7 +193,11 @@ void QSGRenderer::renderScene(GLuint fboId)
         } bindable;
         renderScene(bindable);
     }
+#else
+    Q_UNUSED(fboId)
+#endif
 }
+
 void QSGRenderer::renderScene(const QSGBindable &bindable)
 {
     if (!rootNode())
@@ -207,6 +222,7 @@ void QSGRenderer::renderScene(const QSGBindable &bindable)
         bindTime = frameTimer.nsecsElapsed();
     Q_QUICK_SG_PROFILE_RECORD(QQuickProfiler::SceneGraphRendererFrame);
 
+#ifndef QT_NO_OPENGL
     // Sanity check that attribute registers are disabled
     if (qsg_sanity_check) {
         GLint count = 0;
@@ -219,6 +235,7 @@ void QSGRenderer::renderScene(const QSGBindable &bindable)
             }
         }
     }
+#endif
 
     render();
     if (profileFrames)
diff --git a/src/quick/scenegraph/coreapi/qsgrenderer_p.h b/src/quick/scenegraph/coreapi/qsgrenderer_p.h
index 5c7a32c161..94b78a85b4 100644
--- a/src/quick/scenegraph/coreapi/qsgrenderer_p.h
+++ b/src/quick/scenegraph/coreapi/qsgrenderer_p.h
@@ -86,14 +86,12 @@ public:
 
     bool isMirrored() const;
     void renderScene(const QSGBindable &bindable);
-    virtual void renderScene(GLuint fboId = 0) Q_DECL_OVERRIDE;
+    virtual void renderScene(uint fboId = 0) Q_DECL_OVERRIDE;
     virtual void nodeChanged(QSGNode *node, QSGNode::DirtyState state) Q_DECL_OVERRIDE;
 
     QSGNodeUpdater *nodeUpdater() const;
     void setNodeUpdater(QSGNodeUpdater *updater);
-
     inline QSGMaterialShader::RenderState state(QSGMaterialShader::RenderState::DirtyStates dirty) const;
-
     virtual void setCustomRenderMode(const QByteArray &) { };
 
     void clearChangedFlag() { m_changed_emitted = false; }
@@ -135,7 +133,7 @@ public:
     virtual void clear(QSGAbstractRenderer::ClearMode mode) const;
     virtual void reactivate() const;
 };
-
+#ifndef QT_NO_OPENGL
 class QSGBindableFboId : public QSGBindable
 {
 public:
@@ -144,7 +142,7 @@ public:
 private:
     GLuint m_id;
 };
-
+#endif
 
 
 QSGMaterialShader::RenderState QSGRenderer::state(QSGMaterialShader::RenderState::DirtyStates dirty) const