Setting up the Metal view.

Author: slembcke

cocos2d/CCRenderer_private.h

@@ -171,8 +171,11 @@ CCGraphicsBufferPushElements(CCGraphicsBuffer *buffer, size_t requestedCount, CC
 
 
 @interface CCRenderer(){
-	CCGraphicsBuffer *_vertexBuffer;
+	@public
 	CCGraphicsBuffer *_elementBuffer;
+	
+	@private
+	CCGraphicsBuffer *_vertexBuffer;
 	id<CCGraphicsBufferBindings> _bufferBindings;
 
 	NSDictionary *_globalShaderUniforms;

cocos2d/CCShader.m

@@ -365,6 +365,9 @@ -(instancetype)initWithProgram:(GLuint)program uniformSetters:(NSDictionary *)un
 
 -(instancetype)initWithVertexShaderSource:(NSString *)vertexSource fragmentShaderSource:(NSString *)fragmentSource
 {
+	#warning TODO
+	if([CCConfiguration sharedConfiguration].graphicsAPI == CCGraphicsAPIMetal) return self;
+	
 	__block typeof(self) blockself = self;
 
 	CCRenderDispatch(NO, ^{

cocos2d/CCTextureCache.m

@@ -86,10 +86,14 @@ -(id) init
 {
 	if( (self=[super init]) ) {
 		_textures = [NSMutableDictionary dictionaryWithCapacity: 10];
-
+		
 		// init "global" stuff
 		_loadingQueue = dispatch_queue_create("org.cocos2d.texturecacheloading", NULL);
 		_dictQueue = dispatch_queue_create("org.cocos2d.texturecachedict", NULL);
+		
+		#warning TODO
+		if([CCConfiguration sharedConfiguration].graphicsAPI == CCGraphicsAPIMetal) return self;
+		
 #if !__CC_PLATFORM_ANDROID
 		#warning TODO might not be a GL view.
 		CCGLView *view = (CCGLView*)[[CCDirector sharedDirector] view];

cocos2d/Platforms/iOS/CCAppDelegate.m

@@ -148,6 +148,7 @@ - (void) setupCocos2dWithOptions:(NSDictionary*)config
 	// Create the main window
 	window_ = [[UIWindow alloc] initWithFrame:[[UIScreen mainScreen] bounds]];
 
+	CGRect bounds = [window_ bounds];
 
 	// CCView creation
 	// viewWithFrame: size of the OpenGL view. For full screen use [_window bounds]
@@ -166,7 +167,7 @@ - (void) setupCocos2dWithOptions:(NSDictionary*)config
 	switch([CCConfiguration sharedConfiguration].graphicsAPI){
 		case CCGraphicsAPIGL:
 			ccview = [CCGLView
-				viewWithFrame:[window_ bounds]
+				viewWithFrame:bounds
 				pixelFormat:config[CCSetupPixelFormat] ?: kEAGLColorFormatRGBA8
 				depthFormat:[config[CCSetupDepthFormat] unsignedIntValue]
 				preserveBackbuffer:[config[CCSetupPreserveBackbuffer] boolValue]
@@ -178,6 +179,8 @@ - (void) setupCocos2dWithOptions:(NSDictionary*)config
 #if __CC_METAL_SUPPORTED_AND_ENABLED
 		case CCGraphicsAPIMetal:
 			#warning TODO
+			ccview = [[CCMetalView alloc] initWithFrame:bounds];
+			break;
 #endif
 		default: NSAssert(NO, @"Internal error: Graphics API not set up.");
 	}

cocos2d/Platforms/iOS/CCMetalSupport.m

@@ -27,21 +27,46 @@
 
 #if __CC_METAL_SUPPORTED_AND_ENABLED
 
-#import <Metal/Metal.h>
+@implementation CCMetalContext
+
+-(instancetype)init
+{
+	if((self = [super init])){
+		_device = MTLCreateSystemDefaultDevice();
+	}
+	
+	return self;
+}
+
+NSString *CURRENT_CONTEXT_KEY = @"CURRENT_CONTEXT_KEY";
+
++(instancetype)currentContext
+{
+	return [NSThread currentThread].threadDictionary[CURRENT_CONTEXT_KEY];
+}
+
++(void)setCurrentContext:(CCMetalContext *)context
+{
+	if(context){
+		[NSThread currentThread].threadDictionary[CURRENT_CONTEXT_KEY] = context;
+	} else {
+		[[NSThread currentThread].threadDictionary removeObjectForKey:CURRENT_CONTEXT_KEY];
+	}
+}
+
+@end
 
 
 @implementation CCGraphicsBufferMetal {
+	@public
 	id<MTLBuffer> _buffer;
 }
 
 -(instancetype)initWithCapacity:(NSUInteger)capacity elementSize:(size_t)elementSize type:(CCGraphicsBufferType)type;
 {
-	if((self = [super init])){
-		#warning TODO
-		id<MTLDevice> device = nil;
-		
+	if((self = [super initWithCapacity:capacity elementSize:elementSize type:type])){
 		// Use write combining? Buffers are already write only for the GL renderer.
-		_buffer = [device newBufferWithLength:capacity*elementSize options:MTLResourceOptionCPUCacheModeDefault];
+		_buffer = [[CCMetalContext currentContext].device newBufferWithLength:capacity*elementSize options:MTLResourceOptionCPUCacheModeDefault];
 
 		_ptr = _buffer.contents;
 	}
@@ -53,7 +78,12 @@ -(void)destroy {}
 
 -(void)resize:(size_t)newCapacity;
 {
-	#warning TODO
+	id<MTLBuffer> newBuffer = [[CCMetalContext currentContext].device newBufferWithLength:newCapacity*_elementSize options:MTLResourceOptionCPUCacheModeDefault];
+	memcpy(newBuffer.contents, _ptr, _capacity*_elementSize);
+	
+	_capacity = newCapacity;
+	_buffer = newBuffer;
+	_ptr = _buffer.contents;
 }
 
 -(void)prepare;
@@ -65,6 +95,27 @@ -(void)commit; {}
 
 @end
 
+
+@implementation CCRenderCommandDrawMetal
+
+static const MTLPrimitiveType MetalDrawModes[] = {
+	GL_TRIANGLES,
+	GL_LINES,
+};
+
+-(void)invokeOnRenderer:(CCRenderer *)renderer
+{
+	id<MTLRenderCommandEncoder> renderEncoder = [CCMetalContext currentContext].currentRenderCommandEncoder;
+	CCGraphicsBufferMetal *indexBuffer = (CCGraphicsBufferMetal *)renderer->_elementBuffer;
+	
+	[renderEncoder pushDebugGroup:@"CCRendererCommandDraw: Invoke"];
+	[renderer setRenderState:_renderState];
+	[renderEncoder drawIndexedPrimitives:MetalDrawModes[_mode] indexCount:_count indexType:MTLIndexTypeUInt16 indexBuffer:indexBuffer->_buffer indexBufferOffset:2*_first];
+	[renderEncoder popDebugGroup];
+}
+
+@end
+
 #else
 
 // Temporary

cocos2d/Platforms/iOS/CCMetalSupport_Private.h

@@ -24,12 +24,30 @@
  */
 
 #import "ccMacros.h"
-
 #if __CC_METAL_SUPPORTED_AND_ENABLED
 
+#import <Metal/Metal.h>
+
 #import "CCRenderer_Private.h"
 
+
+@interface CCMetalContext : NSObject
+
+@property(nonatomic, readonly) id<MTLDevice> device;
+@property(nonatomic, readonly) id<MTLRenderCommandEncoder> currentRenderCommandEncoder;
+
++(instancetype)currentContext;
++(void)setCurrentContext:(CCMetalContext *)context;
+
+@end
+
+
 @interface CCGraphicsBufferMetal : CCGraphicsBuffer
 @end
 
+
+@interface CCRenderCommandDrawMetal : CCRenderCommandDraw
+@end
+
+
 #endif

cocos2d/Platforms/iOS/CCMetalView.h

@@ -5,28 +5,17 @@
 #import <UIKit/UIKit.h>
 #import <Metal/Metal.h>
 
-#import "../../ccMacros.h"
+#import "CCDirectorView.h"
 
-@interface CCMetalView : UIView
+@interface CCMetalView : UIView<CCDirectorView>
 
 @property(nonatomic, readonly) id<MTLDevice> device;
 @property(nonatomic, readonly) id<MTLCommandBuffer> currentCommandBuffer;
 @property(nonatomic, readonly) id<MTLTexture> currentFramebufferTexture;
 
-///** pixel format: it could be RGBA8 (32-bit) or RGB565 (16-bit) */
-//@property(nonatomic,readonly) NSString* pixelFormat;
-//
-///** depth format of the render buffer: 0, 16 or 24 bits*/
-//@property(nonatomic,readonly) GLuint depthFormat;
-
 /** returns surface size in pixels */
 @property(nonatomic,readonly) CGSize surfaceSize;
 
--(void)beginFrame;
--(void) presentFrame;
-
-- (CGPoint) convertPointFromViewToSurface:(CGPoint)point;
-- (CGRect) convertRectFromViewToSurface:(CGRect)rect;
 @end
 
 #endif // __CC_PLATFORM_IOS

cocos2d/Platforms/iOS/CCMetalView.m

@@ -13,8 +13,10 @@
 #import "CCScene.h"
 
 #import "CCDirector_Private.h"
+#import "CCMetalSupport_Private.h"
 
 @implementation CCMetalView {
+	CCMetalContext *_context;
 	id<MTLCommandQueue> _queue;
 	id<MTLDrawable> _currentDrawable;
 
@@ -32,6 +34,11 @@ - (id) initWithFrame:(CGRect)frame
 {
 	if((self = [super initWithFrame:frame]))
 	{
+		_context = [[CCMetalContext alloc] init];
+		
+		#warning Temporary
+		[CCMetalContext setCurrentContext:_context];
+		
 		_device = MTLCreateSystemDefaultDevice();
 		_queue = [_device newCommandQueue];
 
@@ -163,6 +170,11 @@ - (void)presentFrame
 	_currentDrawable = nil;
 }
 
+-(void)addFrameCompletionHandler:(dispatch_block_t)handler
+{
+	[_currentCommandBuffer addCompletedHandler:^(id<MTLCommandBuffer> buffer) {handler();}];
+}
+
 #pragma mark CCMetalView - Point conversion
 
 - (CGPoint) convertPointFromViewToSurface:(CGPoint)point