diff options
| author | Andreas Müller <schnitzeltony@googlemail.com> | 2014-02-05 20:35:11 +0100 |
|---|---|---|
| committer | Martin Jansa <Martin.Jansa@gmail.com> | 2014-02-19 11:56:32 +0100 |
| commit | 52e39c35ee227a9eb1b1a182f9a873c4e7e55825 (patch) | |
| tree | 9c21100468505000fc374b778c4e309f59ddd54b | |
| parent | 47ec6dbcba57b0b0f7dbeb00bef24f8d85112947 (diff) | |
qtbase: eglfs: fix egl error for platforms only supporting one window/surface
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
| -rw-r--r-- | recipes-qt/qt5/qtbase.inc | 1 | ||||
| -rw-r--r-- | recipes-qt/qt5/qtbase/0014-eglfs-fix-egl-error-for-platforms-only-supporting-on.patch | 63 |
2 files changed, 64 insertions, 0 deletions
diff --git a/recipes-qt/qt5/qtbase.inc b/recipes-qt/qt5/qtbase.inc index f0563938..d61d2dbf 100644 --- a/recipes-qt/qt5/qtbase.inc +++ b/recipes-qt/qt5/qtbase.inc @@ -18,6 +18,7 @@ SRC_URI += "\ file://0011-Allow-building-a-separate-qmake-for-the-target.patch \ file://0012-qtbase-allow-build-of-examples.patch \ file://0013-QOpenGLPaintDevice-sub-area-support.patch \ + file://0014-eglfs-fix-egl-error-for-platforms-only-supporting-on.patch \ " DEPENDS += "qtbase-native" diff --git a/recipes-qt/qt5/qtbase/0014-eglfs-fix-egl-error-for-platforms-only-supporting-on.patch b/recipes-qt/qt5/qtbase/0014-eglfs-fix-egl-error-for-platforms-only-supporting-on.patch new file mode 100644 index 00000000..6fd29381 --- /dev/null +++ b/recipes-qt/qt5/qtbase/0014-eglfs-fix-egl-error-for-platforms-only-supporting-on.patch @@ -0,0 +1,63 @@ +From c8995c6eb6cf4bfa8daf1e3e96bd4885a096f405 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com> +Date: Wed, 5 Feb 2014 18:35:08 +0100 +Subject: [PATCH 14/14] eglfs: fix egl error for platforms only supporting one + window/surface +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +running qmlscene -platform eglfs <filename>.qml + +caused + +EGL Error : Could not create the egl surface: error = 0x3003 + +Rebased version of [1-2] + +Upstream-Status: unknown + +[1] http://repository.timesys.com/buildsources/q/qt-everywhere-opensource/qt-everywhere-opensource-5.1.1/qt-everywhere-opensource-5.1.1-qeglfswindow.cpp.patch +[2] https://github.com/prabindh/qt-configs/blob/master/qt5_1.0_Feb13/qeglfswindow.cpp.patch + +Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com> +--- + src/plugins/platforms/eglfs/qeglfswindow.cpp | 15 +++++++++++++++ + 1 file changed, 15 insertions(+) + +diff --git a/src/plugins/platforms/eglfs/qeglfswindow.cpp b/src/plugins/platforms/eglfs/qeglfswindow.cpp +index bba00da..567820c 100644 +--- a/src/plugins/platforms/eglfs/qeglfswindow.cpp ++++ b/src/plugins/platforms/eglfs/qeglfswindow.cpp +@@ -87,6 +87,16 @@ void QEglFSWindow::create() + if (m_flags.testFlag(Created)) + return; + ++ static EGLSurface __singleWindowSurface; ++ if(QEglFSHooks::hooks() && !QEglFSHooks::hooks()->hasCapability(QPlatformIntegration::MultipleWindows) && (__singleWindowSurface)) ++ { ++ m_surface = __singleWindowSurface; ++#ifdef QEGL_EXTRA_DEBUG ++ qWarning("Surface recreate request, re-using %x\n", m_surface); ++#endif ++ return; ++ } ++ + m_flags = Created; + m_wid = newWId(); + +@@ -130,6 +140,11 @@ void QEglFSWindow::create() + + resetSurface(); + ++ if(QEglFSHooks::hooks() && !QEglFSHooks::hooks()->hasCapability(QPlatformIntegration::MultipleWindows)) ++ { ++ __singleWindowSurface = m_surface; ++ } ++ + screen->setPrimarySurface(m_surface); + + if (m_flags.testFlag(IsRaster)) { +-- +1.8.5.3 + |