Global uniform buffers working.

Author: slembcke

cocos2d/CCNoARC.m

@@ -285,11 +285,6 @@ -(void)invokeOnRenderer:(CCRenderer *)renderer
 
 #if __CC_METAL_SUPPORTED_AND_ENABLED
 
-// This is effectively hardcoded to 10 by Apple's docs and there is no API to query capabilities...
-// Seems like an oversight, but whatever.
-#define CCMTL_MAX_TEXTURES 10
-
-
 @interface CCRenderStateMetal : CCRenderState @end
 @implementation CCRenderStateMetal {
 	id<MTLRenderPipelineState> _renderPipelineState;
@@ -360,8 +355,8 @@ @implementation CCRenderStateMetal {
 		CCTexture *mainTexture = self->_shaderUniforms[CCShaderUniformMainTexture];
 
 		self->_textureRange = NSMakeRange(0, 1);
-		self->_samplers[0] = mainTexture.metalSampler;
-		self->_textures[0] = mainTexture.metalTexture;
+		self->_samplers[0] = [mainTexture.metalSampler retain];
+		self->_textures[0] = [mainTexture.metalTexture retain];
 
 		self->_uniformsPrepared = YES;
 	}
@@ -370,7 +365,7 @@ @implementation CCRenderStateMetal {
 static void
 CCRenderStateMetalTransition(CCRenderStateMetal *self, CCRenderer *renderer, CCRenderStateMetal *previous)
 {
-	CCMetalContext *context = renderer->_context;
+	CCMetalContext *context = renderer->_metalContext;
 	id<MTLRenderCommandEncoder> renderEncoder = context->_currentRenderCommandEncoder;
 	[renderEncoder setRenderPipelineState:self->_renderPipelineState];
 
@@ -416,7 +411,7 @@ -(instancetype)initWithMode:(CCRenderCommandDrawMode)mode renderState:(CCRenderS
 
 -(void)invokeOnRenderer:(CCRenderer *)renderer
 {
-	CCMetalContext *context = renderer->_context;
+	CCMetalContext *context = renderer->_metalContext;
 	id<MTLRenderCommandEncoder> renderEncoder = context->_currentRenderCommandEncoder;
 	id<MTLBuffer> indexBuffer = ((CCGraphicsBufferMetal *)renderer->_elementBuffer)->_buffer;
 

cocos2d/CCRenderer.m

@@ -546,9 +546,16 @@ -(instancetype)init
 		_threadsafe = YES;
 		_queue = [NSMutableArray array];
 
-		#warning TEMP
-		// Should probably change the init method to pass this in?
-		_context = [NSClassFromString(@"CCMetalContext") currentContext];
+#if __CC_METAL_SUPPORTED_AND_ENABLED
+		if([CCConfiguration sharedConfiguration].graphicsAPI == CCGraphicsAPIMetal){
+			// TODO: This is sort of gross. Would like it to move somewhere else.
+			_metalContext = (CCMetalContext *)[NSClassFromString(@"CCMetalContext") currentContext];
+			
+			// Default to half a megabyte of initial uniform storage.
+			NSUInteger uniformCapacity = 500*1024;
+			_uniformBuffer = [[CCGraphicsBufferClass alloc] initWithCapacity:uniformCapacity elementSize:1 type:CCGraphicsBufferTypeUniform];
+		}
+#endif
 	}
 
 	return self;
@@ -649,23 +656,54 @@ -(void)flush
 {
 	CCGL_DEBUG_PUSH_GROUP_MARKER("CCRenderer: Flush");
 
+	// Commit the geometry buffers to be used by the rendering commmands.
 	CCGL_DEBUG_INSERT_EVENT_MARKER("Buffering");
 	[_vertexBuffer commit];
 	[_elementBuffer commit];
 	CC_CHECK_GL_ERROR_DEBUG();
 
+	// The render commands build the uniform buffers. (only used by Metal currently)
+	[_uniformBuffer prepare];
+	
+	// TODO This should probably be moved eventually, but I'm not sure where.
+	// Probably never going to support uniform buffers in GL and making CCRenderer abstract is ugh...
+#if __CC_METAL_SUPPORTED_AND_ENABLED
+	if(_metalContext){
+		CCGlobalUniforms globalUniforms = {};
+		const NSUInteger globalUniformBytes = sizeof(globalUniforms);
+		
+		[_globalShaderUniforms[CCShaderUniformProjection] getValue:&globalUniforms.projection];
+		[_globalShaderUniforms[CCShaderUniformProjectionInv] getValue:&globalUniforms.projectionInv];
+		[_globalShaderUniforms[CCShaderUniformViewSize] getValue:&globalUniforms.viewSize];
+		[_globalShaderUniforms[CCShaderUniformViewSizeInPixels] getValue:&globalUniforms.viewSizeInPixels];
+		[_globalShaderUniforms[CCShaderUniformTime] getValue:&globalUniforms.time];
+		[_globalShaderUniforms[CCShaderUniformSinTime] getValue:&globalUniforms.sinTime];
+		[_globalShaderUniforms[CCShaderUniformCosTime] getValue:&globalUniforms.cosTime];
+		[_globalShaderUniforms[CCShaderUniformRandom01] getValue:&globalUniforms.random01];
+		
+		void *buff = CCGraphicsBufferPushElements(_uniformBuffer, globalUniformBytes);
+		memcpy(buff, &globalUniforms, globalUniformBytes);
+	}
+#endif
+	
+	// Execute the rendering commands.
 	SortQueue(_queue);
 	for(id<CCRenderCommand> command in _queue) [command invokeOnRenderer:self];
 	[self bindBuffers:NO];
 
 	[_queue removeAllObjects];
 
+	// Commit the uniform buffers.
+	[_uniformBuffer commit];	
+	
+	// Prepare the geometry buffers for use next time the renderer is reused.
 	[_vertexBuffer prepare];
 	[_elementBuffer prepare];
 
 	CCGL_DEBUG_POP_GROUP_MARKER();
 	CC_CHECK_GL_ERROR_DEBUG();
 
+	// Reset the renderer's state.
 	[self invalidateState];
 	_threadsafe = YES;
 }

cocos2d/CCRenderer_private.h

@@ -28,6 +28,25 @@
 #import "CCCache.h"
 #import "CCRenderDispatch.h"
 
+#if __CC_METAL_SUPPORTED_AND_ENABLED
+
+@class CCMetalContext;
+
+// Struct used for packing the global uniforms.
+// NOTE: Must match the definition in CCShaders.metal!
+typedef struct CCGlobalUniforms {
+	GLKMatrix4 projection;
+	GLKMatrix4 projectionInv;
+	GLKVector2 viewSize;
+	GLKVector2 viewSizeInPixels;
+	GLKVector4 time;
+	GLKVector4 sinTime;
+	GLKVector4 cosTime;
+	GLKVector4 random01;
+} CCGlobalUniforms;
+
+#endif
+
 // TODO These should be made private to the module.
 extern id CCBLENDMODE_CACHE;
 extern id CCRENDERSTATE_CACHE;
@@ -112,7 +131,7 @@ typedef NS_ENUM(NSUInteger, CCRenderCommandDrawMode){
 typedef NS_ENUM(NSUInteger, CCGraphicsBufferType){
 	CCGraphicsBufferTypeVertex,
 	CCGraphicsBufferTypeIndex,
-//	CCGraphicsBufferTypeUniform?
+	CCGraphicsBufferTypeUniform,
 };
 
 
@@ -175,6 +194,7 @@ CCGraphicsBufferPushElements(CCGraphicsBuffer *buffer, size_t requestedCount)
 	@public
 	CCGraphicsBuffer *_vertexBuffer;
 	CCGraphicsBuffer *_elementBuffer;
+	CCGraphicsBuffer *_uniformBuffer; // Currently only used by the Metal renderer.
 	id<CCGraphicsBufferBindings> _bufferBindings;
 
 	NSDictionary *_globalShaderUniforms;
@@ -187,9 +207,10 @@ CCGraphicsBufferPushElements(CCGraphicsBuffer *buffer, size_t requestedCount)
 	__unsafe_unretained CCRenderState *_renderState;
 	__unsafe_unretained CCRenderCommandDraw *_lastDrawCommand;
 	BOOL _buffersBound;
-	
-	// Currently used for associating a metal context with a given renderer.
-	id _context;
+
+#if __CC_METAL_SUPPORTED_AND_ENABLED
+	CCMetalContext *_metalContext;
+#endif
 }
 
 /// Current global shader uniform values.

cocos2d/CCShader.m

@@ -368,6 +368,7 @@ -(instancetype)initWithGLProgram:(GLuint)program uniformSetters:(NSDictionary *)
 	return self;
 }
 
+#if __CC_METAL_SUPPORTED_AND_ENABLED
 -(instancetype)initWithMetalVertexFunction:(id<MTLFunction>)vertexFunction fragmentFunction:(id<MTLFunction>)fragmentFunction
 {
 	if((self = [super init])){
@@ -380,6 +381,7 @@ -(instancetype)initWithMetalVertexFunction:(id<MTLFunction>)vertexFunction fragm
 
 	return self;
 }
+#endif
 
 -(instancetype)initWithVertexShaderSource:(NSString *)vertexSource fragmentShaderSource:(NSString *)fragmentSource
 {

cocos2d/Platforms/iOS/CCMetalSupport_Private.h

@@ -30,6 +30,14 @@
 
 #import "CCRenderer_Private.h"
 
+// This is effectively hardcoded to 10 by Apple's docs and there is no API to query capabilities...
+// Seems like an oversight, but whatever.
+#define CCMTL_MAX_TEXTURES 10
+
+// Maximum uniform bytes that can be passed to a shader.
+// This space is preallocated by all render states.
+#define CCMTL_MAX_UNIFORM_BYTES 32*4*4
+
 
 #if DEBUG
 

cocos2d/Platforms/iOS/CCShaders.metal

@@ -19,6 +19,7 @@ typedef struct CCFragData {
 } CCFragData;
 
 // Standard set of global uniform values.
+// NOTE: Must match the definition in CCRenderer_Private.h!
 typedef struct CCGlobalUniforms {
 	float4x4 projection;
 	float4x4 projectionInv;