[Libreoffice-commits] core.git: Branch 'libreoffice-7-6' - vcl/skia
vcl/skia/osx/gdiimpl.cxx |5 +
1 file changed, 5 insertions(+)
New commits:
commit 0224f024424c76a05e0c20b6ee1b4490fde11607
Author: Patrick Luby
AuthorDate: Wed Oct 11 14:36:12 2023 -0400
Commit: Patrick Luby
CommitDate: Thu Oct 12 00:17:36 2023 +0200
tdf#157613 make sure surface is not a null pointer
Change-Id: I8e3c1be3f05f7ccc1f3ba00093cd71a564e5ae9e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/157848
Reviewed-by: Patrick Luby
Tested-by: Patrick Luby
(cherry picked from commit bacdae0d6b0cec4de39812496f6ffafe04629411)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/157870
Tested-by: Jenkins
diff --git a/vcl/skia/osx/gdiimpl.cxx b/vcl/skia/osx/gdiimpl.cxx
index fd0bdca04333..937a6e40f520 100644
--- a/vcl/skia/osx/gdiimpl.cxx
+++ b/vcl/skia/osx/gdiimpl.cxx
@@ -214,6 +214,11 @@ bool
AquaSkiaSalGraphicsImpl::drawNativeControl(ControlType nType, ControlPart n
const tools::Rectangle&
rControlRegion,
ControlState nState, const
ImplControlValue& aValue)
{
+// tdf#157613 make sure surface is not a nullptr
+checkSurface();
+if (!mSurface)
+return false;
+
// rControlRegion is not the whole area that the control should be painted
to (e.g. highlight
// around focused lineedit is outside of it). Since we draw to a temporary
bitmap, we need tofind out
// the real size. Using getNativeControlRegion() might seem like the
function to call, but we need
[Libreoffice-commits] core.git: Branch 'libreoffice-7-6' - vcl/skia
vcl/skia/gdiimpl.cxx |8 +++-
1 file changed, 7 insertions(+), 1 deletion(-)
New commits:
commit 41b8243464a0aa4730e4c6177f1c4fd6adc260d9
Author: Patrick Luby
AuthorDate: Thu Sep 21 20:20:33 2023 -0400
Commit: Patrick Luby
CommitDate: Fri Sep 22 15:51:31 2023 +0200
tdf#157312 Don't change priority
Instances of this class are constructed with
TaskPriority::POST_PAINT, but then it was set to
TaskPriority::HIGHEST when reused. Flushing
seems to be expensive (at least with Skia/Metal) so keep the
existing priority when reused.
Change-Id: Ieb40cd6122f543f76e66456cc92a8643e2320d73
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/157162
Tested-by: Jenkins
Reviewed-by: Patrick Luby
(cherry picked from commit daa4a29c993df2e137b222ac3e60aa4b417a2d2d)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/157122
diff --git a/vcl/skia/gdiimpl.cxx b/vcl/skia/gdiimpl.cxx
index 7145644b01eb..2ae3b8d85e23 100644
--- a/vcl/skia/gdiimpl.cxx
+++ b/vcl/skia/gdiimpl.cxx
@@ -268,7 +268,13 @@ public:
{
mpGraphics->performFlush();
Stop();
-SetPriority(TaskPriority::HIGHEST);
+// tdf#157312 Don't change priority
+// Instances of this class are constructed with
+// TaskPriority::POST_PAINT, but then it was set to
+// TaskPriority::HIGHEST when reused. Flushing
+// seems to be expensive (at least with Skia/Metal) so keep the
+// existing priority when reused.
+SetPriority(TaskPriority::POST_PAINT);
}
};
[Libreoffice-commits] core.git: Branch 'libreoffice-7-6' - vcl/skia
vcl/skia/gdiimpl.cxx |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit aebc5c5ab1a1ab8e88ff5aacece11f29900cb569
Author: Aron Budea
AuthorDate: Sun Jul 16 17:25:55 2023 +0200
Commit: Tomaž Vajngerl
CommitDate: Wed Jul 19 03:02:34 2023 +0200
tdf#155661 Apply border from center point not from whole size
Regression from 6965bb07bb33429a7663a3f3ebe58ed89c4327d9
and 8b8a988f38b704e466211bb91a3269756c34222b.
Change-Id: I2e8c21fbdbbc7efb4b473c63b098044384a70d6c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/154501
Tested-by: Jenkins
Reviewed-by: Tomaž Vajngerl
(cherry picked from commit 4202dfcae19ee47e9a3fda02fac34c18cb0d16ff)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/154542
diff --git a/vcl/skia/gdiimpl.cxx b/vcl/skia/gdiimpl.cxx
index 94e1f7c176fa..cc823e4ccdd4 100644
--- a/vcl/skia/gdiimpl.cxx
+++ b/vcl/skia/gdiimpl.cxx
@@ -2049,8 +2049,8 @@ bool SkiaSalGraphicsImpl::drawGradient(const
tools::PolyPolygon& rPolyPolygon,
SkPoint::Make(toSkX(aPoly[1].X()),
toSkY(aPoly[1].Y())) };
SkColor colors[3] = { endColor, startColor, endColor };
SkScalar border = SkDoubleToScalar(aGradient.GetBorder() / 100.0);
-SkScalar pos[3]
-= { std::min(border, 0.5), 0.5, std::max(1 -
border, 0.5) };
+SkScalar pos[3] = { std::min(border * 0.5f, 0.5f), 0.5f,
+std::max(1 - border * 0.5f, 0.5f) };
shader = SkGradientShader::MakeLinear(points, colors, pos, 3,
SkTileMode::kClamp);
}
else
[Libreoffice-commits] core.git: Branch 'libreoffice-7-6' - vcl/skia
vcl/skia/skia_denylist_vulkan.xml |3 +++ 1 file changed, 3 insertions(+) New commits: commit 194a41889aa94600a59502ed2bac567183353253 Author: Julien Nabet AuthorDate: Wed Jun 21 11:03:21 2023 +0200 Commit: Caolán McNamara CommitDate: Mon Jul 3 12:44:13 2023 +0200 Related tdf#155143: blacklist Nvidia GTX 960M for Skia hardware rendering Change-Id: I1404ef059de9781f1fe8123a880a70495b159a87 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/153383 Tested-by: Jenkins Reviewed-by: Julien Nabet (cherry picked from commit 3032aecb0572f2cfe1c22e7fed2d22aee69a3118) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/153410 Reviewed-by: Caolán McNamara diff --git a/vcl/skia/skia_denylist_vulkan.xml b/vcl/skia/skia_denylist_vulkan.xml index 5c63283d9720..2bb3b73bb747 100644 --- a/vcl/skia/skia_denylist_vulkan.xml +++ b/vcl/skia/skia_denylist_vulkan.xml @@ -54,6 +54,9 @@ + + +
