summaryrefslogtreecommitdiffstats
path: root/recipes-qt/qt5/qtbase/0007-eglfs-fix-egl-error-for-platforms-only-supporting-on.patch
diff options
context:
space:
mode:
Diffstat (limited to 'recipes-qt/qt5/qtbase/0007-eglfs-fix-egl-error-for-platforms-only-supporting-on.patch')
-rw-r--r--recipes-qt/qt5/qtbase/0007-eglfs-fix-egl-error-for-platforms-only-supporting-on.patch72
1 files changed, 0 insertions, 72 deletions
diff --git a/recipes-qt/qt5/qtbase/0007-eglfs-fix-egl-error-for-platforms-only-supporting-on.patch b/recipes-qt/qt5/qtbase/0007-eglfs-fix-egl-error-for-platforms-only-supporting-on.patch
deleted file mode 100644
index dabbc1c3..00000000
--- a/recipes-qt/qt5/qtbase/0007-eglfs-fix-egl-error-for-platforms-only-supporting-on.patch
+++ /dev/null
@@ -1,72 +0,0 @@
1From 30d26b494bd5b77be6c4e4b41d8df7af5487ee4b Mon Sep 17 00:00:00 2001
2From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
3Date: Wed, 5 Feb 2014 18:35:08 +0100
4Subject: [PATCH 6/7] eglfs: fix egl error for platforms only supporting one
5 window/surface
6MIME-Version: 1.0
7Content-Type: text/plain; charset=UTF-8
8Content-Transfer-Encoding: 8bit
9
10running qmlscene -platform eglfs <filename>.qml
11
12caused
13
14EGL Error : Could not create the egl surface: error = 0x3003
15
16Rebased version of [1-2]
17
18Upstream-Status: unknown
19
20[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
21[2] https://github.com/prabindh/qt-configs/blob/master/qt5_1.0_Feb13/qeglfswindow.cpp.patch
22
23Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
24Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
25---
26 src/plugins/platforms/eglfs/qeglfswindow.cpp | 16 +++++++++++++++-
27 1 file changed, 15 insertions(+), 1 deletion(-)
28
29diff --git a/src/plugins/platforms/eglfs/qeglfswindow.cpp b/src/plugins/platforms/eglfs/qeglfswindow.cpp
30index c0d51c9..bb4dc00 100644
31--- a/src/plugins/platforms/eglfs/qeglfswindow.cpp
32+++ b/src/plugins/platforms/eglfs/qeglfswindow.cpp
33@@ -69,6 +69,15 @@ void QEglFSWindow::create()
34
35 m_flags = Created;
36
37+ static EGLSurface __singleWindowSurface;
38+ if(QEglFSHooks::hooks() && ! QEglFSHooks::hooks()->hasCapability(QPlatformIntegration::MultipleWindows) && (__singleWindowSurface)) {
39+ m_surface = __singleWindowSurface;
40+#ifdef QEGL_EXTRA_DEBUG
41+ qWarning("Surface recreate request, re-using %x\n", m_surface);
42+#endif
43+ return;
44+ }
45+
46 if (window()->type() == Qt::Desktop)
47 return;
48
49@@ -83,7 +92,7 @@ void QEglFSWindow::create()
50 return;
51 }
52
53-#if !defined(Q_OS_ANDROID) || defined(Q_OS_ANDROID_NO_SDK)
54+#if !defined(Q_OS_ANDROID) || defined(Q_OS_ANDROID_NO_SDK) || defined(EGL_API_FB)
55 // We can have either a single OpenGL window or multiple raster windows.
56 // Other combinations cannot work.
57 qFatal("EGLFS: OpenGL windows cannot be mixed with others.");
58@@ -103,6 +112,11 @@ void QEglFSWindow::create()
59
60 resetSurface();
61
62+ if(QEglFSHooks::hooks() && !QEglFSHooks::hooks()->hasCapability(QPlatformIntegration::MultipleWindows))
63+ {
64+ __singleWindowSurface = m_surface;
65+ }
66+
67 screen->setPrimarySurface(m_surface);
68
69 if (isRaster()) {
70--
712.4.2
72