Most Objective-C methods return objects with autorelease semantics.
These objects will have their retain count decremented once control
exits the scope of the current autorelease pool. A number of areas
in the code call such methods with autorelease semantics, but can't
make any guarantees about the presence of a surrounding pool.
We therefore wrap some code in explicit pool scopes to prevent
leaks.
Signed-off-by: Phil Dennis-Jordan <p...@philjordan.eu>
---
hw/display/apple-gfx.m | 88 ++++++++++++++++++++++--------------------
1 file changed, 46 insertions(+), 42 deletions(-)
diff --git a/hw/display/apple-gfx.m b/hw/display/apple-gfx.m
index c97bd40cb5..7f0a231d26 100644
--- a/hw/display/apple-gfx.m
+++ b/hw/display/apple-gfx.m
@@ -228,54 +228,56 @@ static void apple_gfx_fb_update_display(void *opaque)
return;
}
- s->new_frame = false;
+ @autoreleasepool {
+ s->new_frame = false;
- BOOL r;
- uint32_t width = surface_width(s->surface);
- uint32_t height = surface_height(s->surface);
- MTLRegion region = MTLRegionMake2D(0, 0, width, height);
- id<MTLCommandQueue> commandQueue = [s->mtl newCommandQueue];
- id<MTLCommandBuffer> mipmapCommandBuffer = [commandQueue commandBuffer];
+ BOOL r;
+ uint32_t width = surface_width(s->surface);
+ uint32_t height = surface_height(s->surface);
+ MTLRegion region = MTLRegionMake2D(0, 0, width, height);
+ id<MTLCommandQueue> commandQueue = [s->mtl newCommandQueue];
+ id<MTLCommandBuffer> mipmapCommandBuffer = [commandQueue
commandBuffer];
- r = [s->pgdisp encodeCurrentFrameToCommandBuffer:mipmapCommandBuffer
- texture:s->texture
- region:region];
+ r = [s->pgdisp encodeCurrentFrameToCommandBuffer:mipmapCommandBuffer
+ texture:s->texture
+ region:region];
- if (r != YES) {
- return;
- }
+ if (r != YES) {
+ return;
+ }
- id<MTLBlitCommandEncoder> blitCommandEncoder = [mipmapCommandBuffer
blitCommandEncoder];
- [blitCommandEncoder endEncoding];
- [mipmapCommandBuffer commit];
- [mipmapCommandBuffer waitUntilCompleted];
- [s->texture getBytes:s->vram bytesPerRow:(width * 4)
- bytesPerImage: (width * height * 4)
- fromRegion: region
- mipmapLevel: 0
- slice: 0];
-
- /* Need to render cursor manually if not supported by backend */
- if (!dpy_cursor_define_supported(s->con) && s->cursor && s->cursor_show) {
- pixman_image_t *image =
- pixman_image_create_bits(PIXMAN_a8r8g8b8,
- s->cursor->width,
- s->cursor->height,
- (uint32_t *)s->cursor->data,
- s->cursor->width * 4);
-
- pixman_image_composite(PIXMAN_OP_OVER,
- image, NULL, s->surface->image,
- 0, 0, 0, 0, s->pgdisp.cursorPosition.x,
- s->pgdisp.cursorPosition.y, s->cursor->width,
- s->cursor->height);
-
- pixman_image_unref(image);
- }
+ id<MTLBlitCommandEncoder> blitCommandEncoder = [mipmapCommandBuffer
blitCommandEncoder];
+ [blitCommandEncoder endEncoding];
+ [mipmapCommandBuffer commit];
+ [mipmapCommandBuffer waitUntilCompleted];
+ [s->texture getBytes:s->vram bytesPerRow:(width * 4)
+ bytesPerImage: (width * height * 4)
+ fromRegion: region
+ mipmapLevel: 0
+ slice: 0];
+
+ /* Need to render cursor manually if not supported by backend */
+ if (!dpy_cursor_define_supported(s->con) && s->cursor &&
s->cursor_show) {
+ pixman_image_t *image =
+ pixman_image_create_bits(PIXMAN_a8r8g8b8,
+ s->cursor->width,
+ s->cursor->height,
+ (uint32_t *)s->cursor->data,
+ s->cursor->width * 4);
+
+ pixman_image_composite(PIXMAN_OP_OVER,
+ image, NULL, s->surface->image,
+ 0, 0, 0, 0, s->pgdisp.cursorPosition.x,
+ s->pgdisp.cursorPosition.y,
s->cursor->width,
+ s->cursor->height);
+
+ pixman_image_unref(image);
+ }
- dpy_gfx_update_full(s->con);
+ dpy_gfx_update_full(s->con);
- [commandQueue release];
+ [commandQueue release];
+ }
}
static const GraphicHwOps apple_gfx_fb_ops = {
@@ -389,6 +391,7 @@ static void apple_gfx_init(Object *obj)
static void apple_gfx_realize(DeviceState *dev, Error **errp)
{
+ @autoreleasepool {
AppleGFXState *s = APPLE_GFX(dev);
PGDeviceDescriptor *desc = [PGDeviceDescriptor new];
PGDisplayDescriptor *disp_desc = [PGDisplayDescriptor new];
@@ -577,6 +580,7 @@ static void apple_gfx_realize(DeviceState *dev, Error
**errp)
QTAILQ_INIT(&s->tasks);
create_fb(s);
+ }
}
static void apple_gfx_class_init(ObjectClass *klass, void *data)
--
2.39.3 (Apple Git-146)
