forked from pool/kdeclarative
This commit is contained in:
parent
06cdb5dde1
commit
cd6343fdb8
@ -1,33 +0,0 @@
|
|||||||
From 7a6a2cda780784e504960c96b4b41241ddf10531 Mon Sep 17 00:00:00 2001
|
|
||||||
From: David Edmundson <kde@davidedmundson.co.uk>
|
|
||||||
Date: Mon, 27 Jul 2015 12:54:17 +0200
|
|
||||||
Subject: [PATCH 1/1] Don't refresh the entire window when we render the
|
|
||||||
plotter
|
|
||||||
|
|
||||||
This means the window is only updated when the plotter changes, rather
|
|
||||||
than effectively every possible frame.
|
|
||||||
|
|
||||||
Reviewed by: Marco Martin
|
|
||||||
|
|
||||||
CCBUG: 348385
|
|
||||||
---
|
|
||||||
src/qmlcontrols/kquickcontrolsaddons/plotter.cpp | 3 ---
|
|
||||||
1 file changed, 3 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/src/qmlcontrols/kquickcontrolsaddons/plotter.cpp b/src/qmlcontrols/kquickcontrolsaddons/plotter.cpp
|
|
||||||
index 93da3c75e87aa21f6c5356b35764ded03f01d2e7..233dd6b9bc0dbeddcbeb8ee02ebc500bf10282b3 100644
|
|
||||||
--- a/src/qmlcontrols/kquickcontrolsaddons/plotter.cpp
|
|
||||||
+++ b/src/qmlcontrols/kquickcontrolsaddons/plotter.cpp
|
|
||||||
@@ -709,9 +709,6 @@ void Plotter::render()
|
|
||||||
|
|
||||||
// Delete the VBO
|
|
||||||
glDeleteBuffers(1, &vbo);
|
|
||||||
- if (window()) {
|
|
||||||
- window()->update();
|
|
||||||
- }
|
|
||||||
}
|
|
||||||
|
|
||||||
QSGNode *Plotter::updatePaintNode(QSGNode *oldNode, UpdatePaintNodeData *updatePaintNodeData)
|
|
||||||
--
|
|
||||||
2.4.6
|
|
||||||
|
|
@ -1,44 +0,0 @@
|
|||||||
From f399aa8b48db02f809454be5427c0ca01b809882 Mon Sep 17 00:00:00 2001
|
|
||||||
From: David Edmundson <kde@davidedmundson.co.uk>
|
|
||||||
Date: Tue, 7 Jul 2015 11:54:11 +0100
|
|
||||||
Subject: [PATCH 1/1] Only resize plot texture if size actually changes
|
|
||||||
|
|
||||||
Test compared rounded QSize with QSizeF, which will be almost always
|
|
||||||
returning true.
|
|
||||||
|
|
||||||
CCBUG: 348385
|
|
||||||
REVIEW: 124280
|
|
||||||
---
|
|
||||||
src/qmlcontrols/kquickcontrolsaddons/plotter.cpp | 13 ++++++-------
|
|
||||||
1 file changed, 6 insertions(+), 7 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/src/qmlcontrols/kquickcontrolsaddons/plotter.cpp b/src/qmlcontrols/kquickcontrolsaddons/plotter.cpp
|
|
||||||
index 9a939c3626fc6321a39e898b88e5b69c14b4e1b7..93da3c75e87aa21f6c5356b35764ded03f01d2e7 100644
|
|
||||||
--- a/src/qmlcontrols/kquickcontrolsaddons/plotter.cpp
|
|
||||||
+++ b/src/qmlcontrols/kquickcontrolsaddons/plotter.cpp
|
|
||||||
@@ -799,16 +799,15 @@ QSGNode *Plotter::updatePaintNode(QSGNode *oldNode, UpdatePaintNodeData *updateP
|
|
||||||
u_matrix = s_program->uniformLocation("matrix");
|
|
||||||
}
|
|
||||||
|
|
||||||
- if (n->texture()->textureSize() != boundingRect().size()) {
|
|
||||||
- //we need a size always equal or smaller, size.toSize() won't do
|
|
||||||
- static_cast<PlotTexture *>(n->texture())->recreate(QSize(qRound(boundingRect().size().width()), qRound(boundingRect().size().height())));
|
|
||||||
+ //we need a size always equal or smaller, size.toSize() won't do
|
|
||||||
+ const QSize targetTextureSize(qRound(boundingRect().size().width()), qRound(boundingRect().size().height()));
|
|
||||||
+ if (n->texture()->textureSize() != targetTextureSize) {
|
|
||||||
+ static_cast<PlotTexture *>(n->texture())->recreate(targetTextureSize);
|
|
||||||
m_matrix = QMatrix4x4();
|
|
||||||
- m_matrix.ortho(0, qRound(width()), 0, qRound(height()), -1, 1);
|
|
||||||
+ m_matrix.ortho(0, targetTextureSize.width(), 0, targetTextureSize.height(), -1, 1);
|
|
||||||
}
|
|
||||||
|
|
||||||
- n->setRect(QRect(QPoint(0,0),
|
|
||||||
- QSize(qRound(boundingRect().size().width()),
|
|
||||||
- qRound(boundingRect().size().height()))));
|
|
||||||
+ n->setRect(QRect(QPoint(0,0), targetTextureSize));
|
|
||||||
return n;
|
|
||||||
}
|
|
||||||
|
|
||||||
--
|
|
||||||
2.4.5
|
|
||||||
|
|
@ -4,6 +4,9 @@ Tue Aug 4 19:20:20 UTC 2015 - hrvoje.senjan@gmail.com
|
|||||||
- Update to 5.13.0
|
- Update to 5.13.0
|
||||||
* For more details please see:
|
* For more details please see:
|
||||||
https://www.kde.org/announcements/kde-frameworks-5.13.0.php
|
https://www.kde.org/announcements/kde-frameworks-5.13.0.php
|
||||||
|
- Drop patches merged upstream:
|
||||||
|
0001-Only-resize-plot-texture-if-size-actually-changes.patch
|
||||||
|
0001-Don-t-refresh-the-entire-window-when-we-render-the-p.patch
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Mon Jul 27 16:07:54 UTC 2015 - hrvoje.senjan@gmail.com
|
Mon Jul 27 16:07:54 UTC 2015 - hrvoje.senjan@gmail.com
|
||||||
|
Loading…
x
Reference in New Issue
Block a user