From e1774d202912b5d053872f242c61d964a5d69450 Mon Sep 17 00:00:00 2001 From: Holger Hans Peter Freyther Date: Tue, 29 May 2012 15:23:25 +0200 Subject: Verify the surfaceType before activating the GL context MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 Reviewed-by: Girish Ramakrishnan --- src/plugins/platforms/windows/qwindowsglcontext.cpp | 3 +++ 1 file changed, 3 insertions(+) (limited to 'src/plugins/platforms/windows/qwindowsglcontext.cpp') diff --git a/src/plugins/platforms/windows/qwindowsglcontext.cpp b/src/plugins/platforms/windows/qwindowsglcontext.cpp index 2528ad949f..cabc5974eb 100644 --- a/src/plugins/platforms/windows/qwindowsglcontext.cpp +++ b/src/plugins/platforms/windows/qwindowsglcontext.cpp @@ -1042,6 +1042,9 @@ bool QWindowsGLContext::makeCurrent(QPlatformSurface *surface) if (QWindowsContext::verboseGL > 1) qDebug("%s context=%p contexts=%d", __FUNCTION__, this, m_windowContexts.size()); #endif // DEBUG_GL + + Q_ASSERT(surface->surface()->surfaceType() == QSurface::OpenGLSurface); + // Do we already have a DC entry for that window? QWindowsWindow *window = static_cast(surface); const HWND hwnd = window->handle(); -- cgit v1.2.3