Skip to content

Commit

Permalink
Fixed Metal renderer memory leak
Browse files Browse the repository at this point in the history
  • Loading branch information
@slouken
slouken committed Dec 8, 2017
1 parent 81a3398 commit c403c0f
Showing 1 changed file with 29 additions and 29 deletions.
58 changes: 29 additions & 29 deletions src/render/metal/SDL_render_metal.m
View file
Expand Up @@ -370,17 +370,17 @@ static void METAL_ActivateRenderer(SDL_Renderer * renderer)

static int
METAL_GetOutputSize(SDL_Renderer * renderer, int *w, int *h)
{
{ @autoreleasepool {
METAL_ActivateRenderer(renderer);
METAL_RenderData *data = (__bridge METAL_RenderData *) renderer->driverdata;
*w = (int) data.mtlbackbuffer.texture.width;
*h = (int) data.mtlbackbuffer.texture.height;
return 0;
}
}}

static int
METAL_CreateTexture(SDL_Renderer * renderer, SDL_Texture * texture)
{
{ @autoreleasepool {
METAL_RenderData *data = (__bridge METAL_RenderData *) renderer->driverdata;
MTLPixelFormat mtlpixfmt;

Expand All @@ -405,20 +405,20 @@ static void METAL_ActivateRenderer(SDL_Renderer * renderer)
texture->driverdata = (void*)CFBridgingRetain(mtltexture);

return 0;
}
}}

static int
METAL_UpdateTexture(SDL_Renderer * renderer, SDL_Texture * texture,
const SDL_Rect * rect, const void *pixels, int pitch)
{
{ @autoreleasepool {
// !!! FIXME: this is a synchronous call; it doesn't return until data is uploaded in some form.
// !!! FIXME: Maybe move this off to a thread that marks the texture as uploaded and only stall the main thread if we try to
// !!! FIXME: use this texture before the marking is done? Is it worth it? Or will we basically always be uploading a bunch of
// !!! FIXME: stuff way ahead of time and/or using it immediately after upload?
id<MTLTexture> mtltexture = (__bridge id<MTLTexture>) texture->driverdata;
[mtltexture replaceRegion:MTLRegionMake2D(rect->x, rect->y, rect->w, rect->h) mipmapLevel:0 withBytes:pixels bytesPerRow:pitch];
return 0;
}
}}

static int
METAL_UpdateTextureYUV(SDL_Renderer * renderer, SDL_Texture * texture,
Expand All @@ -445,17 +445,17 @@ static void METAL_ActivateRenderer(SDL_Renderer * renderer)

static int
METAL_SetRenderTarget(SDL_Renderer * renderer, SDL_Texture * texture)
{
{ @autoreleasepool {
METAL_ActivateRenderer(renderer);
METAL_RenderData *data = (__bridge METAL_RenderData *) renderer->driverdata;
id<MTLTexture> mtltexture = texture ? (__bridge id<MTLTexture>) texture->driverdata : nil;
data.mtlpassdesc.colorAttachments[0].texture = mtltexture;
return 0;
}
}}

static int
METAL_UpdateViewport(SDL_Renderer * renderer)
{
{ @autoreleasepool {
METAL_ActivateRenderer(renderer);
METAL_RenderData *data = (__bridge METAL_RenderData *) renderer->driverdata;
MTLViewport viewport;
Expand All @@ -467,15 +467,15 @@ static void METAL_ActivateRenderer(SDL_Renderer * renderer)
viewport.zfar = 1.0;
[data.mtlcmdencoder setViewport:viewport];
return 0;
}
}}

static int
METAL_UpdateClipRect(SDL_Renderer * renderer)
{
// !!! FIXME: should this care about the viewport?
{ @autoreleasepool {
METAL_ActivateRenderer(renderer);
METAL_RenderData *data = (__bridge METAL_RenderData *) renderer->driverdata;
MTLScissorRect mtlrect;
// !!! FIXME: should this care about the viewport?
if (renderer->clipping_enabled) {
const SDL_Rect *rect = &renderer->clip_rect;
mtlrect.x = renderer->viewport.x + rect->x;
Expand All @@ -492,11 +492,11 @@ static void METAL_ActivateRenderer(SDL_Renderer * renderer)
[data.mtlcmdencoder setScissorRect:mtlrect];
}
return 0;
}
}}

static int
METAL_RenderClear(SDL_Renderer * renderer)
{
{ @autoreleasepool {
// We could dump the command buffer and force a clear on a new one, but this will respect the scissor state.
METAL_ActivateRenderer(renderer);
METAL_RenderData *data = (__bridge METAL_RenderData *) renderer->driverdata;
Expand Down Expand Up @@ -528,7 +528,7 @@ static void METAL_ActivateRenderer(SDL_Renderer * renderer)
[data.mtlcmdencoder setViewport:viewport];

return 0;
}
}}

// normalize a value from 0.0f to len into -1.0f to 1.0f.
static inline float
Expand Down Expand Up @@ -556,7 +556,7 @@ static void METAL_ActivateRenderer(SDL_Renderer * renderer)
static int
DrawVerts(SDL_Renderer * renderer, const SDL_FPoint * points, int count,
const MTLPrimitiveType primtype)
{
{ @autoreleasepool {
METAL_ActivateRenderer(renderer);

const size_t vertlen = (sizeof (float) * 2) * count;
Expand Down Expand Up @@ -588,7 +588,7 @@ static void METAL_ActivateRenderer(SDL_Renderer * renderer)

SDL_free(verts);
return 0;
}
}}

static int
METAL_RenderDrawPoints(SDL_Renderer * renderer, const SDL_FPoint * points, int count)
Expand All @@ -604,7 +604,7 @@ static void METAL_ActivateRenderer(SDL_Renderer * renderer)

static int
METAL_RenderFillRects(SDL_Renderer * renderer, const SDL_FRect * rects, int count)
{
{ @autoreleasepool {
METAL_ActivateRenderer(renderer);
METAL_RenderData *data = (__bridge METAL_RenderData *) renderer->driverdata;

Expand Down Expand Up @@ -633,12 +633,12 @@ static void METAL_ActivateRenderer(SDL_Renderer * renderer)
}

return 0;
}
}}

static int
METAL_RenderCopy(SDL_Renderer * renderer, SDL_Texture * texture,
const SDL_Rect * srcrect, const SDL_FRect * dstrect)
{
{ @autoreleasepool {
METAL_ActivateRenderer(renderer);
METAL_RenderData *data = (__bridge METAL_RenderData *) renderer->driverdata;
id<MTLTexture> mtltexture = (__bridge id<MTLTexture>) texture->driverdata;
Expand Down Expand Up @@ -679,7 +679,7 @@ static void METAL_ActivateRenderer(SDL_Renderer * renderer)
[data.mtlcmdencoder drawPrimitives:MTLPrimitiveTypeTriangleStrip vertexStart:0 vertexCount:5];

return 0;
}
}}

static int
METAL_RenderCopyEx(SDL_Renderer * renderer, SDL_Texture * texture,
Expand All @@ -692,7 +692,7 @@ static void METAL_ActivateRenderer(SDL_Renderer * renderer)
static int
METAL_RenderReadPixels(SDL_Renderer * renderer, const SDL_Rect * rect,
Uint32 pixel_format, void * pixels, int pitch)
{
{ @autoreleasepool {
METAL_ActivateRenderer(renderer);
METAL_RenderData *data = (__bridge METAL_RenderData *) renderer->driverdata;
MTLRenderPassColorAttachmentDescriptor *colorAttachment = data.mtlpassdesc.colorAttachments[0];
Expand All @@ -719,11 +719,11 @@ static void METAL_ActivateRenderer(SDL_Renderer * renderer)
const int status = SDL_ConvertPixels(rect->w, rect->h, temp_format, temp_pixels, temp_pitch, pixel_format, pixels, pitch);
SDL_free(temp_pixels);
return status;
}
}}

static void
METAL_RenderPresent(SDL_Renderer * renderer)
{
{ @autoreleasepool {
METAL_ActivateRenderer(renderer);
METAL_RenderData *data = (__bridge METAL_RenderData *) renderer->driverdata;

Expand All @@ -739,21 +739,21 @@ static void METAL_ActivateRenderer(SDL_Renderer * renderer)
data.mtlcmdbuffer = nil;
data.mtlbackbuffer = nil;
data.beginScene = YES;
}
}}

static void
METAL_DestroyTexture(SDL_Renderer * renderer, SDL_Texture * texture)
{
{ @autoreleasepool {
id<MTLTexture> mtltexture = CFBridgingRelease(texture->driverdata);
#if !__has_feature(objc_arc)
[mtltexture release];
#endif
texture->driverdata = NULL;
}
}}

static void
METAL_DestroyRenderer(SDL_Renderer * renderer)
{
{ @autoreleasepool {
if (renderer->driverdata) {
METAL_RenderData *data = CFBridgingRelease(renderer->driverdata);

Expand Down Expand Up @@ -784,7 +784,7 @@ static void METAL_ActivateRenderer(SDL_Renderer * renderer)
#endif
}
SDL_free(renderer);
}
}}

#endif /* SDL_VIDEO_RENDER_METAL && !SDL_RENDER_DISABLED */

Expand Down

0 comments on commit c403c0f

Please sign in to comment.