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
64946688
Unverified
Commit
64946688
authored
Jul 23, 2021
by
Nikolay Igotti
Committed by
GitHub
Jul 23, 2021
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix memory leak. (#140)
parent
b3fb7a60
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
54 additions
and
41 deletions
+54
-41
MetalRedrawer.kt
...Main/kotlin/org/jetbrains/skiko/redrawer/MetalRedrawer.kt
+26
-21
MetalRedrawer.mm
skiko/src/jvmMain/objectiveC/macos/MetalRedrawer.mm
+28
-20
No files found.
skiko/src/jvmMain/kotlin/org/jetbrains/skiko/redrawer/MetalRedrawer.kt
View file @
64946688
...
...
@@ -16,7 +16,7 @@ import javax.swing.SwingUtilities.getRootPane
internal
class
MetalRedrawer
(
private
val
layer
:
SkiaLayer
,
pr
ivate
val
pr
operties
:
SkiaLayerProperties
properties
:
SkiaLayerProperties
)
:
Redrawer
{
private
var
isDisposed
=
false
private
var
disposeLock
=
Any
()
...
...
@@ -58,6 +58,8 @@ internal class MetalRedrawer(
}
private
suspend
fun
draw
()
{
withContext
(
Dispatchers
.
IO
)
{
val
handle
=
startRendering
()
if
(
layer
.
prepareDrawContext
())
{
// 2,3 GHz 8-Core Intel Core i9
//
...
...
@@ -70,26 +72,27 @@ internal class MetalRedrawer(
//
// Executors.newSingleThreadExecutor().asCoroutineDispatcher(): 50 FPS, 150% CPU
// Dispatchers.IO: 50 FPS, 200% CPU
withContext
(
Dispatchers
.
IO
)
{
synchronized
(
disposeLock
)
{
if
(!
isDisposed
)
{
layer
.
draw
()
}
}
}
endRendering
(
handle
)
}
// When window is not visible - it doesn't make sense to redraw fast to avoid battery drain.
// In theory, we could be more precise, and just suspend rendering in
// `NSWindowDidChangeOcclusionStateNotification`, but current approach seems to work as well in practise.
if
(
isOccluded
(
windowHandle
))
delay
(
300
)
}
}
override
fun
syncSize
()
{
val
rootPane
=
getRootPane
(
layer
)
val
globalPosition
=
convertPoint
(
layer
,
layer
.
x
,
layer
.
y
,
rootPane
)
setContentScale
(
device
,
layer
.
contentScale
)
resizeLayers
(
device
,
resizeLayers
(
device
,
globalPosition
.
x
,
rootPane
.
height
-
globalPosition
.
y
-
layer
.
height
,
layer
.
width
.
coerceAtLeast
(
0
),
...
...
@@ -130,4 +133,6 @@ internal class MetalRedrawer(
private
external
fun
isOccluded
(
window
:
Long
):
Boolean
private
external
fun
getAdapterName
(
device
:
Long
):
String
private
external
fun
getAdapterMemorySize
(
device
:
Long
):
Long
private
external
fun
startRendering
():
Long
private
external
fun
endRendering
(
handle
:
Long
)
}
skiko/src/jvmMain/objectiveC/macos/MetalRedrawer.mm
View file @
64946688
...
...
@@ -101,17 +101,30 @@ JNIEXPORT jlong JNICALL Java_org_jetbrains_skiko_redrawer_MetalRedrawer_makeMeta
MetalDevice *device = (MetalDevice *) devicePtr;
GrBackendRenderTarget* renderTarget = NULL;
@autoreleasepool {
id<CAMetalDrawable> currentDrawable = [device.layer nextDrawable];
if (!currentDrawable) return 0;
device.drawableHandle = currentDrawable;
GrMtlTextureInfo info;
info.fTexture.retain(currentDrawable.texture);
renderTarget = new GrBackendRenderTarget(width, height, 0, info);
}
return (jlong) renderTarget;
}
extern "C" void* objc_autoreleasePoolPush(void);
extern "C" void objc_autoreleasePoolPop(void*);
JNIEXPORT jlong JNICALL Java_org_jetbrains_skiko_redrawer_MetalRedrawer_startRendering(
JNIEnv * env, jobject redrawer)
{
return (jlong)objc_autoreleasePoolPush();
}
JNIEXPORT void JNICALL Java_org_jetbrains_skiko_redrawer_MetalRedrawer_endRendering(
JNIEnv * env, jobject redrawer, jlong handle)
{
objc_autoreleasePoolPop((void*)handle);
}
BOOL isUsingIntegratedGPU() {
kern_return_t kernResult = 0;
io_iterator_t iterator = IO_OBJECT_NULL;
...
...
@@ -241,18 +254,13 @@ JNIEXPORT void JNICALL Java_org_jetbrains_skiko_redrawer_MetalRedrawer_finishFra
id<CAMetalDrawable> currentDrawable = device.drawableHandle;
if (currentDrawable) {
id<MTLCommandBuffer> commandBuffer = [device.queue commandBuffer];
commandBuffer.label = @"Present";
[currentDrawable addPresentedHandler:^(id<MTLDrawable> dr) {
CFRelease(currentDrawable);
}];
[commandBuffer presentDrawable:currentDrawable];
[commandBuffer commit];
device.drawableHandle = nil;
currentDrawable = nil;
}
}
JNIEXPORT void JNICALL Java_org_jetbrains_skiko_redrawer_MetalRedrawer_disposeDevice(
...
...
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