Partial changes for uniform binding before realizing I’ve been working out of the wrong branch. -_-

slembcke · slembcke · commit 672a3f34d30a · 2014-08-27T13:57:16.000-05:00
diff --git a/cocos2d/CCNoARC.m b/cocos2d/CCNoARC.m
@@ -127,8 +127,8 @@ -(CCRenderBuffer)enqueueTriangles:(NSUInteger)triangleCount andVertexes:(NSUInte
 	NSUInteger firstElement = _elementBuffer->_count;
 	
 	NSUInteger elementCount = 3*triangleCount;
-	CCVertex *vertexes = CCGraphicsBufferPushElements(_vertexBuffer, vertexCount, self);
-	uint16_t *elements = CCGraphicsBufferPushElements(_elementBuffer, elementCount, self);
+	CCVertex *vertexes = CCGraphicsBufferPushElements(_vertexBuffer, vertexCount);
+	uint16_t *elements = CCGraphicsBufferPushElements(_elementBuffer, elementCount);
 	
 	CCRenderCommandDraw *previous = _lastDrawCommand;
 	if(previous && previous->_renderState == renderState && previous->_globalSortOrder == globalSortOrder){
@@ -153,8 +153,8 @@ -(CCRenderBuffer)enqueueLines:(NSUInteger)lineCount andVertexes:(NSUInteger)vert
 	NSUInteger firstElement = _elementBuffer->_count;
 	
 	NSUInteger elementCount = 2*lineCount;
-	CCVertex *vertexes = CCGraphicsBufferPushElements(_vertexBuffer, vertexCount, self);
-	uint16_t *elements = CCGraphicsBufferPushElements(_elementBuffer, elementCount, self);
+	CCVertex *vertexes = CCGraphicsBufferPushElements(_vertexBuffer, vertexCount);
+	uint16_t *elements = CCGraphicsBufferPushElements(_elementBuffer, elementCount);
 	
 	CCRenderCommandDraw *command = [[CCRenderCommandDrawClass alloc] initWithMode:CCRenderCommandDrawLines renderState:renderState first:firstElement count:elementCount globalSortOrder:globalSortOrder];
 	[_queue addObject:command];
diff --git a/cocos2d/CCRenderer_private.h b/cocos2d/CCRenderer_private.h
@@ -148,7 +148,7 @@ typedef NS_ENUM(NSUInteger, CCGraphicsBufferType){
 /// Return a pointer to an array of elements that is 'requestedCount' in size.
 /// The buffer is resized by calling [CCGraphicsBuffer resize:] if necessary.
 static inline void *
-CCGraphicsBufferPushElements(CCGraphicsBuffer *buffer, size_t requestedCount, CCRenderer *renderer)
+CCGraphicsBufferPushElements(CCGraphicsBuffer *buffer, size_t requestedCount)
 {
 	NSCAssert(requestedCount > 0, @"Requested count must be positive.");
 	
diff --git a/cocos2d/CCShader.m b/cocos2d/CCShader.m
@@ -36,6 +36,7 @@
 #import "CCCache.h"
 #import "CCGL.h"
 #import "CCRenderDispatch.h"
+#import "CCMetalSupport_Private.h"
 
 
 const NSString *CCShaderUniformProjection = @"cc_Projection";
@@ -166,6 +167,7 @@ @implementation CCShaderCache
 
 -(id)createSharedDataForKey:(id<NSCopying>)key
 {
+#warning TODO Need Metal path here.
 	NSString *shaderName = (NSString *)key;
 	
 	NSString *fragmentName = [shaderName stringByAppendingPathExtension:@"fsh"];
@@ -352,8 +354,10 @@ @implementation CCShader {
 
 //MARK: Init Methods:
 
--(instancetype)initWithProgram:(GLuint)program uniformSetters:(NSDictionary *)uniformSetters ownsProgram:(BOOL)ownsProgram
+-(instancetype)initWithGLProgram:(GLuint)program uniformSetters:(NSDictionary *)uniformSetters ownsProgram:(BOOL)ownsProgram
 {
+	NSAssert([CCConfiguration sharedConfiguration].graphicsAPI == CCGraphicsAPIGL, @"GL graphics not configured.");
+	
 	if((self = [super init])){
 		_program = program;
 		_uniformSetters = uniformSetters;
@@ -363,6 +367,19 @@ -(instancetype)initWithProgram:(GLuint)program uniformSetters:(NSDictionary *)un
 	return self;
 }
 
+-(instancetype)initWithMetalVertexFunction:(id<MTLFunction>)vertexFunction fragmentFunction:(id<MTLFunction>)fragmentFunction
+{
+	if((self = [super init])){
+		_vertexFunction = vertexFunction;
+		_fragmentFunction = fragmentFunction;
+		
+		#warning TODO setup _uniformSetters
+//		_uniformSetters = uniformSetters;
+	}
+	
+	return self;
+}
+
 -(instancetype)initWithVertexShaderSource:(NSString *)vertexSource fragmentShaderSource:(NSString *)fragmentSource
 {
 	#warning TODO
@@ -393,7 +410,7 @@ -(instancetype)initWithVertexShaderSource:(NSString *)vertexSource fragmentShade
 		
 		CCGL_DEBUG_POP_GROUP_MARKER();
 		
-		blockself = [blockself initWithProgram:program uniformSetters:UniformSettersForProgram(program) ownsProgram:YES];
+		blockself = [blockself initWithGLProgram:program uniformSetters:UniformSettersForProgram(program) ownsProgram:YES];
 	});
 	
 	return blockself;
@@ -418,7 +435,7 @@ - (void)dealloc
 
 -(instancetype)copyWithZone:(NSZone *)zone
 {
-	return [[CCShader allocWithZone:zone] initWithProgram:_program uniformSetters:_uniformSetters ownsProgram:NO];
+	return [[CCShader allocWithZone:zone] initWithGLProgram:_program uniformSetters:_uniformSetters ownsProgram:NO];
 }
 
 static CCShaderCache *CC_SHADER_CACHE = nil;
@@ -432,27 +449,49 @@ +(void)initialize
 	// +initialize may be called due to loading a subclass.
 	if(self != [CCShader class]) return;
 	
-	CC_SHADER_CACHE = [[CCShaderCache alloc] init];
-	
-	// Setup the builtin shaders.
-	CC_SHADER_POS_COLOR = [[self alloc] initWithFragmentShaderSource:@"void main(){gl_FragColor = cc_FragColor;}"];
-	CC_SHADER_POS_COLOR.debugName = @"CCPositionColorShader";
-	
-	CC_SHADER_POS_TEX_COLOR = [[self alloc] initWithFragmentShaderSource:@"void main(){gl_FragColor = cc_FragColor*texture2D(cc_MainTexture, cc_FragTexCoord1);}"];
-	CC_SHADER_POS_TEX_COLOR.debugName = @"CCPositionTextureColorShader";
-	
-	CC_SHADER_POS_TEXA8_COLOR = [[self alloc] initWithFragmentShaderSource:@"void main(){gl_FragColor = cc_FragColor*texture2D(cc_MainTexture, cc_FragTexCoord1).a;}"];
-	CC_SHADER_POS_TEXA8_COLOR.debugName = @"CCPositionTextureA8ColorShader";
+	NSAssert([CCConfiguration sharedConfiguration].graphicsAPI != CCGraphicsAPIInvalid, @"Graphics API not configured.");
 	
-	CC_SHADER_POS_TEX_COLOR_ALPHA_TEST = [[self alloc] initWithFragmentShaderSource:CC_GLSL(
-		uniform float cc_AlphaTestValue;
-		void main(){
-			vec4 tex = texture2D(cc_MainTexture, cc_FragTexCoord1);
-			if(tex.a <= cc_AlphaTestValue) discard;
-			gl_FragColor = cc_FragColor*tex;
-		}
-	)];
-	CC_SHADER_POS_TEX_COLOR_ALPHA_TEST.debugName = @"CCPositionTextureColorAlphaTestShader";
+#if __CC_METAL_SUPPORTED_AND_ENABLED
+	if([CCConfiguration sharedConfiguration].graphicsAPI == CCGraphicsAPIMetal){
+		id<MTLLibrary> library = [CCMetalContext currentContext].library;
+		id<MTLFunction> vertex = [library newFunctionWithName:@"CCVertexFunctionDefault"];
+		
+		CC_SHADER_POS_COLOR = [[self alloc] initWithMetalVertexFunction:vertex fragmentFunction:[library newFunctionWithName:@"CCFragmentFunctionDefaultColor"]];
+		CC_SHADER_POS_COLOR.debugName = @"CCPositionColorShader";
+		
+		CC_SHADER_POS_TEX_COLOR = [[self alloc] initWithMetalVertexFunction:vertex fragmentFunction:[library newFunctionWithName:@"CCFragmentFunctionDefaultTextureColor"]];
+		CC_SHADER_POS_TEX_COLOR.debugName = @"CCPositionTextureColorShader";
+		
+		CC_SHADER_POS_TEXA8_COLOR = [[self alloc] initWithMetalVertexFunction:vertex fragmentFunction:[library newFunctionWithName:@"CCFragmentFunctionDefaultTextureA8Color"]];
+		CC_SHADER_POS_TEXA8_COLOR.debugName = @"CCPositionTextureA8ColorShader";
+		
+		CC_SHADER_POS_TEX_COLOR_ALPHA_TEST = [[self alloc] initWithMetalVertexFunction:vertex fragmentFunction:[library newFunctionWithName:@"CCFragmentFunctionUnsupported"]];
+		CC_SHADER_POS_TEX_COLOR_ALPHA_TEST.debugName = @"CCPositionTextureColorAlphaTestShader";
+	} else
+#endif
+	{
+		CC_SHADER_CACHE = [[CCShaderCache alloc] init];
+		
+		// Setup the builtin shaders.
+		CC_SHADER_POS_COLOR = [[self alloc] initWithFragmentShaderSource:@"void main(){gl_FragColor = cc_FragColor;}"];
+		CC_SHADER_POS_COLOR.debugName = @"CCPositionColorShader";
+		
+		CC_SHADER_POS_TEX_COLOR = [[self alloc] initWithFragmentShaderSource:@"void main(){gl_FragColor = cc_FragColor*texture2D(cc_MainTexture, cc_FragTexCoord1);}"];
+		CC_SHADER_POS_TEX_COLOR.debugName = @"CCPositionTextureColorShader";
+		
+		CC_SHADER_POS_TEXA8_COLOR = [[self alloc] initWithFragmentShaderSource:@"void main(){gl_FragColor = cc_FragColor*texture2D(cc_MainTexture, cc_FragTexCoord1).a;}"];
+		CC_SHADER_POS_TEXA8_COLOR.debugName = @"CCPositionTextureA8ColorShader";
+		
+		CC_SHADER_POS_TEX_COLOR_ALPHA_TEST = [[self alloc] initWithFragmentShaderSource:CC_GLSL(
+			uniform float cc_AlphaTestValue;
+			void main(){
+				vec4 tex = texture2D(cc_MainTexture, cc_FragTexCoord1);
+				if(tex.a <= cc_AlphaTestValue) discard;
+				gl_FragColor = cc_FragColor*tex;
+			}
+		)];
+		CC_SHADER_POS_TEX_COLOR_ALPHA_TEST.debugName = @"CCPositionTextureColorAlphaTestShader";
+	}
 }
 
 +(instancetype)positionColorShader
diff --git a/cocos2d/CCShader_Private.h b/cocos2d/CCShader_Private.h
@@ -1,3 +1,9 @@
+#import "ccMacros.h"
+
+#if __CC_METAL_SUPPORTED_AND_ENABLED
+#import <Metal/Metal.h>
+#endif
+
 #import "CCShader.h"
 
 @class CCRenderer;
@@ -11,6 +17,11 @@ typedef void (^CCUniformSetter)(
 	@public
 	GLuint _program;
 	NSDictionary *_uniformSetters;
+	
+	// TODO This should really be split into a separate subclass somehow.
+#if __CC_METAL_SUPPORTED_AND_ENABLED
+	id<MTLFunction> _vertexFunction, _fragmentFunction;
+#endif
 }
 
 @end
diff --git a/cocos2d/CCTexture.m b/cocos2d/CCTexture.m
@@ -227,6 +227,8 @@ + (id) textureWithFile:(NSString*)file
 
 - (id) initWithData:(const void*)data pixelFormat:(CCTexturePixelFormat)pixelFormat pixelsWide:(NSUInteger)width pixelsHigh:(NSUInteger)height contentSizeInPixels:(CGSize)sizeInPixels contentScale:(CGFloat)contentScale
 {
+	NSAssert([CCConfiguration sharedConfiguration].graphicsAPI != CCGraphicsAPIInvalid, @"Graphics API not configured.");
+	
 	if((self = [super init])) {
 #if __CC_METAL_SUPPORTED_AND_ENABLED
 		if([CCConfiguration sharedConfiguration].graphicsAPI == CCGraphicsAPIMetal){
diff --git a/cocos2d/CCTexture_Private.h b/cocos2d/CCTexture_Private.h
@@ -52,6 +52,7 @@
 /* texture name */
 @property(nonatomic,readonly) GLuint name;
 
+// TODO This should really be split into a separate subclass somehow.
 #if __CC_METAL_SUPPORTED_AND_ENABLED
 @property(nonatomic,readonly) id<MTLTexture> metalTexture;
 @property(nonatomic,readonly) id<MTLSamplerState> metalSampler;
diff --git a/cocos2d/Platforms/iOS/CCMetalSupport.m b/cocos2d/Platforms/iOS/CCMetalSupport.m
@@ -213,18 +213,8 @@ -(void)prepare
     MTLRenderPipelineDescriptor *pipelineStateDescriptor = [[MTLRenderPipelineDescriptor alloc] init];
     pipelineStateDescriptor.sampleCount = 1;
 		
-		id<MTLLibrary> library = context.library;
-		#warning TEMP Hard coded shaders.
-		pipelineStateDescriptor.vertexFunction = [library newFunctionWithName:@"CCVertexFunctionDefault"];
-		if(_shader == [CCShader positionColorShader]){
-	    pipelineStateDescriptor.fragmentFunction = [library newFunctionWithName:@"CCFragmentFunctionDefaultColor"];
-		} else if(_shader == [CCShader positionTextureColorShader]){
-	    pipelineStateDescriptor.fragmentFunction = [library newFunctionWithName:@"CCFragmentFunctionDefaultTextureColor"];
-		} else if(_shader == [CCShader positionTextureA8ColorShader]){
-	    pipelineStateDescriptor.fragmentFunction = [library newFunctionWithName:@"CCFragmentFunctionDefaultTextureA8Color"];
-		} else {
-	    pipelineStateDescriptor.fragmentFunction = [library newFunctionWithName:@"TempUnsupported"];
-		}
+		pipelineStateDescriptor.vertexFunction = _shader->_vertexFunction;
+		pipelineStateDescriptor.fragmentFunction = _shader->_fragmentFunction;
     
 		NSDictionary *blendOptions = _blendMode.options;
     MTLRenderPipelineColorAttachmentDescriptor *colorDescriptor = [MTLRenderPipelineColorAttachmentDescriptor new];
@@ -247,6 +237,19 @@ -(void)transitionRenderer:(CCRenderer *)renderer FromState:(CCRenderState *)prev
 	id<MTLRenderCommandEncoder> renderEncoder = CCMetalContextCurrent().currentRenderCommandEncoder;
 	[renderEncoder setRenderPipelineState:_renderPipelineState];
 	
+//	CCGraphicsBufferMetal *uniformGraphicsBuffer = nil;
+//	id<MTLBuffer> uniformMetalBuffer = uniformGraphicsBuffer->_buffer;
+//	
+//	// Set the global uniform buffers.
+//	[renderEncoder setVertexBuffer:uniformMetalBuffer offset:0 atIndex:1];
+//	[renderEncoder setFragmentBuffer:uniformMetalBuffer offset:0 atIndex:1];
+//	
+//	// Set the uniform buffers.
+//	CCGraphicsBufferPushElements(uniformGraphicsBuffer, # of bytes);
+//	[renderEncoder setVertexBuffer:uniformMetalBuffer offset:offset atIndex:2];
+//	[renderEncoder setFragmentBuffer:uniformMetalBuffer offset:offset atIndex:2];
+	
+	// Set textures and samplers.
 	CCTexture *mainTexture = _shaderUniforms[CCShaderUniformMainTexture];
 	[renderEncoder setFragmentSamplerState:mainTexture.metalSampler atIndex:0];
 	[renderEncoder setFragmentTexture:mainTexture.metalTexture atIndex:0];
diff --git a/cocos2d/Platforms/iOS/CCShaders.metal b/cocos2d/Platforms/iOS/CCShaders.metal
@@ -3,22 +3,39 @@
 
 using namespace metal;
 
+// Default vertex attributes.
 typedef struct CCVertex {
 	float4 position;
 	float2 texCoord1, texCoord2;
 	float4 color;
 } CCVertex;
 
+// Default fragment varyings.
 typedef struct CCFragData {
 	float4 position [[position]];
 	float2 texCoord1;
 	float2 texCoord2;
 	half4  color;
 } CCFragData;
 
+// Standard set of global uniform values.
+typedef struct CCGlobalUniforms {
+	float4x4 projection;
+	float4x4 projectionInv;
+	float2 viewSize;
+	float2 viewSizeInPixels;
+	float4 time;
+	float4 sinTime;
+	float4 cosTime;
+	float4 random01;
+} CCGlobalUniforms;
+
+// Default vertex function.
 vertex CCFragData
 CCVertexFunctionDefault(
-	device CCVertex* verts [[buffer(0)]],
+	const device CCVertex* verts [[buffer(0)]],
+	const device CCGlobalUniforms *globalUniforms [[buffer(1)]],
+	const device CCGlobalUniforms *uniforms [[buffer(2)]],
 	unsigned int vid [[vertex_id]]
 ){
 	CCFragData out;
@@ -33,14 +50,17 @@ CCVertexFunctionDefault(
 
 fragment half4
 CCFragmentFunctionDefaultColor(
-	CCFragData in [[stage_in]]
+	const CCFragData in [[stage_in]],
+	const device CCGlobalUniforms *globals [[buffer(0)]]
 ){
 	return in.color;
 }
 
 fragment half4
 CCFragmentFunctionDefaultTextureColor(
-	CCFragData in [[stage_in]],
+	const CCFragData in [[stage_in]],
+	const device CCGlobalUniforms *globalUniforms [[buffer(1)]],
+	const device CCGlobalUniforms *uniforms [[buffer(2)]],
 	texture2d<half> mainTexture [[texture(0)]],
 	sampler mainTextureSampler [[sampler(0)]]
 ){
@@ -49,16 +69,20 @@ CCFragmentFunctionDefaultTextureColor(
 
 fragment half4
 CCFragmentFunctionDefaultTextureA8Color(
-	CCFragData in [[stage_in]],
+	const CCFragData in [[stage_in]],
+	const device CCGlobalUniforms *globalUniforms [[buffer(1)]],
+	const device CCGlobalUniforms *uniforms [[buffer(2)]],
 	texture2d<half> mainTexture [[texture(0)]],
 	sampler mainTextureSampler [[sampler(0)]]
 ){
 	return in.color*mainTexture.sample(mainTextureSampler, in.texCoord1).a;
 }
 
 fragment half4
-TempUnsupported(
-	CCFragData in [[stage_in]],
+CCFragmentFunctionUnsupported(
+	const CCFragData in [[stage_in]],
+	const device CCGlobalUniforms *globalUniforms [[buffer(1)]],
+	const device CCGlobalUniforms *uniforms [[buffer(2)]],
 	texture2d<half> mainTexture [[texture(0)]],
 	sampler mainTextureSampler [[sampler(0)]]
 ){

Original file line number	Diff line number	Diff line change
`@@ -148,7 +148,7 @@ typedef NS_ENUM(NSUInteger, CCGraphicsBufferType){`
`148`	`148`	`/// Return a pointer to an array of elements that is 'requestedCount' in size.`
`149`	`149`	`/// The buffer is resized by calling [CCGraphicsBuffer resize:] if necessary.`
`150`	`150`	`static inline void *`
`151`		`-CCGraphicsBufferPushElements(CCGraphicsBuffer buffer, size_t requestedCount, CCRenderer renderer)`
	`151`	`+CCGraphicsBufferPushElements(CCGraphicsBuffer *buffer, size_t requestedCount)`
`152`	`152`	`{`
`153`	`153`	`NSCAssert(requestedCount > 0, @"Requested count must be positive.");`
`154`	`154`
Original file line number	Diff line number	Diff line change
`@@ -227,6 +227,8 @@ + (id) textureWithFile:(NSString*)file`
`227`	`227`
`228`	`228`	`- (id) initWithData:(const void*)data pixelFormat:(CCTexturePixelFormat)pixelFormat pixelsWide:(NSUInteger)width pixelsHigh:(NSUInteger)height contentSizeInPixels:(CGSize)sizeInPixels contentScale:(CGFloat)contentScale`
`229`	`229`	`{`
	`230`	`+ NSAssert([CCConfiguration sharedConfiguration].graphicsAPI != CCGraphicsAPIInvalid, @"Graphics API not configured.");`
	`231`	`+`
`230`	`232`	`if((self = [super init])) {`
`231`	`233`	`#if __CC_METAL_SUPPORTED_AND_ENABLED`
`232`	`234`	`if([CCConfiguration sharedConfiguration].graphicsAPI == CCGraphicsAPIMetal){`