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
1f022991
Unverified
Commit
1f022991
authored
Oct 15, 2021
by
Nikolay Igotti
Committed by
GitHub
Oct 15, 2021
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add IOS to OS list (#272)
parent
a9c683b3
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
6 additions
and
5 deletions
+6
-5
OsArch.kt
skiko/src/commonMain/kotlin/org/jetbrains/skiko/OsArch.kt
+1
-0
SkiaLayer.ios.kt
...o/src/iosMain/kotlin/org/jetbrains/skiko/SkiaLayer.ios.kt
+0
-1
PlatformOperations.kt
.../jvmMain/kotlin/org/jetbrains/skiko/PlatformOperations.kt
+1
-1
RenderFactory.jvm.kt
...c/jvmMain/kotlin/org/jetbrains/skiko/RenderFactory.jvm.kt
+1
-1
SkikoProperties.kt
...src/jvmMain/kotlin/org/jetbrains/skiko/SkikoProperties.kt
+2
-2
OsArch.native.kt
...rc/nativeMain/kotlin/org/jetbrains/skiko/OsArch.native.kt
+1
-0
No files found.
skiko/src/commonMain/kotlin/org/jetbrains/skiko/OsArch.kt
View file @
1f022991
...
...
@@ -4,6 +4,7 @@ enum class OS(val id: String) {
Linux
(
"linux"
),
Windows
(
"windows"
),
MacOS
(
"macos"
),
Ios
(
"ios"
),
JS
(
"js"
)
;
...
...
skiko/src/iosMain/kotlin/org/jetbrains/skiko/SkiaLayer.ios.kt
View file @
1f022991
...
...
@@ -71,7 +71,6 @@ actual open class SkiaLayer actual constructor(
contextHandler
.
apply
{
if
(!
initContext
())
{
error
(
"initContext() failure"
)
return
}
initCanvas
()
clearCanvas
()
...
...
skiko/src/jvmMain/kotlin/org/jetbrains/skiko/PlatformOperations.kt
View file @
1f022991
...
...
@@ -85,7 +85,7 @@ internal val platformOperations: PlatformOperations by lazy {
}
}
}
OS
.
JS
->
{
OS
.
JS
,
OS
.
Ios
->
{
TODO
(
"Commonize me"
)
}
}
...
...
skiko/src/jvmMain/kotlin/org/jetbrains/skiko/RenderFactory.jvm.kt
View file @
1f022991
...
...
@@ -39,7 +39,7 @@ internal actual fun makeDefaultRenderFactory(): RenderFactory {
GraphicsApi
.
DIRECT_SOFTWARE
->
LinuxSoftwareRedrawer
(
layer
,
properties
)
else
->
LinuxOpenGLRedrawer
(
layer
,
properties
)
}
OS
.
JS
->
{
OS
.
JS
,
OS
.
Ios
->
{
TODO
(
"Commonize me"
)
}
}
...
...
skiko/src/jvmMain/kotlin/org/jetbrains/skiko/SkikoProperties.kt
View file @
1f022991
...
...
@@ -56,7 +56,7 @@ internal object SkikoProperties {
OS
.
MacOS
->
return
GraphicsApi
.
METAL
OS
.
Linux
->
return
GraphicsApi
.
OPENGL
OS
.
Windows
->
return
GraphicsApi
.
DIRECT3D
OS
.
JS
->
TODO
(
"commonize me"
)
OS
.
JS
,
OS
.
Ios
->
TODO
(
"commonize me"
)
}
}
...
...
@@ -68,7 +68,7 @@ internal object SkikoProperties {
OS
.
Linux
->
renderApiList
=
mutableListOf
(
GraphicsApi
.
OPENGL
,
GraphicsApi
.
DIRECT_SOFTWARE
,
GraphicsApi
.
SOFTWARE
)
OS
.
MacOS
->
renderApiList
=
mutableListOf
(
GraphicsApi
.
METAL
,
GraphicsApi
.
SOFTWARE
)
OS
.
Windows
->
renderApiList
=
mutableListOf
(
GraphicsApi
.
DIRECT3D
,
GraphicsApi
.
OPENGL
,
GraphicsApi
.
DIRECT_SOFTWARE
,
GraphicsApi
.
SOFTWARE
)
OS
.
JS
->
TODO
(
"commonize me"
)
OS
.
JS
,
OS
.
Ios
->
TODO
(
"commonize me"
)
}
renderApiList
.
remove
(
head
)
...
...
skiko/src/nativeMain/kotlin/org/jetbrains/skiko/OsArch.native.kt
View file @
1f022991
...
...
@@ -5,6 +5,7 @@ actual val hostOs: OS by lazy {
OsFamily
.
MACOSX
->
OS
.
MacOS
OsFamily
.
LINUX
->
OS
.
Linux
OsFamily
.
WINDOWS
->
OS
.
Windows
OsFamily
.
IOS
->
OS
.
Ios
else
->
throw
Error
(
"Unsupported OS ${Platform.osFamily}"
)
}
}
...
...
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