1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

eglfs: allow egl native window to be zero

Browse Source 
Change the checking for created EGLNativeWindowType so that zero
is a valid value. This is the case e.g, with BeagleBoard, where
widget application cannot be run without this change.

Change-Id: I36c30091e1a5a0598ae3822d0be8dc4362779c0b
Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>
This commit is contained in:
Samuli Piippo 2013-07-29 14:39:15 +03:00 committed by The Qt Project
parent 22fbb5be6e
commit c837dbecdd
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/plugins/platforms/eglfs/qeglfswindow.cpp
View File

@ -53,6 +53,7 @@ QEglFSWindow::QEglFSWindow(QWindow *w)
: QPlatformWindow(w) : QPlatformWindow(w)
, m_surface(0) , m_surface(0)
, m_window(0) , m_window(0)
, has_window(false)
{ {
static int serialNo = 0; static int serialNo = 0;
m_winid = ++serialNo; m_winid = ++serialNo;
@ -69,7 +70,7 @@ QEglFSWindow::~QEglFSWindow()
void QEglFSWindow::create() void QEglFSWindow::create()
{ {
if (m_window) if (has_window)
return; return;
setWindowState(Qt::WindowFullScreen); setWindowState(Qt::WindowFullScreen);
@ -91,7 +92,7 @@ void QEglFSWindow::create()
void QEglFSWindow::invalidateSurface() void QEglFSWindow::invalidateSurface()
{ {
// Native surface has been deleted behind our backs // Native surface has been deleted behind our backs
m_window = 0; has_window = false;
if (m_surface != 0) { if (m_surface != 0) {
EGLDisplay display = (static_cast<QEglFSScreen *>(window()->screen()->handle()))->display(); EGLDisplay display = (static_cast<QEglFSScreen *>(window()->screen()->handle()))->display();
eglDestroySurface(display, m_surface); eglDestroySurface(display, m_surface);
@ -104,6 +105,7 @@ void QEglFSWindow::resetSurface()
EGLDisplay display = static_cast<QEglFSScreen *>(screen())->display(); EGLDisplay display = static_cast<QEglFSScreen *>(screen())->display();
m_window = QEglFSHooks::hooks()->createNativeWindow(QEglFSHooks::hooks()->screenSize(), m_format); m_window = QEglFSHooks::hooks()->createNativeWindow(QEglFSHooks::hooks()->screenSize(), m_format);
has_window = true;
m_surface = eglCreateWindowSurface(display, m_config, m_window, NULL); m_surface = eglCreateWindowSurface(display, m_config, m_window, NULL);
if (m_surface == EGL_NO_SURFACE) { if (m_surface == EGL_NO_SURFACE) {
EGLint error = eglGetError(); EGLint error = eglGetError();
@ -120,9 +122,9 @@ void QEglFSWindow::destroy()
m_surface = 0; m_surface = 0;
} }
if (m_window) { if (has_window) {
QEglFSHooks::hooks()->destroyNativeWindow(m_window); QEglFSHooks::hooks()->destroyNativeWindow(m_window);
m_window = 0; has_window = false;
} }
} }

1
src/plugins/platforms/eglfs/qeglfswindow.h
View File

@ -76,6 +76,7 @@ private:
WId m_winid; WId m_winid;
EGLConfig m_config; EGLConfig m_config;
QSurfaceFormat m_format; QSurfaceFormat m_format;
bool has_window;
}; };
QT_END_NAMESPACE QT_END_NAMESPACE
#endif // QEGLFSWINDOW_H #endif // QEGLFSWINDOW_H