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
7d28172a
Commit
7d28172a
authored
Apr 01, 2021
by
Igor Demin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix native crash when we run tests on Windows
parent
06f7945c
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
2 additions
and
16 deletions
+2
-16
render.cc
skiko/src/jvmMain/cpp/common/render.cc
+0
-6
RenderTargets.kt
...o/src/jvmMain/kotlin/org/jetbrains/skiko/RenderTargets.kt
+0
-2
Direct3DContextHandler.kt
...lin/org/jetbrains/skiko/context/Direct3DContextHandler.kt
+1
-4
MetalContextHandler.kt
...kotlin/org/jetbrains/skiko/context/MetalContextHandler.kt
+1
-4
No files found.
skiko/src/jvmMain/cpp/common/render.cc
View file @
7d28172a
...
@@ -25,12 +25,6 @@ JNIEXPORT jlong JNICALL Java_org_jetbrains_skiko_RenderTargetsKt_makeGLContextNa
...
@@ -25,12 +25,6 @@ JNIEXPORT jlong JNICALL Java_org_jetbrains_skiko_RenderTargetsKt_makeGLContextNa
return
reinterpret_cast
<
jlong
>
(
GrDirectContext
::
MakeGL
().
release
());
return
reinterpret_cast
<
jlong
>
(
GrDirectContext
::
MakeGL
().
release
());
}
}
JNIEXPORT
void
JNICALL
Java_org_jetbrains_skiko_RenderTargetsKt_destroyContext
(
JNIEnv
*
env
,
jobject
object
,
jlong
contextPtr
)
{
GrDirectContext
*
context
=
fromJavaPointer
<
GrDirectContext
*>
(
contextPtr
);
delete
context
;
}
extern
void
getMetalDeviceAndQueue
(
void
**
device
,
void
**
queue
);
extern
void
getMetalDeviceAndQueue
(
void
**
device
,
void
**
queue
);
JNIEXPORT
jlong
JNICALL
Java_org_jetbrains_skiko_RenderTargetsKt_makeMetalRenderTargetNative
(
JNIEXPORT
jlong
JNICALL
Java_org_jetbrains_skiko_RenderTargetsKt_makeMetalRenderTargetNative
(
...
...
skiko/src/jvmMain/kotlin/org/jetbrains/skiko/RenderTargets.kt
View file @
7d28172a
...
@@ -24,5 +24,3 @@ external private fun makeGLContextNative(): Long
...
@@ -24,5 +24,3 @@ external private fun makeGLContextNative(): Long
external
private
fun
makeMetalRenderTargetNative
(
width
:
Int
,
height
:
Int
,
sampleCnt
:
Int
):
Long
external
private
fun
makeMetalRenderTargetNative
(
width
:
Int
,
height
:
Int
,
sampleCnt
:
Int
):
Long
external
private
fun
makeMetalContextNative
():
Long
external
private
fun
makeMetalContextNative
():
Long
external
internal
fun
destroyContext
(
context
:
Long
)
skiko/src/jvmMain/kotlin/org/jetbrains/skiko/context/Direct3DContextHandler.kt
View file @
7d28172a
...
@@ -6,7 +6,6 @@ import org.jetbrains.skija.SurfaceColorFormat
...
@@ -6,7 +6,6 @@ import org.jetbrains.skija.SurfaceColorFormat
import
org.jetbrains.skija.SurfaceOrigin
import
org.jetbrains.skija.SurfaceOrigin
import
org.jetbrains.skija.impl.Native
import
org.jetbrains.skija.impl.Native
import
org.jetbrains.skiko.SkiaLayer
import
org.jetbrains.skiko.SkiaLayer
import
org.jetbrains.skiko.destroyContext
import
org.jetbrains.skiko.redrawer.Direct3DRedrawer
import
org.jetbrains.skiko.redrawer.Direct3DRedrawer
import
java.lang.ref.Reference
import
java.lang.ref.Reference
...
@@ -66,9 +65,7 @@ internal class Direct3DContextHandler(layer: SkiaLayer) : ContextHandler(layer)
...
@@ -66,9 +65,7 @@ internal class Direct3DContextHandler(layer: SkiaLayer) : ContextHandler(layer)
}
}
override
fun
destroyContext
()
{
override
fun
destroyContext
()
{
if
(
context
!=
null
)
{
context
?.
close
()
destroyContext
(
Native
.
getPtr
(
context
!!
))
}
if
(
device
!=
0L
)
{
if
(
device
!=
0L
)
{
directXRedrawer
.
disposeDevice
(
device
)
directXRedrawer
.
disposeDevice
(
device
)
}
}
...
...
skiko/src/jvmMain/kotlin/org/jetbrains/skiko/context/MetalContextHandler.kt
View file @
7d28172a
...
@@ -6,7 +6,6 @@ import org.jetbrains.skija.SurfaceColorFormat
...
@@ -6,7 +6,6 @@ import org.jetbrains.skija.SurfaceColorFormat
import
org.jetbrains.skija.SurfaceOrigin
import
org.jetbrains.skija.SurfaceOrigin
import
org.jetbrains.skija.impl.Native
import
org.jetbrains.skija.impl.Native
import
org.jetbrains.skiko.SkiaLayer
import
org.jetbrains.skiko.SkiaLayer
import
org.jetbrains.skiko.destroyContext
import
org.jetbrains.skiko.redrawer.MetalRedrawer
import
org.jetbrains.skiko.redrawer.MetalRedrawer
internal
class
MetalContextHandler
(
layer
:
SkiaLayer
)
:
ContextHandler
(
layer
)
{
internal
class
MetalContextHandler
(
layer
:
SkiaLayer
)
:
ContextHandler
(
layer
)
{
...
@@ -52,8 +51,6 @@ internal class MetalContextHandler(layer: SkiaLayer) : ContextHandler(layer) {
...
@@ -52,8 +51,6 @@ internal class MetalContextHandler(layer: SkiaLayer) : ContextHandler(layer) {
}
}
override
fun
destroyContext
()
{
override
fun
destroyContext
()
{
if
(
context
!=
null
)
{
context
?.
close
()
destroyContext
(
Native
.
getPtr
(
context
!!
))
}
}
}
}
}
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