Fixes for frame buffering in CCMetalView.

Author: slembcke

cocos2d-tests.xcodeproj/project.pbxproj

@@ -1196,7 +1196,7 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /usr/bin/ruby;
-			shellScript = "# Special thanks to Filip Iliescu at Apple for the help with this.\n\n# Environment variables.\nSDK = ENV[\"PLATFORM_NAME\"]\nOBJECT_FILE_DIR = ENV[\"OBJECT_FILE_DIR\"]\nSRCROOT = ENV[\"SRCROOT\"]\nBUILT_PRODUCTS_DIR = ENV[\"BUILT_PRODUCTS_DIR\"]\nPRODUCT_NAME = ENV[\"PRODUCT_NAME\"]\n\n# User variables\n# Directory with your custom .metal files in it.\nSHADER_DIR = \"#{SRCROOT}/cocos2d-ui-tests/MetalShaders\"\n# Location of the cocos2d library directory.\nCOCOS2D_DIR = \"#{SRCROOT}/cocos2d\"\n\nMETAL_ARGS = [\n\t\"-arch air64\",\n\t\"-emit-llvm\",\n\t\"-c\",\n\t\"-gline-tables-only\",\n\t\"-ffast-math\",\n\t\"-std=ios-metal1.0\",\n    %{-I \"#{COCOS2D_DIR}\"},\n]\n\ndef system(cmd)\n\tputs cmd\n    Kernel.system cmd\nend\n\nPRODUCTS = \"#{OBJECT_FILE_DIR}/CCMetalShaders\"\nARCHIVE = \"#{PRODUCTS}/default.metal-ar\"\n\ndef compile_shader(src)\n\tdst = \"#{PRODUCTS}/#{File.basename(src, \".metal\")}.air\"\n\t\n\t# Compile and archive the shader.\n\tsystem %{xcrun -sdk #{SDK} metal #{METAL_ARGS.join(\" \")} \"#{src}\" -o \"#{dst}\"}\n\tsystem %{xcrun -sdk #{SDK} ar r \"#{ARCHIVE}\" \"#{dst}\"}\nend\n\nif SDK == \"iphoneos\"\n\t# Cannot use default.metallib to avoid clashing with Xcode build magic.\n\t# This is part of a workaround due to the iOS simulator not supporting Metal and may go away in the future.\n\tmetal_lib = \"#{BUILT_PRODUCTS_DIR}/#{PRODUCT_NAME}.app/CCShaders.metallib\"\n    \n\t# Delete the old products dir and metal lib.\n\tsystem %{rm -rf \"#{PRODUCTS}\"}\n    system %{rm -f \"#{metal_lib}\"}\n    system %{mkdir -p \"#{PRODUCTS}\"}\n    \n    # Compile the builtin shaders.\n    compile_shader(%{#{COCOS2D_DIR}/Platforms/iOS/CCShaders.metal})\n    \n\t# Compile/archive all the shaders in the shader directory.\n    Dir.glob(\"#{SHADER_DIR}/*.metal\").each{|src| compile_shader(src)}\n    \n\t# Link all shaders into default lib.\n\tsystem %{xcrun -sdk #{SDK} metallib -o \"#{metal_lib}\" \"#{ARCHIVE}\"}\nend\n";
+			shellScript = "# Special thanks to Filip Iliescu at Apple for the help with this.\n\n# Environment variables.\nSDK = ENV[\"PLATFORM_NAME\"]\nOBJECT_FILE_DIR = ENV[\"OBJECT_FILE_DIR\"]\nSRCROOT = ENV[\"SRCROOT\"]\nBUILT_PRODUCTS_DIR = ENV[\"BUILT_PRODUCTS_DIR\"]\nPRODUCT_NAME = ENV[\"PRODUCT_NAME\"]\n\n# User variables\n# Directory with your custom .metal files in it.\nSHADER_DIR = \"#{SRCROOT}/cocos2d-ui-tests/MetalShaders\"\n# Location of the cocos2d library directory.\nCOCOS2D_DIR = \"#{SRCROOT}/cocos2d\"\n\nMETAL_ARGS = [\n\t\"-arch air64\",\n\t\"-emit-llvm\",\n\t\"-c\",\n\t\"-gline-tables-only\",\n\t\"-ffast-math\",\n\t\"-std=ios-metal1.0\",\n\t%{-I \"#{COCOS2D_DIR}\"},\n]\n\ndef system(cmd)\n\tputs cmd\n\tKernel.system cmd\nend\n\nPRODUCTS = \"#{OBJECT_FILE_DIR}/CCMetalShaders\"\nARCHIVE = \"#{PRODUCTS}/default.metal-ar\"\n\ndef compile_shader(src)\n\tdst = \"#{PRODUCTS}/#{File.basename(src, \".metal\")}.air\"\n\t\n\t# Compile and archive the shader.\n\tsystem %{xcrun -sdk #{SDK} metal #{METAL_ARGS.join(\" \")} \"#{src}\" -o \"#{dst}\"}\n\tsystem %{xcrun -sdk #{SDK} ar r \"#{ARCHIVE}\" \"#{dst}\"}\nend\n\nif SDK == \"iphoneos\"\n\t# Cannot use default.metallib to avoid clashing with Xcode build magic.\n\t# This is part of a workaround due to the iOS simulator not supporting Metal and may go away in the future.\n\tmetal_lib = \"#{BUILT_PRODUCTS_DIR}/#{PRODUCT_NAME}.app/CCShaders.metallib\"\n\t\t\n\t# Delete the old products dir and metal lib.\n\tsystem %{rm -rf \"#{PRODUCTS}\"}\n\tsystem %{rm -f \"#{metal_lib}\"}\n\tsystem %{mkdir -p \"#{PRODUCTS}\"}\n\t\n\t# Compile the builtin shaders.\n\tcompile_shader(%{#{COCOS2D_DIR}/Platforms/iOS/CCShaders.metal})\n\t\n\t# Compile/archive all the shaders in the shader directory.\n\tDir.glob(\"#{SHADER_DIR}/*.metal\").each{|src| compile_shader(src)}\n\t\n\t# Link all shaders into default lib.\n\tsystem %{xcrun -sdk #{SDK} metallib -o \"#{metal_lib}\" \"#{ARCHIVE}\"}\nend\n";
 		};
 /* End PBXShellScriptBuildPhase section */
 

cocos2d/Platforms/iOS/CCMetalView.m

@@ -20,7 +20,6 @@
 
 @implementation CCMetalView {
 	CCMetalContext *_context;
-//	id<MTLCommandQueue> _queue;
 	id<MTLDrawable> _currentDrawable;
 
 	dispatch_semaphore_t _queuedFramesSemaphore;
@@ -62,25 +61,6 @@ - (id) initWithFrame:(CGRect)frame
 	return self;
 }
 
-//-(id) initWithCoder:(NSCoder *)aDecoder
-//{
-//	if( (self = [super initWithCoder:aDecoder]) ) {
-//		CAMetalLayer *layer = (CAMetalLayer *)self.layer;
-//		
-//		_pixelformat = kEAGLColorFormatRGB565;
-//		_depthFormat = 0;
-//		_multiSampling= NO;
-//		_requestedSamples = 0;
-//		_surfaceSize = [layer bounds].size;
-//		
-//		if(![self setupSurfaceWithSharegroup:nil]){
-//			return nil;
-//		}
-//	}
-//	
-//	return self;
-//}
-
 - (void) dealloc
 {
 	CCLOGINFO(@"cocos2d: deallocing %@", self);
@@ -100,55 +80,23 @@ - (void) layoutSubviews
 	[[CCDirector sharedDirector] reshapeProjection:_surfaceSize];
 }
 
-//- (MTLRenderPassDescriptor *)renderPassDescriptorForTexture:(id <MTLTexture>)texture
-//{
-//	MTLRenderPassDescriptor *descriptor = [MTLRenderPassDescriptor renderPassDescriptor];
-//	
-//	MTLRenderPassColorAttachmentDescriptor *colorAttachment = [MTLRenderPassColorAttachmentDescriptor new];
-//	colorAttachment.texture = texture;
-//	colorAttachment.loadAction = MTLLoadActionClear;
-//	colorAttachment.clearColor = MTLClearColorMake(0, 0, 0, 0);
-//	colorAttachment.storeAction = MTLStoreActionStore;
-//	
-//	descriptor.colorAttachments[0] = colorAttachment;
-//	
-//	return descriptor;
-//    
-////    if (!_depthTex || (_depthTex && (_depthTex.width != texture.width || _depthTex.height != texture.height)))
-////    {
-////        //  If we need a depth texture and don't have one, or if the depth texture we have is the wrong size
-////        //  Then allocate one of the proper size
-////        
-////        MTLTextureDescriptor* desc = [MTLTextureDescriptor texture2DDescriptorWithPixelFormat: MTLPixelFormatDepth32Float width: texture.width height: texture.height mipmapped: NO];
-////        _depthTex = [_device newTextureWithDescriptor: desc];
-////        _depthTex.label = @"Depth";
-////        
-////        MTLRenderPassAttachmentDescriptor *depthAttachment = [MTLRenderPassAttachmentDescriptor new];
-////        depthAttachment.texture = _depthTex;
-////        [depthAttachment setLoadAction:MTLLoadActionClear];
-////        [depthAttachment setClearValue:MTLClearValueMakeDepth(1.0)];
-////        [depthAttachment setStoreAction: MTLStoreActionDontCare];
-////        
-////        _renderPassDescriptor.depthAttachment = depthAttachment;
-////    }
-//}
-
 -(void)beginFrame
 {
+	dispatch_semaphore_wait(_queuedFramesSemaphore, DISPATCH_TIME_FOREVER);
+	
 	if(_layerSizeDidUpdate){
 		self.metalLayer.drawableSize = _surfaceSize;
 		_layerSizeDidUpdate = NO;
 	}
 
-//	id<CAMetalDrawable> drawable = nil;
-//	while(drawable == nil){
-//		drawable = [self.metalLayer nextDrawable];
-//		
-//		if(drawable == nil) NSLog(@"nil drawable? (Why does this happen?)");
-//	}
-	
-	id<CAMetalDrawable> drawable = [self.metalLayer nextDrawable];
-	[_context.currentCommandBuffer presentDrawable:drawable];
+	id<CAMetalDrawable> drawable = nil;
+	while(drawable == nil){
+		drawable = [self.metalLayer nextDrawable];
+
+#if DEBUG
+		if(drawable == nil) NSLog(@"Metal drawable pool exhausted. You may be rendering too much in a frame.");
+#endif
+	}
 
 	_currentDrawable = drawable;
 	_destinationTexture = drawable.texture;