Verify the surfaceType before activating the GL context
authorHolger Hans Peter Freyther <holger@moiji-mobile.com>
Tue, 29 May 2012 13:23:25 +0000 (15:23 +0200)
committerQt by Nokia <qt-info@nokia.com>
Tue, 5 Jun 2012 16:48:00 +0000 (18:48 +0200)
commite1774d202912b5d053872f242c61d964a5d69450
tree2db13710c7d5979e5b49639b9ed5ef3f566a2beb
parent7d28f7772cd8f5aad63359ed0b9c57c12923dc85
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>
src/gui/kernel/qplatformsurface.h
src/gui/kernel/qplatformsurface_qpa.cpp
src/gui/kernel/qplatformwindow_qpa.cpp
src/platformsupport/eglconvenience/qeglplatformcontext.cpp
src/plugins/platforms/cocoa/qcocoaglcontext.mm
src/plugins/platforms/kms/qkmscontext.cpp
src/plugins/platforms/openwfd/qopenwfdglcontext.cpp
src/plugins/platforms/qnx/qqnxglcontext.cpp
src/plugins/platforms/windows/qwindowsglcontext.cpp
src/plugins/platforms/xcb/qglxintegration.cpp