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
09742091
Commit
09742091
authored
Feb 01, 2021
by
Roman Sedaikin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Renamed RASTER -> SOFTWARE, D3D -> DIRECT3D
parent
29d1fac3
Changes
6
Show whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
9 additions
and
10 deletions
+9
-10
App.kt
...kijaInjectSample/src/main/kotlin/SkijaInjectSample/App.kt
+0
-1
GraphicsApi.kt
skiko/src/jvmMain/kotlin/org/jetbrains/skiko/GraphicsApi.kt
+1
-1
PlatformOperations.kt
.../jvmMain/kotlin/org/jetbrains/skiko/PlatformOperations.kt
+3
-3
SkiaLayer.kt
skiko/src/jvmMain/kotlin/org/jetbrains/skiko/SkiaLayer.kt
+2
-2
ContextHandler.kt
...Main/kotlin/org/jetbrains/skiko/context/ContextHandler.kt
+2
-2
SoftwareContextHandler.kt
...lin/org/jetbrains/skiko/context/SoftwareContextHandler.kt
+1
-1
No files found.
samples/SkijaInjectSample/src/main/kotlin/SkijaInjectSample/App.kt
View file @
09742091
...
...
@@ -15,7 +15,6 @@ import kotlin.math.cos
import
kotlin.math.sin
fun
main
(
args
:
Array
<
String
>)
{
// System.setProperty("skiko.renderApi", "RASTER")
repeat
(
1
)
{
createWindow
(
"window $it"
)
}
...
...
skiko/src/jvmMain/kotlin/org/jetbrains/skiko/GraphicsApi.kt
View file @
09742091
package
org.jetbrains.skiko
enum
class
GraphicsApi
{
UNKNOWN
,
RASTER
,
OPENGL
,
D
3D
,
VULKAN
,
METAL
UNKNOWN
,
SOFTWARE
,
OPENGL
,
DIRECT
3D
,
VULKAN
,
METAL
}
\ No newline at end of file
skiko/src/jvmMain/kotlin/org/jetbrains/skiko/PlatformOperations.kt
View file @
09742091
...
...
@@ -34,7 +34,7 @@ internal val platformOperations: PlatformOperations by lazy {
}
override
fun
createRedrawer
(
layer
:
HardwareLayer
)
=
when
(
renderApi
)
{
GraphicsApi
.
RASTER
->
RasterRedrawer
(
layer
)
GraphicsApi
.
SOFTWARE
->
RasterRedrawer
(
layer
)
else
->
MacOsRedrawer
(
layer
)
}
}
...
...
@@ -57,7 +57,7 @@ internal val platformOperations: PlatformOperations by lazy {
}
override
fun
createRedrawer
(
layer
:
HardwareLayer
)
=
when
(
renderApi
)
{
GraphicsApi
.
RASTER
->
RasterRedrawer
(
layer
)
GraphicsApi
.
SOFTWARE
->
RasterRedrawer
(
layer
)
else
->
WindowsRedrawer
(
layer
)
}
}
...
...
@@ -93,7 +93,7 @@ internal val platformOperations: PlatformOperations by lazy {
}
override
fun
createRedrawer
(
layer
:
HardwareLayer
)
=
when
(
renderApi
)
{
GraphicsApi
.
RASTER
->
RasterRedrawer
(
layer
)
GraphicsApi
.
SOFTWARE
->
RasterRedrawer
(
layer
)
else
->
LinuxRedrawer
(
layer
)
}
}
...
...
skiko/src/jvmMain/kotlin/org/jetbrains/skiko/SkiaLayer.kt
View file @
09742091
...
...
@@ -4,7 +4,7 @@ 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.
Raster
ContextHandler
import
org.jetbrains.skiko.context.
Software
ContextHandler
import
java.awt.Graphics
import
javax.swing.SwingUtilities.isEventDispatchThread
...
...
@@ -136,7 +136,7 @@ open class SkiaLayer : HardwareLayer() {
private
fun
fallbackToRaster
()
{
println
(
"Falling back to software rendering..."
)
redrawer
?.
dispose
()
skijaState
=
Raster
ContextHandler
(
this
)
skijaState
=
Software
ContextHandler
(
this
)
redrawer
=
RasterRedrawer
(
this
)
needRedraw
()
}
...
...
skiko/src/jvmMain/kotlin/org/jetbrains/skiko/context/ContextHandler.kt
View file @
09742091
...
...
@@ -22,7 +22,7 @@ internal val renderApi: GraphicsApi by lazy {
private
fun
parseRenderApi
(
text
:
String
?):
GraphicsApi
{
when
(
text
)
{
"
RASTER"
->
return
GraphicsApi
.
RASTER
"
SOFTWARE"
->
return
GraphicsApi
.
SOFTWARE
"OPENGL"
->
return
GraphicsApi
.
OPENGL
else
->
return
GraphicsApi
.
OPENGL
}
...
...
@@ -30,7 +30,7 @@ private fun parseRenderApi(text: String?): GraphicsApi {
internal
fun
createContextHandler
(
layer
:
HardwareLayer
):
ContextHandler
{
return
when
(
renderApi
)
{
GraphicsApi
.
RASTER
->
Raster
ContextHandler
(
layer
)
GraphicsApi
.
SOFTWARE
->
Software
ContextHandler
(
layer
)
GraphicsApi
.
OPENGL
->
OpenGLContextHandler
(
layer
)
else
->
TODO
(
"Unsupported yet"
)
}
...
...
skiko/src/jvmMain/kotlin/org/jetbrains/skiko/context/
Raster
ContextHandler.kt
→
skiko/src/jvmMain/kotlin/org/jetbrains/skiko/context/
Software
ContextHandler.kt
View file @
09742091
...
...
@@ -18,7 +18,7 @@ import org.jetbrains.skiko.HardwareLayer
import
org.jetbrains.skija.ImageInfo
import
org.jetbrains.skija.Picture
internal
class
Raster
ContextHandler
(
layer
:
HardwareLayer
)
:
ContextHandler
(
layer
)
{
internal
class
Software
ContextHandler
(
layer
:
HardwareLayer
)
:
ContextHandler
(
layer
)
{
override
val
bleachConstant
=
-
1
// it looks like java.awt.Canvas doesn't support transparency
val
colorModel
=
ComponentColorModel
(
...
...
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