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
c412e811
Unverified
Commit
c412e811
authored
Nov 16, 2020
by
Nikolay Igotti
Committed by
GitHub
Nov 16, 2020
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Move to Skia m88. (#18)
parent
9c99e212
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
12 additions
and
12 deletions
+12
-12
gradle.properties
skiko/gradle.properties
+4
-4
render.cc
skiko/src/jvmMain/cpp/common/render.cc
+3
-3
RenderTargets.kt
...o/src/jvmMain/kotlin/org/jetbrains/skiko/RenderTargets.kt
+3
-3
SkiaWindow.kt
skiko/src/jvmMain/kotlin/org/jetbrains/skiko/SkiaWindow.kt
+2
-2
No files found.
skiko/gradle.properties
View file @
c412e811
kotlin.code.style
=
official
deploy.version
=
0.1
dependencies.skija.git.commit
=
cb6bbba2362726cb9c2524f14aada88ae8958331
dependencies.skia.windows
=
m8
7-4893488/Skia-m87-4893488
-windows-Release-x64
dependencies.skia.linux
=
m8
7-4893488/Skia-m87-4893488
-linux-Release-x64
dependencies.skia.macos
=
m8
7-4893488/Skia-m87-4893488
-macos-Release-x64
dependencies.skija.git.commit
=
8fc45764727610bd4b3d228198432f6f327a34ad
dependencies.skia.windows
=
m8
8-59bafeeaa7/Skia-m88-59bafeeaa7
-windows-Release-x64
dependencies.skia.linux
=
m8
8-59bafeeaa7/Skia-m88-59bafeeaa7
-linux-Release-x64
dependencies.skia.macos
=
m8
8-59bafeeaa7/Skia-m88-59bafeeaa7
-macos-Release-x64
skiko/src/jvmMain/cpp/common/render.cc
View file @
c412e811
#include <jni.h>
#include "GrBackendSurface.h"
#include "GrContext.h"
#include "Gr
Direct
Context.h"
extern
"C"
{
...
...
@@ -16,7 +16,7 @@ JNIEXPORT jlong JNICALL Java_org_jetbrains_skiko_RenderTargetsKt_makeGLRenderTar
}
JNIEXPORT
jlong
JNICALL
Java_org_jetbrains_skiko_RenderTargetsKt_makeGLContextNative
(
JNIEnv
*
env
,
jclass
jclass
)
{
return
reinterpret_cast
<
jlong
>
(
GrContext
::
MakeGL
().
release
());
return
reinterpret_cast
<
jlong
>
(
Gr
Direct
Context
::
MakeGL
().
release
());
}
extern
void
getMetalDeviceAndQueue
(
void
**
device
,
void
**
queue
);
...
...
@@ -38,7 +38,7 @@ JNIEXPORT jlong JNICALL Java_org_jetbrains_skiko_RenderTargetsKt_makeMetalContex
void
*
device
=
nullptr
;
void
*
queue
=
nullptr
;
getMetalDeviceAndQueue
(
&
device
,
&
queue
);
return
reinterpret_cast
<
jlong
>
(
GrContext
::
MakeMetal
(
device
,
queue
).
release
());
return
reinterpret_cast
<
jlong
>
(
Gr
Direct
Context
::
MakeMetal
(
device
,
queue
).
release
());
#else
return
0
;
#endif
...
...
skiko/src/jvmMain/kotlin/org/jetbrains/skiko/RenderTargets.kt
View file @
c412e811
package
org.jetbrains.skiko
import
org.jetbrains.skija.BackendRenderTarget
import
org.jetbrains.skija.Context
import
org.jetbrains.skija.
Direct
Context
internal
fun
makeGLContext
()
=
Context
(
internal
fun
makeGLContext
()
=
Direct
Context
(
makeGLContextNative
()
)
...
...
@@ -15,7 +15,7 @@ internal fun makeMetalRenderTarget(width: Int, height: Int, sampleCnt: Int) = Ba
makeMetalRenderTargetNative
(
width
,
height
,
sampleCnt
).
also
{
if
(
it
==
0L
)
TODO
(
"not yet supported"
)
}
)
internal
fun
makeMetalContext
()
=
Context
(
internal
fun
makeMetalContext
()
=
Direct
Context
(
makeMetalContextNative
().
also
{
if
(
it
==
0L
)
TODO
(
"not yet supported"
)
}
)
...
...
skiko/src/jvmMain/kotlin/org/jetbrains/skiko/SkiaWindow.kt
View file @
c412e811
...
...
@@ -6,14 +6,14 @@ import javax.swing.JFrame
import
org.jetbrains.skija.BackendRenderTarget
import
org.jetbrains.skija.Canvas
import
org.jetbrains.skija.ColorSpace
import
org.jetbrains.skija.Context
import
org.jetbrains.skija.
Direct
Context
import
org.jetbrains.skija.FramebufferFormat
import
org.jetbrains.skija.Surface
import
org.jetbrains.skija.SurfaceColorFormat
import
org.jetbrains.skija.SurfaceOrigin
private
class
SkijaState
{
var
context
:
Context
?
=
null
var
context
:
Direct
Context
?
=
null
var
renderTarget
:
BackendRenderTarget
?
=
null
var
surface
:
Surface
?
=
null
var
canvas
:
Canvas
?
=
null
...
...
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