Skip to content

Micro Optimizations for SkiaBackedCanvas #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
ApoloApps wants to merge 1 commit into from
Closed

Micro Optimizations for SkiaBackedCanvas #1

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
42 changes: 18 additions & 24 deletions ...i/ui-graphics/src/skikoMain/kotlin/androidx/compose/ui/graphics/SkiaBackedCanvas.skiko.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -217,11 +217,7 @@ internal class SkiaBackedCanvas(val skia: org.jetbrains.skia.Canvas) : Canvas {
paint: Paint
) {
val bitmap = image.asSkiaBitmap()
// TODO(gorshenev): need to use skiko's .use() rather than jvm one here.
// But can't do that as skiko is jvmTarget=11 for now, so can't inline
// into jvmTarget=8 compose.
// After this issue is resolved use:
// import org.jetbrains.skia.impl.use

Image.makeFromBitmap(bitmap).use { skiaImage ->
skia.drawImageRect(
skiaImage,
Expand Down Expand Up @@ -263,11 +259,12 @@ internal class SkiaBackedCanvas(val skia: org.jetbrains.skia.Canvas) : Canvas {
override fun disableZ() = Unit

private fun drawPoints(points: List<Offset>, paint: Paint) {
val skiaPaint = paint.skia
points.fastForEach { point ->
skia.drawPoint(
point.x,
point.y,
paint.skia
skiaPaint
)
}
}
Expand All @@ -286,16 +283,13 @@ internal class SkiaBackedCanvas(val skia: org.jetbrains.skia.Canvas) : Canvas {
*/
private fun drawLines(points: List<Offset>, paint: Paint, stepBy: Int) {
if (points.size >= 2) {
for (i in 0 until points.size - 1 step stepBy) {
val skiaPaint = paint.skia
var i = 0
while (i < points.size - 1) {
val p1 = points[i]
val p2 = points[i + 1]
skia.drawLine(
p1.x,
p1.y,
p2.x,
p2.y,
paint.skia
)
skia.drawLine(p1.x, p1.y, p2.x, p2.y, skiaPaint)
i += stepBy
}
}
}
Expand All @@ -316,10 +310,13 @@ internal class SkiaBackedCanvas(val skia: org.jetbrains.skia.Canvas) : Canvas {

private fun drawRawPoints(points: FloatArray, paint: Paint, stepBy: Int) {
if (points.size % 2 == 0) {
for (i in 0 until points.size - 1 step stepBy) {
val skiaPaint = paint.skia
var i = 0
while (i < points.size - 1) {
val x = points[i]
val y = points[i + 1]
skia.drawPoint(x, y, paint.skia)
skia.drawPoint(x, y, skiaPaint)
i += stepBy
}
}
}
Expand All @@ -341,18 +338,15 @@ internal class SkiaBackedCanvas(val skia: org.jetbrains.skia.Canvas) : Canvas {
// Float array is treated as alternative set of x and y coordinates
// x1, y1, x2, y2, x3, y3, ... etc.
if (points.size >= 4 && points.size % 2 == 0) {
for (i in 0 until points.size - 3 step stepBy * 2) {
val skiaPaint = paint.skia
var i = 0
while (i < points.size - 3) {
val x1 = points[i]
val y1 = points[i + 1]
val x2 = points[i + 2]
val y2 = points[i + 3]
skia.drawLine(
x1,
y1,
x2,
y2,
paint.skia
)
skia.drawLine(x1, y1, x2, y2, skiaPaint)
i += stepBy * 2
}
}
}
Expand Down
Loading