diff options
| author | Jonathan Liu <net147@gmail.com> | 2014-03-05 09:09:39 +1100 |
|---|---|---|
| committer | Martin Jansa <Martin.Jansa@gmail.com> | 2014-03-05 19:25:36 +0100 |
| commit | 201b3b2c89d77a6ef8ea6e5f6b63929429184994 (patch) | |
| tree | 9574b9b982b41c46f1b2189e1f4087efda940562 | |
| parent | 8c3c6fda694f8d86347d51978d345d476addf59f (diff) | |
qtbase: prevent artifacts on raster windows using eglfs plugin
Signed-off-by: Jonathan Liu <net147@gmail.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/0016-eglfs-Fix-quad-coordinates.patch | 39 |
2 files changed, 40 insertions, 0 deletions
diff --git a/recipes-qt/qt5/qtbase.inc b/recipes-qt/qt5/qtbase.inc index 98fac85c..8ca89494 100644 --- a/recipes-qt/qt5/qtbase.inc +++ b/recipes-qt/qt5/qtbase.inc @@ -20,6 +20,7 @@ SRC_URI += "\ file://0013-QOpenGLPaintDevice-sub-area-support.patch \ file://0014-eglfs-fix-egl-error-for-platforms-only-supporting-on.patch \ file://0015-Fix-linuxfb-argument-mmsize-parsing.patch \ + file://0016-eglfs-Fix-quad-coordinates.patch \ " DEPENDS += "qtbase-native" diff --git a/recipes-qt/qt5/qtbase/0016-eglfs-Fix-quad-coordinates.patch b/recipes-qt/qt5/qtbase/0016-eglfs-Fix-quad-coordinates.patch new file mode 100644 index 00000000..92785e45 --- /dev/null +++ b/recipes-qt/qt5/qtbase/0016-eglfs-Fix-quad-coordinates.patch @@ -0,0 +1,39 @@ +From 84756d94c73885803ad8044099ab47c0c49b5076 Mon Sep 17 00:00:00 2001 +From: Laszlo Agocs <laszlo.agocs@digia.com> +Date: Thu, 23 Jan 2014 11:45:22 +0100 +Subject: [PATCH] eglfs: Fix quad coordinates + +Prevent artifacts on raster windows by properly mapping +the coordinates to [-1,1]. + +Upstream-Status: Backport + +Task-number: QTBUG-36370 +Change-Id: I95d0d03952f597ef4ce6a950c6533a3af2df964a +Reviewed-by: Andy Nichols <andy.nichols@digia.com> +Signed-off-by: Jonathan Liu <net147@gmail.com> +--- + src/plugins/platforms/eglfs/qeglfscompositor.cpp | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +diff --git a/src/plugins/platforms/eglfs/qeglfscompositor.cpp b/src/plugins/platforms/eglfs/qeglfscompositor.cpp +index 845bb5b..1efc4f7 100644 +--- a/src/plugins/platforms/eglfs/qeglfscompositor.cpp ++++ b/src/plugins/platforms/eglfs/qeglfscompositor.cpp +@@ -153,10 +153,11 @@ void QEglFSCompositor::render(QEglFSWindow *window, uint texture, bool raster) + QPoint tl = r.topLeft(); + QPoint br = r.bottomRight(); + ++ // Map to [-1,1] + GLfloat x1 = (tl.x() / sr.width()) * 2 - 1; +- GLfloat x2 = (br.x() / sr.width()) * 2 - 1; + GLfloat y1 = ((sr.height() - tl.y()) / sr.height()) * 2 - 1; +- GLfloat y2 = ((sr.height() - br.y()) / sr.height()) * 2 - 1; ++ GLfloat x2 = ((br.x() + 1) / sr.width()) * 2 - 1; ++ GLfloat y2 = ((sr.height() - (br.y() + 1)) / sr.height()) * 2 - 1; + + if (!raster) + qSwap(y1, y2); +-- +1.7.1 + |