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>

1 files changed, 16 insertions, 9 deletions

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;
 };