Merge lp:~fboucault/ubuntu-ui-toolkit/enable_atlas_textures into lp:ubuntu-ui-toolkit/staging

Proposed by Florian Boucault
Status: Merged
Approved by: Timo Jyrinki
Approved revision: 2022
Merged at revision: 2067
Proposed branch: lp:~fboucault/ubuntu-ui-toolkit/enable_atlas_textures
Merge into: lp:ubuntu-ui-toolkit/staging
Diff against target: 47 lines (+4/-0)
4 files modified
src/Ubuntu/Components/1.0/Icon.qml (+1/-0)
src/Ubuntu/Components/1.3/Icon.qml (+1/-0)
src/Ubuntu/Components/Themes/Ambiance/1.2/PartialColorize.qml (+1/-0)
src/Ubuntu/Components/Themes/Ambiance/1.3/PartialColorize.qml (+1/-0)
To merge this branch: bzr merge lp:~fboucault/ubuntu-ui-toolkit/enable_atlas_textures
Reviewer Review Type Date Requested Status
ubuntu-sdk-build-bot continuous-integration Approve
Cris Dywan Needs Information
Review via email: mp+298770@code.launchpad.net

Commit message

Icon, Switch and ProgressBar: enable use of texture atlas.

Description of the change

Icon, Switch and ProgressBar: enable use of texture atlas.

To post a comment you must log in.
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :
review: Approve (continuous-integration)
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :
review: Approve (continuous-integration)
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :
review: Approve (continuous-integration)
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
Cris Dywan (kalikiana) wrote :

Can we verify at all that "supportsAtlasTextures" works as expected? I'm guessing "no difference" is good, but presumably it can break in some cases... just wondering how we QA this.

review: Needs Information
Revision history for this message
Albert Astals Cid (aacid) wrote :

Note the crash in i386-gles-stable is reproducible, i'm working on a patch to fix it. I don't think we should land it unless we get that fix too.

Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :
review: Approve (continuous-integration)
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :
review: Approve (continuous-integration)
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :
review: Approve (continuous-integration)
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :
review: Approve (continuous-integration)
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :
review: Approve (continuous-integration)
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :
review: Approve (continuous-integration)
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :
review: Approve (continuous-integration)
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :
review: Approve (continuous-integration)
Revision history for this message
Albert Astals Cid (aacid) wrote :

> Note the crash in i386-gles-stable is reproducible, i'm working on a patch to
> fix it. I don't think we should land it unless we get that fix too.

The branch that fixes this crash has landed, this branch can land too now.

Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :
review: Approve (continuous-integration)
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :
review: Approve (continuous-integration)
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :
review: Approve (continuous-integration)
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
Timo Jyrinki (timo-jyrinki) wrote :

Retrying with fixed phone CI.

Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :
review: Approve (continuous-integration)
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :
review: Approve (continuous-integration)
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :
review: Approve (continuous-integration)
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :
review: Approve (continuous-integration)
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :
review: Approve (continuous-integration)
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :
review: Approve (continuous-integration)
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
Timo Jyrinki (timo-jyrinki) wrote :

flaky test TabsWithRepeaterNewHeader::test_tabOrder_bug1253804, retrying once more..

Revision history for this message
Timo Jyrinki (timo-jyrinki) wrote :

(flakiness reported in bug #1541386)

Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :
review: Approve (continuous-integration)
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :
review: Approve (continuous-integration)
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :
review: Approve (continuous-integration)
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :
review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/Ubuntu/Components/1.0/Icon.qml'
2--- src/Ubuntu/Components/1.0/Icon.qml 2015-09-15 12:40:25 +0000
3+++ src/Ubuntu/Components/1.0/Icon.qml 2016-06-30 13:22:13 +0000
4@@ -71,6 +71,7 @@
5 property color keyColorOut: Qt.rgba(0.0, 0.0, 0.0, 0.0)
6 property color keyColorIn: "#808080"
7 property real threshold: 0.1
8+ supportsAtlasTextures: true
9
10 fragmentShader: "
11 varying highp vec2 qt_TexCoord0;
12
13=== modified file 'src/Ubuntu/Components/1.3/Icon.qml'
14--- src/Ubuntu/Components/1.3/Icon.qml 2016-05-25 12:48:10 +0000
15+++ src/Ubuntu/Components/1.3/Icon.qml 2016-06-30 13:22:13 +0000
16@@ -141,6 +141,7 @@
17 property color keyColorOut: Qt.rgba(0.0, 0.0, 0.0, 0.0)
18 property color keyColorIn: "#808080"
19 property real threshold: 0.1
20+ supportsAtlasTextures: true
21
22 fragmentShader: "
23 varying highp vec2 qt_TexCoord0;
24
25=== modified file 'src/Ubuntu/Components/Themes/Ambiance/1.2/PartialColorize.qml'
26--- src/Ubuntu/Components/Themes/Ambiance/1.2/PartialColorize.qml 2015-04-24 14:43:08 +0000
27+++ src/Ubuntu/Components/Themes/Ambiance/1.2/PartialColorize.qml 2016-06-30 13:22:13 +0000
28@@ -34,6 +34,7 @@
29 property real progress
30 property bool mirror: false
31 property string texCoord: mirror ? "1.0 - qt_TexCoord0.x" : "qt_TexCoord0.x"
32+ supportsAtlasTextures: true
33
34 fragmentShader: "
35 varying highp vec2 qt_TexCoord0;
36
37=== modified file 'src/Ubuntu/Components/Themes/Ambiance/1.3/PartialColorize.qml'
38--- src/Ubuntu/Components/Themes/Ambiance/1.3/PartialColorize.qml 2015-04-24 14:07:02 +0000
39+++ src/Ubuntu/Components/Themes/Ambiance/1.3/PartialColorize.qml 2016-06-30 13:22:13 +0000
40@@ -34,6 +34,7 @@
41 property real progress
42 property bool mirror: false
43 property string texCoord: mirror ? "1.0 - qt_TexCoord0.x" : "qt_TexCoord0.x"
44+ supportsAtlasTextures: true
45
46 fragmentShader: "
47 varying highp vec2 qt_TexCoord0;

Subscribers

People subscribed via source and target branches