Basic rendering finally works again.

slembcke · slembcke · commit b34b95941d7a · 2014-08-14T14:52:07.000-05:00
diff --git a/cocos2d-ios.xcodeproj/project.pbxproj b/cocos2d-ios.xcodeproj/project.pbxproj
@@ -1075,6 +1075,7 @@
 		D39FA9C718C1BC6B00441627 /* CCShader_Private.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCShader_Private.h; sourceTree = "<group>"; };
 		D3A2E7D0181E12750033614C /* CCPhysicsShape.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCPhysicsShape.h; sourceTree = "<group>"; };
 		D3A2E7D1181E12750033614C /* CCPhysicsShape.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CCPhysicsShape.m; sourceTree = "<group>"; };
+		D3C12815199D40AC005D2119 /* CCShaders.metal */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.metal; path = CCShaders.metal; sourceTree = "<group>"; };
 		E01E6D8A121F130E001A484F /* CCLabelBMFont.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; lineEnding = 0; path = CCLabelBMFont.h; sourceTree = "<group>"; };
 		E01E6D8B121F130E001A484F /* CCLabelBMFont.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; lineEnding = 0; path = CCLabelBMFont.m; sourceTree = "<group>"; };
 		E02BB6D4126CA93A006E46A2 /* CCAnimationCache.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCAnimationCache.h; sourceTree = "<group>"; };
@@ -1879,6 +1880,7 @@
 		E0EAD0E9121F4B4600B0C81C /* iOS */ = {
 			isa = PBXGroup;
 			children = (
+				D3C12815199D40AC005D2119 /* CCShaders.metal */,
 				D3903B12199528B6003AA81A /* CCMetalView.h */,
 				D3903B13199528B6003AA81A /* CCMetalView.m */,
 				B78AE46A17E7AF6C0028BE0B /* UITouch+CC.h */,
diff --git a/cocos2d-tests-ios.xcodeproj/project.pbxproj b/cocos2d-tests-ios.xcodeproj/project.pbxproj
@@ -78,6 +78,7 @@
 		D34CD3C518ABF4AA00D8E537 /* CCRendererTests.m in Sources */ = {isa = PBXBuildFile; fileRef = D34CD3C418ABF4AA00D8E537 /* CCRendererTests.m */; };
 		D3870C6018B440150033D885 /* SpritePerformanceTest.m in Sources */ = {isa = PBXBuildFile; fileRef = D3870C5F18B440150033D885 /* SpritePerformanceTest.m */; };
 		D3B2A7E5187DD60B00406C5A /* CCBMFontTest.m in Sources */ = {isa = PBXBuildFile; fileRef = D3B2A7E4187DD60B00406C5A /* CCBMFontTest.m */; };
+		D3C1281D199D43E0005D2119 /* CCShaders.metal in Sources */ = {isa = PBXBuildFile; fileRef = D3C1281C199D43E0005D2119 /* CCShaders.metal */; };
 		D3C9C867188078B900C58900 /* CCSchedulerTest.m in Sources */ = {isa = PBXBuildFile; fileRef = D3C9C866188078B900C58900 /* CCSchedulerTest.m */; };
 		D3D6CF5F18BD5F0500A51531 /* CCRendererTest.m in Sources */ = {isa = PBXBuildFile; fileRef = D3D6CF5E18BD5F0500A51531 /* CCRendererTest.m */; };
 		D4AFE9131977100000261299 /* A Damn Mess.ttf in Resources */ = {isa = PBXBuildFile; fileRef = D4AFE8D81977100000261299 /* A Damn Mess.ttf */; };
@@ -281,6 +282,7 @@
 		D34CD3C418ABF4AA00D8E537 /* CCRendererTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CCRendererTests.m; sourceTree = "<group>"; };
 		D3870C5F18B440150033D885 /* SpritePerformanceTest.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = SpritePerformanceTest.m; path = "cocos2d-ui-tests/tests/SpritePerformanceTest.m"; sourceTree = SOURCE_ROOT; };
 		D3B2A7E4187DD60B00406C5A /* CCBMFontTest.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = CCBMFontTest.m; path = "cocos2d-ui-tests/tests/CCBMFontTest.m"; sourceTree = SOURCE_ROOT; };
+		D3C1281C199D43E0005D2119 /* CCShaders.metal */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.metal; name = CCShaders.metal; path = cocos2d/Platforms/iOS/CCShaders.metal; sourceTree = SOURCE_ROOT; };
 		D3C9C866188078B900C58900 /* CCSchedulerTest.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = CCSchedulerTest.m; path = "cocos2d-ui-tests/tests/CCSchedulerTest.m"; sourceTree = SOURCE_ROOT; };
 		D3D6CF5E18BD5F0500A51531 /* CCRendererTest.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = CCRendererTest.m; path = "cocos2d-ui-tests/tests/CCRendererTest.m"; sourceTree = SOURCE_ROOT; };
 		D4AFE8D81977100000261299 /* A Damn Mess.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; path = "A Damn Mess.ttf"; sourceTree = "<group>"; };
@@ -595,6 +597,7 @@
 		B7E2620117E7D34D007067F0 /* Resources-iOS */ = {
 			isa = PBXGroup;
 			children = (
+				D3C1281C199D43E0005D2119 /* CCShaders.metal */,
 				B7E2620217E7D34D007067F0 /* Default-568h@2x.png */,
 				B7E2620317E7D34D007067F0 /* Default-Landscape~ipad.png */,
 				B7E2620417E7D34D007067F0 /* Default.png */,
@@ -941,6 +944,7 @@
 				B71B088217EA5B6A0082EBC0 /* CCScrollViewTest.m in Sources */,
 				B7EE697918186D5200B983FE /* CCTextFieldTest.m in Sources */,
 				D29698121926DF7500BBB097 /* CCEffectPongTest.m in Sources */,
+				D3C1281D199D43E0005D2119 /* CCShaders.metal in Sources */,
 				B7E2620017E7D321007067F0 /* AppDelegate.m in Sources */,
 				0E28FE1A197FCE4500F78989 /* CCCacheTest.m in Sources */,
 				B77060AB1832E3310043CC67 /* CCTextureCacheTest.m in Sources */,
diff --git a/cocos2d/CCRenderer_private.h b/cocos2d/CCRenderer_private.h
@@ -172,10 +172,10 @@ CCGraphicsBufferPushElements(CCGraphicsBuffer *buffer, size_t requestedCount, CC
 
 @interface CCRenderer(){
 	@public
+	CCGraphicsBuffer *_vertexBuffer;
 	CCGraphicsBuffer *_elementBuffer;
 	
 	@private
-	CCGraphicsBuffer *_vertexBuffer;
 	id<CCGraphicsBufferBindings> _bufferBindings;
 	
 	NSDictionary *_globalShaderUniforms;
diff --git a/cocos2d/Platforms/iOS/CCMetalSupport.m b/cocos2d/Platforms/iOS/CCMetalSupport.m
@@ -27,14 +27,35 @@
 
 #if __CC_METAL_SUPPORTED_AND_ENABLED
 
-@implementation CCMetalContext
+@implementation CCMetalContext {
+	@public
+	id<MTLRenderPipelineState> _tempPiplelineState;
+}
 
 -(instancetype)init
 {
 	if((self = [super init])){
 		_device = MTLCreateSystemDefaultDevice();
+		_library = [_device newDefaultLibrary];
+		
 		_commandQueue = [_device newCommandQueue];
 		_currentCommandBuffer = [_commandQueue commandBuffer];
+		
+		#warning Temporary
+    id <MTLFunction> vertexProgram = [_library newFunctionWithName:@"CCVertexFunctionDefault"];
+    id <MTLFunction> fragmentProgram = [_library newFunctionWithName:@"CCFragmentFunctionDefaultColor"];
+		
+    MTLRenderPipelineDescriptor *pipelineStateDescriptor = [[MTLRenderPipelineDescriptor alloc] init];
+    [pipelineStateDescriptor setSampleCount: 1];
+    [pipelineStateDescriptor setVertexFunction:vertexProgram];
+    [pipelineStateDescriptor setFragmentFunction:fragmentProgram];
+    
+    MTLRenderPipelineColorAttachmentDescriptor *colorDescriptor = [MTLRenderPipelineColorAttachmentDescriptor new];
+    colorDescriptor.pixelFormat = MTLPixelFormatBGRA8Unorm;
+		colorDescriptor.blendingEnabled = NO;
+		pipelineStateDescriptor.colorAttachments[0] = colorDescriptor;
+		
+    _tempPiplelineState = [_device newRenderPipelineStateWithDescriptor:pipelineStateDescriptor error:nil];
 	}
 	
 	return self;
@@ -81,6 +102,8 @@ -(void)prepareCommandBuffer
 
 -(void)commitCurrentCommandBuffer
 {
+	[_currentRenderCommandEncoder endEncoding];
+	
 	[_currentCommandBuffer commit];
 	_currentCommandBuffer = nil;
 }
@@ -130,18 +153,23 @@ -(void)commit; {}
 @implementation CCRenderCommandDrawMetal
 
 static const MTLPrimitiveType MetalDrawModes[] = {
-	GL_TRIANGLES,
-	GL_LINES,
+	MTLPrimitiveTypeTriangle,
+	MTLPrimitiveTypeLine,
 };
 
 -(void)invokeOnRenderer:(CCRenderer *)renderer
 {
-	id<MTLRenderCommandEncoder> renderEncoder = [CCMetalContext currentContext].currentRenderCommandEncoder;
-	CCGraphicsBufferMetal *indexBuffer = (CCGraphicsBufferMetal *)renderer->_elementBuffer;
+	CCMetalContext *context = [CCMetalContext currentContext];
+	id<MTLRenderCommandEncoder> renderEncoder = context.currentRenderCommandEncoder;
+	
+	id<MTLBuffer> vertexBuffer = ((CCGraphicsBufferMetal *)renderer->_vertexBuffer)->_buffer;
+	id<MTLBuffer> indexBuffer = ((CCGraphicsBufferMetal *)renderer->_elementBuffer)->_buffer;
 	
 	[renderEncoder pushDebugGroup:@"CCRendererCommandDraw: Invoke"];
-	[renderer setRenderState:_renderState];
-	[renderEncoder drawIndexedPrimitives:MetalDrawModes[_mode] indexCount:_count indexType:MTLIndexTypeUInt16 indexBuffer:indexBuffer->_buffer indexBufferOffset:2*_first];
+//	[renderer setRenderState:_renderState];
+	[renderEncoder setRenderPipelineState:context->_tempPiplelineState];
+	[renderEncoder setVertexBuffer:vertexBuffer offset:0 atIndex:0];
+	[renderEncoder drawIndexedPrimitives:MetalDrawModes[_mode] indexCount:_count indexType:MTLIndexTypeUInt16 indexBuffer:indexBuffer indexBufferOffset:2*_first];
 	[renderEncoder popDebugGroup];
 }
 
diff --git a/cocos2d/Platforms/iOS/CCMetalSupport_Private.h b/cocos2d/Platforms/iOS/CCMetalSupport_Private.h
@@ -34,6 +34,8 @@
 @interface CCMetalContext : NSObject
 
 @property(nonatomic, readonly) id<MTLDevice> device;
+@property(nonatomic, readonly) id<MTLLibrary> library;
+
 @property(nonatomic, readonly) id<MTLCommandQueue> commandQueue;
 @property(nonatomic, readonly) id<MTLCommandBuffer> currentCommandBuffer;
 
diff --git a/cocos2d/Platforms/iOS/CCMetalView.m b/cocos2d/Platforms/iOS/CCMetalView.m
@@ -157,15 +157,15 @@ -(void)beginFrame
 //	}
 	
 	id<CAMetalDrawable> drawable = [self.metalLayer nextDrawable];
+	[_context.currentCommandBuffer presentDrawable:drawable];
+	
 	_currentDrawable = drawable;
 	_context.destinationTexture = drawable.texture;
 }
 
 - (void)presentFrame
 {
 	[_context commitCurrentCommandBuffer];
-	
-	[_currentDrawable present];
 	_currentDrawable = nil;
 }
 
diff --git a/cocos2d/Platforms/iOS/CCShaders.metal b/cocos2d/Platforms/iOS/CCShaders.metal
@@ -0,0 +1,59 @@
+#include <metal_stdlib>
+#include <simd/simd.h>
+
+using namespace metal;
+
+typedef struct CCVertex {
+	float4 position;
+	float2 texCoord1, texCoord2;
+	float4 color;
+} CCVertex;
+
+typedef struct CCFragData {
+	float4 position [[position]];
+	float2 texCoord1;
+	float2 texCoord2;
+	half4  color;
+} CCFragData;
+
+vertex CCFragData
+CCVertexFunctionDefault(
+	device CCVertex* verts [[buffer(0)]],
+	unsigned int vid [[vertex_id]]
+){
+	CCFragData out;
+	
+	out.position = verts[vid].position;
+	out.texCoord1 = verts[vid].texCoord1;
+	out.texCoord2 = verts[vid].texCoord2;
+	out.color = clamp(half4(verts[vid].color), half4(0.0), half4(1.0));
+	
+	return out;
+}
+
+fragment half4
+CCFragmentFunctionDefaultColor(
+	CCFragData in [[stage_in]]
+){
+	return in.color;
+}
+
+fragment half4
+CCFragmentFunctionDefaultTextureColor(
+	CCFragData in [[stage_in]],
+	texture2d<half> mainTexture [[texture(0)]],
+	sampler mainTextureSampler [[sampler(0)]]
+){
+	return in.color*mainTexture.sample(mainTextureSampler, in.texCoord1);
+}
+
+fragment half4
+CCFragmentFunctionDefaultTextureA8Color(
+	CCFragData in [[stage_in]],
+	texture2d<half> mainTexture [[texture(0)]],
+	sampler mainTextureSampler [[sampler(0)]]
+){
+	return in.color*mainTexture.sample(mainTextureSampler, in.texCoord1).a;
+}
+
+// TODO "alpha test" shader

Original file line number	Diff line number	Diff line change
`@@ -157,15 +157,15 @@ -(void)beginFrame`
`157`	`157`	`// }`
`158`	`158`
`159`	`159`	`id<CAMetalDrawable> drawable = [self.metalLayer nextDrawable];`
	`160`	`+ [_context.currentCommandBuffer presentDrawable:drawable];`
	`161`	`+`
`160`	`162`	`_currentDrawable = drawable;`
`161`	`163`	`_context.destinationTexture = drawable.texture;`
`162`	`164`	`}`
`163`	`165`
`164`	`166`	`- (void)presentFrame`
`165`	`167`	`{`
`166`	`168`	`[_context commitCurrentCommandBuffer];`
`167`		`-`
`168`		`- [_currentDrawable present];`
`169`	`169`	`_currentDrawable = nil;`
`170`	`170`	`}`
`171`	`171`