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
176415a1
Unverified
Commit
176415a1
authored
Feb 10, 2022
by
Nikolay Igotti
Committed by
GitHub
Feb 10, 2022
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Allow fallback if surface cannot be created (#487)
parent
210424c7
Changes
9
Show whitespace changes
Inline
Side-by-side
Showing
9 changed files
with
19 additions
and
17 deletions
+19
-17
Renderer.android.kt
...ndroidMain/kotlin/org/jetbrains/skiko/Renderer.android.kt
+1
-1
AngleContextHandler.kt
...kotlin/org/jetbrains/skiko/context/AngleContextHandler.kt
+1
-1
MetalContextHandler.kt
...kotlin/org/jetbrains/skiko/context/MetalContextHandler.kt
+2
-1
OpenGLContextHandler.kt
...otlin/org/jetbrains/skiko/context/OpenGLContextHandler.kt
+2
-5
Surface.kt
skiko/src/commonMain/kotlin/org/jetbrains/skia/Surface.kt
+6
-5
MetalContextHandler.kt
...kotlin/org/jetbrains/skiko/context/MetalContextHandler.kt
+2
-1
CanvasRenderer.kt
...o/src/jsMain/kotlin/org/jetbrains/skiko/CanvasRenderer.kt
+1
-1
MetalContextHandler.macos.kt
.../org/jetbrains/skiko/context/MetalContextHandler.macos.kt
+2
-1
OpenGLContextHandler.macos.kt
...org/jetbrains/skiko/context/OpenGLContextHandler.macos.kt
+2
-1
No files found.
skiko/src/androidMain/kotlin/org/jetbrains/skiko/Renderer.android.kt
View file @
176415a1
...
...
@@ -164,7 +164,7 @@ private class SkikoSurfaceRender(private val layer: SkiaLayer, private val manag
SurfaceOrigin
.
BOTTOM_LEFT
,
SurfaceColorFormat
.
RGBA_8888
,
ColorSpace
.
sRGB
)
)
?:
throw
RenderException
(
"Cannot create surface"
)
canvas
=
surface
!!
.
canvas
}
...
...
skiko/src/awtMain/kotlin/org/jetbrains/skiko/context/AngleContextHandler.kt
View file @
176415a1
...
...
@@ -44,7 +44,7 @@ internal class AngleContextHandler(layer: SkiaLayer) : JvmContextHandler(layer)
SurfaceOrigin
.
BOTTOM_LEFT
,
SurfaceColorFormat
.
RGBA_8888
,
ColorSpace
.
sRGB
)
)
?:
throw
RenderException
(
"Cannot create surface"
)
canvas
=
surface
!!
.
canvas
}
...
...
skiko/src/awtMain/kotlin/org/jetbrains/skiko/context/MetalContextHandler.kt
View file @
176415a1
...
...
@@ -4,6 +4,7 @@ import org.jetbrains.skia.ColorSpace
import
org.jetbrains.skia.Surface
import
org.jetbrains.skia.SurfaceColorFormat
import
org.jetbrains.skia.SurfaceOrigin
import
org.jetbrains.skiko.RenderException
import
org.jetbrains.skiko.SkiaLayer
import
org.jetbrains.skiko.redrawer.MetalRedrawer
...
...
@@ -41,7 +42,7 @@ internal class MetalContextHandler(layer: SkiaLayer) : JvmContextHandler(layer)
SurfaceOrigin
.
TOP_LEFT
,
SurfaceColorFormat
.
BGRA_8888
,
ColorSpace
.
sRGB
)
)
?:
throw
RenderException
(
"Cannot create surface"
)
canvas
=
surface
!!
.
canvas
}
...
...
skiko/src/awtMain/kotlin/org/jetbrains/skiko/context/OpenGLContextHandler.kt
View file @
176415a1
...
...
@@ -5,10 +5,7 @@ import org.jetbrains.skia.FramebufferFormat
import
org.jetbrains.skia.Surface
import
org.jetbrains.skia.SurfaceColorFormat
import
org.jetbrains.skia.SurfaceOrigin
import
org.jetbrains.skiko.OpenGLApi
import
org.jetbrains.skiko.SkiaLayer
import
org.jetbrains.skiko.makeGLContext
import
org.jetbrains.skiko.makeGLRenderTarget
import
org.jetbrains.skiko.*
internal
class
OpenGLContextHandler
(
layer
:
SkiaLayer
)
:
JvmContextHandler
(
layer
)
{
override
fun
initContext
():
Boolean
{
...
...
@@ -60,7 +57,7 @@ internal class OpenGLContextHandler(layer: SkiaLayer) : JvmContextHandler(layer)
SurfaceOrigin
.
BOTTOM_LEFT
,
SurfaceColorFormat
.
RGBA_8888
,
ColorSpace
.
sRGB
)
)
?:
throw
RenderException
(
"Cannot create surface"
)
}
canvas
=
surface
!!
.
canvas
...
...
skiko/src/commonMain/kotlin/org/jetbrains/skia/Surface.kt
View file @
176415a1
...
...
@@ -2,6 +2,7 @@ package org.jetbrains.skia
import
org.jetbrains.skia.impl.*
import
org.jetbrains.skia.impl.Library.Companion.staticLoad
import
org.jetbrains.skiko.RenderException
class
Surface
:
RefCnt
{
companion
object
{
...
...
@@ -273,7 +274,7 @@ class Surface : RefCnt {
colorFormat
:
SurfaceColorFormat
,
colorSpace
:
ColorSpace
?,
surfaceProps
:
SurfaceProps
?
=
null
):
Surface
{
):
Surface
?
{
return
try
{
Stats
.
onNativeCall
()
val
ptr
=
_nMakeFromBackendRenderTarget
(
...
...
@@ -284,9 +285,9 @@ class Surface : RefCnt {
getPtr
(
colorSpace
),
surfaceProps
)
require
(
ptr
!=
NullPointer
)
{
"Failed Surface.makeFromBackendRenderTarget"
}
if
(
ptr
==
NullPointer
)
null
else
Surface
(
ptr
,
context
,
rt
)
}
finally
{
reachabilityBarrier
(
context
)
...
...
skiko/src/iosMain/kotlin/org/jetbrains/skiko/context/MetalContextHandler.kt
View file @
176415a1
...
...
@@ -5,6 +5,7 @@ import org.jetbrains.skia.ColorSpace
import
org.jetbrains.skia.Surface
import
org.jetbrains.skia.SurfaceColorFormat
import
org.jetbrains.skia.SurfaceOrigin
import
org.jetbrains.skiko.RenderException
import
org.jetbrains.skiko.SkiaLayer
import
org.jetbrains.skiko.redrawer.MetalRedrawer
...
...
@@ -54,7 +55,7 @@ internal class MetalContextHandler(layer: SkiaLayer) : ContextHandler(layer, lay
SurfaceOrigin
.
TOP_LEFT
,
SurfaceColorFormat
.
BGRA_8888
,
ColorSpace
.
sRGB
)
)
?:
throw
RenderException
(
"Cannot create surface"
)
canvas
=
surface
!!
.
canvas
}
...
...
skiko/src/jsMain/kotlin/org/jetbrains/skiko/CanvasRenderer.kt
View file @
176415a1
...
...
@@ -68,7 +68,7 @@ abstract class CanvasRenderer constructor(val htmlCanvas: HTMLCanvasElement) {
SurfaceOrigin
.
BOTTOM_LEFT
,
SurfaceColorFormat
.
RGBA_8888
,
ColorSpace
.
sRGB
)
)
?:
throw
RenderException
(
"Cannot create surface"
)
canvas
=
surface
!!
.
canvas
}
...
...
skiko/src/macosMain/kotlin/org/jetbrains/skiko/context/MetalContextHandler.macos.kt
View file @
176415a1
...
...
@@ -5,6 +5,7 @@ import org.jetbrains.skia.ColorSpace
import
org.jetbrains.skia.Surface
import
org.jetbrains.skia.SurfaceColorFormat
import
org.jetbrains.skia.SurfaceOrigin
import
org.jetbrains.skiko.RenderException
import
org.jetbrains.skiko.SkiaLayer
import
org.jetbrains.skiko.redrawer.MacOsMetalRedrawer
...
...
@@ -39,7 +40,7 @@ internal class MacOsMetalContextHandler(layer: SkiaLayer) : ContextHandler(layer
SurfaceOrigin
.
TOP_LEFT
,
SurfaceColorFormat
.
BGRA_8888
,
ColorSpace
.
sRGB
)
)
?:
throw
RenderException
(
"Cannot create surface"
)
canvas
=
surface
!!
.
canvas
}
...
...
skiko/src/macosMain/kotlin/org/jetbrains/skiko/context/OpenGLContextHandler.macos.kt
View file @
176415a1
...
...
@@ -2,6 +2,7 @@ package org.jetbrains.skiko.context
import
kotlinx.cinterop.*
import
org.jetbrains.skia.*
import
org.jetbrains.skiko.RenderException
import
org.jetbrains.skiko.SkiaLayer
import
platform.OpenGL.GL_DRAW_FRAMEBUFFER_BINDING
import
platform.OpenGL.glGetIntegerv
...
...
@@ -62,7 +63,7 @@ internal class MacOSOpenGLContextHandler(layer: SkiaLayer) : ContextHandler(laye
SurfaceOrigin
.
BOTTOM_LEFT
,
SurfaceColorFormat
.
RGBA_8888
,
ColorSpace
.
sRGB
)
)
?:
throw
RenderException
(
"Cannot create surface"
)
canvas
=
surface
?.
canvas
?:
error
(
"Could not obtain Canvas from Surface"
)
...
...
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