encounter
/
SDL
mirror of https://github.com/encounter/SDL.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Minor cleanup

This commit is contained in:
Sam Lantinga 2017-12-08 12:02:23 -08:00
parent 5182c23c6b
commit b733dcc208
1 changed files with 18 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/render/metal/SDL_render_metal.m
View File

@ -726,20 +726,18 @@ METAL_RenderPresent(SDL_Renderer * renderer)
{ {
METAL_ActivateRenderer(renderer); METAL_ActivateRenderer(renderer);
METAL_RenderData *data = (__bridge METAL_RenderData *) renderer->driverdata; METAL_RenderData *data = (__bridge METAL_RenderData *) renderer->driverdata;
id<CAMetalDrawable> mtlbackbuffer = data.mtlbackbuffer;
[data.mtlcmdencoder endEncoding]; [data.mtlcmdencoder endEncoding];
[data.mtlcmdbuffer presentDrawable:mtlbackbuffer]; [data.mtlcmdbuffer presentDrawable:data.mtlbackbuffer];
#if !__has_feature(objc_arc)
[data.mtlcmdbuffer addCompletedHandler:^(id <MTLCommandBuffer> mtlcmdbuffer) {
[mtlbackbuffer release];
}];
#endif
[data.mtlcmdbuffer commit]; [data.mtlcmdbuffer commit];
#if !__has_feature(objc_arc) #if !__has_feature(objc_arc)
[data.mtlcmdencoder release]; [data.mtlcmdencoder release];
[data.mtlcmdbuffer release]; [data.mtlcmdbuffer release];
[data.mtlbackbuffer release];
#endif #endif
data.mtlcmdencoder = nil;
data.mtlcmdbuffer = nil;
data.mtlbackbuffer = nil;
data.beginScene = YES; data.beginScene = YES;
} }
@ -760,15 +758,23 @@ METAL_DestroyRenderer(SDL_Renderer * renderer)
METAL_RenderData *data = CFBridgingRelease(renderer->driverdata); METAL_RenderData *data = CFBridgingRelease(renderer->driverdata);
#if !__has_feature(objc_arc) #if !__has_feature(objc_arc)
int i; if (data.mtlbackbuffer != nil) {
[data.mtlbackbuffer release];
}
if (data.mtlcmdencoder != nil) {
[data.mtlcmdencoder endEncoding]; [data.mtlcmdencoder endEncoding];
[data.mtlcmdencoder release]; [data.mtlcmdencoder release];
}
if (data.mtlcmdbuffer != nil) {
[data.mtlcmdbuffer release]; [data.mtlcmdbuffer release];
}
[data.mtlcmdqueue release]; [data.mtlcmdqueue release];
for (i = 0; i < 4; i++) { for (int i = 0; i < 4; i++) {
[data.mtlpipelineprims[i] release]; [data.mtlpipelineprims[i] release];
[data.mtlpipelinecopy[i] release]; [data.mtlpipelinecopy[i] release];
} }
[data.mtlpipelineprims release];
[data.mtlpipelinecopy release];
[data.mtlbufclearverts release]; [data.mtlbufclearverts release];
[data.mtllibrary release]; [data.mtllibrary release];
[data.mtldevice release]; [data.mtldevice release];