AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

QNX: Make sure calls to (create/destroy)Surface are symmetric

Browse Source 
As a matter of fact also reduces state duplication with QQnxWindow
by getting rid of m_surfaceSize.

Change-Id: I47f5af0f00a317d3bb246c0c9161e2219fbd3263
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Reviewed-by: Nicolas Arnaud-Cormos <nicolas@kdab.com>
This commit is contained in:
Kevin Ottens 2012-05-22 13:07:13 +02:00 committed by Qt by Nokia
parent 20a52687ec
commit b283213712
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/plugins/platforms/qnx/qqnxglcontext.cpp
View File

@ -317,8 +317,7 @@ void QQnxGLContext::createSurface(QPlatformSurface *surface)
// buffers of the proper size // buffers of the proper size
if (!platformWindow->hasBuffers()) { if (!platformWindow->hasBuffers()) {
platformWindow->setPlatformOpenGLContext(this); platformWindow->setPlatformOpenGLContext(this);
m_surfaceSize = platformWindow->geometry().size(); platformWindow->setBufferSize(platformWindow->geometry().size());
platformWindow->setBufferSize(m_surfaceSize);
} }
// Obtain the native handle for our window // Obtain the native handle for our window
@ -351,6 +350,8 @@ void QQnxGLContext::destroySurface()
qFatal("QQNX: failed to destroy EGL surface, err=%d", eglGetError()); qFatal("QQNX: failed to destroy EGL surface, err=%d", eglGetError());
} }
} }
m_eglSurface = EGL_NO_SURFACE;
} }
QT_END_NAMESPACE QT_END_NAMESPACE

1
src/plugins/platforms/qnx/qqnxglcontext.h
View File

@ -83,7 +83,6 @@ private:
EGLConfig m_eglConfig; EGLConfig m_eglConfig;
EGLContext m_eglContext; EGLContext m_eglContext;
EGLSurface m_eglSurface; EGLSurface m_eglSurface;
QSize m_surfaceSize;
static EGLint *contextAttrs(); static EGLint *contextAttrs();
}; };