From 7dac177cd18f050c349fbf28b011c39789b7efb6 Mon Sep 17 00:00:00 2001 From: "Ryan C. Gordon" Date: Sat, 9 Dec 2017 03:28:23 -0500 Subject: [PATCH] metal: fixed render target support. --- src/render/metal/SDL_render_metal.m | 32 ++++++++++++++++++++++++----- 1 file changed, 27 insertions(+), 5 deletions(-) diff --git a/src/render/metal/SDL_render_metal.m b/src/render/metal/SDL_render_metal.m index 291ab32dc9201..294fc91cef53a 100644 --- a/src/render/metal/SDL_render_metal.m +++ b/src/render/metal/SDL_render_metal.m @@ -359,7 +359,7 @@ static void METAL_ActivateRenderer(SDL_Renderer * renderer) data.mtlpassdesc.colorAttachments[0].loadAction = MTLLoadActionDontCare; data.mtlcmdbuffer = [data.mtlcmdqueue commandBuffer]; data.mtlcmdencoder = [data.mtlcmdbuffer renderCommandEncoderWithDescriptor:data.mtlpassdesc]; - data.mtlcmdencoder.label = @"SDL metal renderer frame"; + data.mtlcmdencoder.label = @"SDL metal renderer start of frame"; // Set up our current renderer state for the next frame... METAL_UpdateViewport(renderer); @@ -401,7 +401,15 @@ static void METAL_ActivateRenderer(SDL_Renderer * renderer) MTLTextureDescriptor *mtltexdesc = [MTLTextureDescriptor texture2DDescriptorWithPixelFormat:mtlpixfmt width:(NSUInteger)texture->w height:(NSUInteger)texture->h mipmapped:NO]; - + + if (texture->access == SDL_TEXTUREACCESS_TARGET) { + mtltexdesc.usage = MTLTextureUsageShaderRead | MTLTextureUsageRenderTarget; + } else { + mtltexdesc.usage = MTLTextureUsageShaderRead; + } + //mtltexdesc.resourceOptions = MTLResourceCPUCacheModeDefaultCache | MTLResourceStorageModeManaged; + //mtltexdesc.storageMode = MTLStorageModeManaged; + id mtltexture = [data.mtldevice newTextureWithDescriptor:mtltexdesc]; if (mtltexture == nil) { return SDL_SetError("Texture allocation failed"); @@ -453,8 +461,22 @@ static void METAL_ActivateRenderer(SDL_Renderer * renderer) { @autoreleasepool { METAL_ActivateRenderer(renderer); METAL_RenderData *data = (__bridge METAL_RenderData *) renderer->driverdata; - id mtltexture = texture ? (__bridge id) texture->driverdata : nil; + + // commit the current command buffer, so that any work on a render target + // will be available to the next one we're about to queue up. + [data.mtlcmdencoder endEncoding]; + [data.mtlcmdbuffer commit]; + + id mtltexture = texture ? (__bridge id) texture->driverdata : data.mtlbackbuffer.texture; data.mtlpassdesc.colorAttachments[0].texture = mtltexture; + // !!! FIXME: this can be MTLLoadActionDontCare for textures (not the backbuffer) if SDL doesn't guarantee the texture contents should survive. + data.mtlpassdesc.colorAttachments[0].loadAction = MTLLoadActionLoad; + data.mtlcmdbuffer = [data.mtlcmdqueue commandBuffer]; + data.mtlcmdencoder = [data.mtlcmdbuffer renderCommandEncoderWithDescriptor:data.mtlpassdesc]; + data.mtlcmdencoder.label = texture ? @"SDL metal renderer render texture" : @"SDL metal renderer backbuffer"; + + // The higher level will reset the viewport and scissor after this call returns. + return 0; }} @@ -511,8 +533,8 @@ static void METAL_ActivateRenderer(SDL_Renderer * renderer) MTLViewport viewport; // RenderClear ignores the viewport state, though, so reset that. viewport.originX = viewport.originY = 0.0; - viewport.width = data.mtlbackbuffer.texture.width; - viewport.height = data.mtlbackbuffer.texture.height; + viewport.width = data.mtlpassdesc.colorAttachments[0].texture.width; + viewport.height = data.mtlpassdesc.colorAttachments[0].texture.height; viewport.znear = 0.0; viewport.zfar = 1.0;