Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
S
skiko
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
liuqiang
skiko
Commits
c02c672c
Commit
c02c672c
authored
Jan 28, 2021
by
Roman Sedaikin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Added fallback to raster if skia failed to create hardware context.
parent
48e4d6e7
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
36 additions
and
11 deletions
+36
-11
App.kt
...kijaInjectSample/src/main/kotlin/SkijaInjectSample/App.kt
+1
-1
SkiaLayer.kt
skiko/src/jvmMain/kotlin/org/jetbrains/skiko/SkiaLayer.kt
+14
-2
ContextHandler.kt
...Main/kotlin/org/jetbrains/skiko/context/ContextHandler.kt
+1
-1
MetalContextHandler.kt
...kotlin/org/jetbrains/skiko/context/MetalContextHandler.kt
+9
-3
OpenGLContextHandler.kt
...otlin/org/jetbrains/skiko/context/OpenGLContextHandler.kt
+9
-3
RasterContextHandler.kt
...otlin/org/jetbrains/skiko/context/RasterContextHandler.kt
+2
-1
No files found.
samples/SkijaInjectSample/src/main/kotlin/SkijaInjectSample/App.kt
View file @
c02c672c
...
...
@@ -15,7 +15,7 @@ import kotlin.math.cos
import
kotlin.math.sin
fun
main
(
args
:
Array
<
String
>)
{
System
.
setProperty
(
"skiko.renderApi"
,
"RASTER"
)
//
System.setProperty("skiko.renderApi", "RASTER")
repeat
(
1
)
{
createWindow
(
"window $it"
)
}
...
...
skiko/src/jvmMain/kotlin/org/jetbrains/skiko/SkiaLayer.kt
View file @
c02c672c
...
...
@@ -2,7 +2,9 @@ package org.jetbrains.skiko
import
org.jetbrains.skija.*
import
org.jetbrains.skiko.redrawer.Redrawer
import
org.jetbrains.skiko.redrawer.RasterRedrawer
import
org.jetbrains.skiko.context.createContextHandler
import
org.jetbrains.skiko.context.RasterContextHandler
import
java.awt.Graphics
import
javax.swing.SwingUtilities.isEventDispatchThread
...
...
@@ -16,7 +18,7 @@ open class SkiaLayer : HardwareLayer() {
var
renderer
:
SkiaRenderer
?
=
null
val
clipComponents
=
mutableListOf
<
ClipRectangle
>()
private
val
skijaState
=
createContextHandler
(
this
)
internal
var
skijaState
=
createContextHandler
(
this
)
@Volatile
private
var
isDisposed
=
false
...
...
@@ -101,7 +103,10 @@ open class SkiaLayer : HardwareLayer() {
override
fun
draw
()
{
check
(!
isDisposed
)
skijaState
.
apply
{
initContext
()
if
(!
initContext
())
{
fallbackToRaster
()
return
}
initCanvas
()
clearCanvas
()
synchronized
(
pictureLock
)
{
...
...
@@ -127,4 +132,11 @@ open class SkiaLayer : HardwareLayer() {
true
)
}
private
fun
fallbackToRaster
()
{
println
(
"Falling back to software rendering..."
)
skijaState
=
RasterContextHandler
(
this
)
redrawer
=
RasterRedrawer
(
this
)
needRedraw
()
}
}
skiko/src/jvmMain/kotlin/org/jetbrains/skiko/context/ContextHandler.kt
View file @
c02c672c
...
...
@@ -46,7 +46,7 @@ internal abstract class ContextHandler(val layer: HardwareLayer) {
var
surface
:
Surface
?
=
null
var
canvas
:
Canvas
?
=
null
abstract
fun
initContext
()
abstract
fun
initContext
()
:
Boolean
abstract
fun
initCanvas
()
...
...
skiko/src/jvmMain/kotlin/org/jetbrains/skiko/context/MetalContextHandler.kt
View file @
c02c672c
...
...
@@ -10,10 +10,16 @@ import org.jetbrains.skiko.makeMetalContext
import
org.jetbrains.skiko.makeMetalRenderTarget
internal
class
MetalContextHandler
(
layer
:
HardwareLayer
)
:
ContextHandler
(
layer
)
{
override
fun
initContext
()
{
if
(
context
==
null
)
{
context
=
makeMetalContext
()
override
fun
initContext
():
Boolean
{
try
{
if
(
context
==
null
)
{
context
=
makeMetalContext
()
}
}
catch
(
e
:
Exception
)
{
println
(
"Failed to create Skia Metal context!"
)
return
false
}
return
true
}
override
fun
initCanvas
()
{
...
...
skiko/src/jvmMain/kotlin/org/jetbrains/skiko/context/OpenGLContextHandler.kt
View file @
c02c672c
...
...
@@ -12,10 +12,16 @@ import org.jetbrains.skiko.makeGLRenderTarget
import
org.jetbrains.skiko.OpenGLApi
internal
class
OpenGLContextHandler
(
layer
:
HardwareLayer
)
:
ContextHandler
(
layer
)
{
override
fun
initContext
()
{
if
(
context
==
null
)
{
context
=
makeGLContext
()
override
fun
initContext
():
Boolean
{
try
{
if
(
context
==
null
)
{
context
=
makeGLContext
()
}
}
catch
(
e
:
Exception
)
{
println
(
"Failed to create Skia OpenGL context!"
)
return
false
}
return
true
}
override
fun
initCanvas
()
{
...
...
skiko/src/jvmMain/kotlin/org/jetbrains/skiko/context/RasterContextHandler.kt
View file @
c02c672c
...
...
@@ -33,8 +33,9 @@ internal class RasterContextHandler(layer: HardwareLayer) : ContextHandler(layer
var
imageData
:
ByteArray
?
=
null
var
raster
:
WritableRaster
?
=
null
override
fun
initContext
()
{
override
fun
initContext
()
:
Boolean
{
// Raster does not need context
return
true
}
override
fun
initCanvas
()
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment