diff options
| author | Tom Cooksey <thomas.cooksey@nokia.com> | 2009-05-14 08:51:46 (GMT) |
|---|---|---|
| committer | Tom Cooksey <thomas.cooksey@nokia.com> | 2009-05-14 08:51:46 (GMT) |
| commit | 521c5cc3910bffe566e0fb653041f159ecb5b6d5 (patch) | |
| tree | 70b703fa82b7e5f2e07105fb37ff5dc9353e6598 /src/opengl/qgl_p.h | |
| parent | f15352c51625688ec445c73125a2e25327377d49 (diff) | |
| download | Qt-521c5cc3910bffe566e0fb653041f159ecb5b6d5.zip Qt-521c5cc3910bffe566e0fb653041f159ecb5b6d5.tar.gz Qt-521c5cc3910bffe566e0fb653041f159ecb5b6d5.tar.bz2 | |
Make QtOpenGL compile on OpenGL ES 1.1 again
Diffstat (limited to 'src/opengl/qgl_p.h')
| -rw-r--r-- | src/opengl/qgl_p.h | 17 |
1 files changed, 15 insertions, 2 deletions
diff --git a/src/opengl/qgl_p.h b/src/opengl/qgl_p.h index a294af9..b421eee 100644 --- a/src/opengl/qgl_p.h +++ b/src/opengl/qgl_p.h @@ -60,7 +60,10 @@ #include "QtCore/qthreadstorage.h" #include "QtCore/qhash.h" #include "private/qwidget_p.h" + +#if !defined(QT_OPENGL_ES_1) && !defined(QT_OPENGL_ES_1_CL) #include "private/qpixmapdata_gl_p.h" +#endif #ifndef QT_OPENGL_ES_1_CL #define q_vertexType float @@ -293,7 +296,12 @@ class QGLWindowSurface; class QGLDrawable { public: QGLDrawable() : widget(0), buffer(0), fbo(0) - , wsurf(0), pixmapData(0) +#if defined(Q_WS_QWS) || (!defined(QT_OPENGL_ES_1) && !defined(QT_OPENGL_ES_1_CL)) + , wsurf(0) +#endif +#if !defined(QT_OPENGL_ES_1) && !defined(QT_OPENGL_ES_1_CL) + , pixmapData(0) +#endif {} void setDevice(QPaintDevice *pdev); void swapBuffers(); @@ -307,7 +315,9 @@ public: QGLContext *context() const; bool autoFillBackground() const; +#if !defined(QT_OPENGL_ES_1) && !defined(QT_OPENGL_ES_1_CL) QGLPixmapData *copyOnBegin() const; +#endif private: bool wasBound; @@ -316,10 +326,13 @@ private: QGLFramebufferObject *fbo; #ifdef Q_WS_QWS QWSGLWindowSurface *wsurf; -#else +#elif !defined(QT_OPENGL_ES_1) && !defined(QT_OPENGL_ES_1_CL) QGLWindowSurface *wsurf; #endif + +#if !defined(QT_OPENGL_ES_1) && !defined(QT_OPENGL_ES_1_CL) QGLPixmapData *pixmapData; +#endif }; // GL extension definitions |