diff options
| author | Holger Hans Peter Freyther <holger@moiji-mobile.com> | 2012-05-29 15:23:25 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-06-05 18:48:00 +0200 |
| commit | e1774d202912b5d053872f242c61d964a5d69450 (patch) | |
| tree | 2db13710c7d5979e5b49639b9ed5ef3f566a2beb /src/plugins/platforms/qnx/qqnxglcontext.cpp | |
| parent | 7d28f7772cd8f5aad63359ed0b9c57c12923dc85 (diff) | |
Verify the surfaceType before activating the GL context
Verify that the surfaceType() of the QPlatformContext is of type
OpenGLSurface before making the context active. Make it possible
to get the QSurface from a QPlatformSurface, make QPlatformWindow
use that to access the QWindow. Remove the setSurfaceType call from
the eglfs plugin as this hiding a problem.
Change-Id: I08906da052e066bb1f1f042030643c6389ab17d7
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
Reviewed-by: Girish Ramakrishnan <girish.1.ramakrishnan@nokia.com>
Diffstat (limited to 'src/plugins/platforms/qnx/qqnxglcontext.cpp')
| -rw-r--r-- | src/plugins/platforms/qnx/qqnxglcontext.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/plugins/platforms/qnx/qqnxglcontext.cpp b/src/plugins/platforms/qnx/qqnxglcontext.cpp index 593180019d..0b030bd5fe 100644 --- a/src/plugins/platforms/qnx/qqnxglcontext.cpp +++ b/src/plugins/platforms/qnx/qqnxglcontext.cpp @@ -205,6 +205,8 @@ bool QQnxGLContext::makeCurrent(QPlatformSurface *surface) { qGLContextDebug() << Q_FUNC_INFO; + Q_ASSERT(surface->surface()->surfaceType() == QSurface::OpenGLSurface); + // Set current rendering API EGLBoolean eglResult = eglBindAPI(EGL_OPENGL_ES_API); if (eglResult != EGL_TRUE) { |