summaryrefslogtreecommitdiffstats
path: root/recipes-qt/qt5/qtbase-5.1.1/0020-Use-BGRA-extension-in-bindTexture.patch
diff options
context:
space:
mode:
authorMartin Jansa <Martin.Jansa@gmail.com>2013-11-02 19:06:14 +0100
committerMartin Jansa <Martin.Jansa@gmail.com>2014-01-12 15:01:37 +0100
commitc908fe4ebd5a04813be0b83c173fae182bb22728 (patch)
treeac8f089c2dce89598cf96532eac24cfb33567e4b /recipes-qt/qt5/qtbase-5.1.1/0020-Use-BGRA-extension-in-bindTexture.patch
parent775d77e482f1ea203c78003cccd2547075fd720f (diff)
downloadmeta-qt5-c908fe4ebd5a04813be0b83c173fae182bb22728.tar.gz
qt5: upgrade to 5.2.0
* drop 0027-Fix-misaligned-selection-region-with-text-when-cente.patch resolved in upstream commit 5d8a882c11201a29475c5ea71cfb76c9de6573f5 * drop 0020-Use-BGRA-extension-in-bindTexture.patch resolved in upstream commit e1325cf26e146b68725cc1a0a02b274ce3dfbe5c * drop 0008-wayland-scanner-disable-silent-rules.patch resolved upstream in: commit 2ff2a7c32d76b9e58b800f12469f112cfdb6ad3c Author: Jan Arne Petersen <jan.petersen@kdab.com> Date: Fri Jul 19 14:35:19 2013 +0200 Fix wayland-scanner to work with CONFIG+=silent * squash to match more with structure of https://github.com/meta-qt5/qtbase/tree/stable * qtmodules: bump SRCREVs for 5.2.0 tags now all modules using qt5-git should be newer than any 5.1.* version * qtbase: fix paths in packageconfig *.pc files include- and lib-paths contained build-sysroot paths * qtwebkit: Explicitly add ICU libraries to LIBS fails to build without this * qtjsbackend: remove for git versions Found in [1]: Qt Qml is now using its own built-in Javascript engine and does not depend on V8 anymore. As such the QtJSBackend shared library has disappeared. [1] http://blog.qt.digia.com/blog/2013/09/30/qt-5-2-alpha-available/ * qt5: Upgrade 5.1.1 recipes to 5.2.0 to match git recipes qtjsbackend is now completely gone it allows to share more .patch files and configuration in .inc again Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'recipes-qt/qt5/qtbase-5.1.1/0020-Use-BGRA-extension-in-bindTexture.patch')
-rw-r--r--recipes-qt/qt5/qtbase-5.1.1/0020-Use-BGRA-extension-in-bindTexture.patch34
1 files changed, 0 insertions, 34 deletions
diff --git a/recipes-qt/qt5/qtbase-5.1.1/0020-Use-BGRA-extension-in-bindTexture.patch b/recipes-qt/qt5/qtbase-5.1.1/0020-Use-BGRA-extension-in-bindTexture.patch
deleted file mode 100644
index e17e5ac9..00000000
--- a/recipes-qt/qt5/qtbase-5.1.1/0020-Use-BGRA-extension-in-bindTexture.patch
+++ /dev/null
@@ -1,34 +0,0 @@
1From 5aaec8299901e0093cec2b704a724bc3254b8b8d Mon Sep 17 00:00:00 2001
2From: Jani Hautakangas <jani.hautakangas@ixonos.com>
3Date: Mon, 27 May 2013 15:25:25 -0700
4Subject: [PATCH 17/22] Use BGRA extension in bindTexture
5
6Upstream-Status: Pending
7
8Change-Id: I18aecc87c5c7d4483cabe5555da33ca6bb8580f1
9
10Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
11---
12 src/gui/opengl/qopengltexturecache.cpp | 6 +-----
13 1 file changed, 1 insertion(+), 5 deletions(-)
14
15diff --git a/src/gui/opengl/qopengltexturecache.cpp b/src/gui/opengl/qopengltexturecache.cpp
16index 94b8288..5c8aa3c 100644
17--- a/src/gui/opengl/qopengltexturecache.cpp
18+++ b/src/gui/opengl/qopengltexturecache.cpp
19@@ -181,11 +181,7 @@ GLuint QOpenGLTextureCache::bindTexture(QOpenGLContext *context, qint64 key, con
20
21 QImage tx = image.convertToFormat(QImage::Format_ARGB32_Premultiplied);
22
23- // Performance could be improved by skipping qgl_byteSwapImage().
24- if (m_useByteSwapImage)
25- qgl_byteSwapImage(tx);
26-
27- glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, tx.width(), tx.height(), 0, GL_RGBA, GL_UNSIGNED_BYTE, const_cast<const QImage &>(tx).bits());
28+ glTexImage2D(GL_TEXTURE_2D, 0, GL_BGRA_EXT, tx.width(), tx.height(), 0, GL_BGRA_EXT, GL_UNSIGNED_BYTE, const_cast<const QImage &>(tx).bits());
29
30 int cost = tx.width() * tx.height() * 4 / 1024;
31 m_cache.insert(key, new QOpenGLCachedTexture(id, context), cost);
32--
331.8.3.1
34