Buffer bindings now own their buffers instead of the renderer.

slembcke · slembcke · commit 42e23d202354 · 2014-09-10T13:53:48.000-05:00
diff --git a/CCRendererGLSupport.m b/CCRendererGLSupport.m
@@ -185,40 +185,46 @@ -(void)commit
 #endif
 
 
-@interface CCGraphicsBufferBindingsGL : NSObject <CCGraphicsBufferBindings> @end
+@interface CCGraphicsBufferBindingsGL : CCGraphicsBufferBindings @end
 @implementation CCGraphicsBufferBindingsGL {
 	GLuint _vao;
 }
 
--(instancetype)initWithVertexBuffer:(CCGraphicsBufferGLBasic *)vertexBuffer indexBuffer:(CCGraphicsBufferGLBasic *)indexBuffer
+-(instancetype)init
 {
-	NSAssert([vertexBuffer isKindOfClass:[CCGraphicsBufferGLBasic class]], @"Wrong kind of buffer!");
-	NSAssert([indexBuffer isKindOfClass:[CCGraphicsBufferGLBasic class]], @"Wrong kind of buffer!");
-	
 	if((self = [super init])){
-		CCGL_DEBUG_PUSH_GROUP_MARKER("CCGraphicsBufferBindingsGL: Creating VAO");
-		
-		glGenVertexArrays(1, &_vao);
-		glBindVertexArray(_vao);
-
-		glEnableVertexAttribArray(CCShaderAttributePosition);
-		glEnableVertexAttribArray(CCShaderAttributeTexCoord1);
-		glEnableVertexAttribArray(CCShaderAttributeTexCoord2);
-		glEnableVertexAttribArray(CCShaderAttributeColor);
-		
-		glBindBuffer(GL_ARRAY_BUFFER, vertexBuffer->_buffer);
-		glVertexAttribPointer(CCShaderAttributePosition, 4, GL_FLOAT, GL_FALSE, sizeof(CCVertex), (void *)offsetof(CCVertex, position));
-		glVertexAttribPointer(CCShaderAttributeTexCoord1, 2, GL_FLOAT, GL_FALSE, sizeof(CCVertex), (void *)offsetof(CCVertex, texCoord1));
-		glVertexAttribPointer(CCShaderAttributeTexCoord2, 2, GL_FLOAT, GL_FALSE, sizeof(CCVertex), (void *)offsetof(CCVertex, texCoord2));
-		glVertexAttribPointer(CCShaderAttributeColor, 4, GL_FLOAT, GL_FALSE, sizeof(CCVertex), (void *)offsetof(CCVertex, color));
-		
-		glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, indexBuffer->_buffer);
-
-		glBindVertexArray(0);
-		glBindBuffer(GL_ARRAY_BUFFER, 0);
-		glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, 0);
-		
-		CCGL_DEBUG_POP_GROUP_MARKER();
+		CCRenderDispatch(NO, ^{
+			const NSUInteger CCRENDERER_INITIAL_VERTEX_CAPACITY = 16*1024;
+			_vertexBuffer = [[CCGraphicsBufferClass alloc] initWithCapacity:CCRENDERER_INITIAL_VERTEX_CAPACITY elementSize:sizeof(CCVertex) type:CCGraphicsBufferTypeVertex];
+			[_vertexBuffer prepare];
+			
+			_indexBuffer = [[CCGraphicsBufferClass alloc] initWithCapacity:CCRENDERER_INITIAL_VERTEX_CAPACITY*1.5 elementSize:sizeof(uint16_t) type:CCGraphicsBufferTypeIndex];
+			[_indexBuffer prepare];
+			
+			CCGL_DEBUG_PUSH_GROUP_MARKER("CCGraphicsBufferBindingsGL: Creating VAO");
+			
+			glGenVertexArrays(1, &_vao);
+			glBindVertexArray(_vao);
+
+			glEnableVertexAttribArray(CCShaderAttributePosition);
+			glEnableVertexAttribArray(CCShaderAttributeTexCoord1);
+			glEnableVertexAttribArray(CCShaderAttributeTexCoord2);
+			glEnableVertexAttribArray(CCShaderAttributeColor);
+			
+			glBindBuffer(GL_ARRAY_BUFFER, ((CCGraphicsBufferGLBasic *)_vertexBuffer)->_buffer);
+			glVertexAttribPointer(CCShaderAttributePosition, 4, GL_FLOAT, GL_FALSE, sizeof(CCVertex), (void *)offsetof(CCVertex, position));
+			glVertexAttribPointer(CCShaderAttributeTexCoord1, 2, GL_FLOAT, GL_FALSE, sizeof(CCVertex), (void *)offsetof(CCVertex, texCoord1));
+			glVertexAttribPointer(CCShaderAttributeTexCoord2, 2, GL_FLOAT, GL_FALSE, sizeof(CCVertex), (void *)offsetof(CCVertex, texCoord2));
+			glVertexAttribPointer(CCShaderAttributeColor, 4, GL_FLOAT, GL_FALSE, sizeof(CCVertex), (void *)offsetof(CCVertex, color));
+			
+			glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, ((CCGraphicsBufferGLBasic *)_indexBuffer)->_buffer);
+
+			glBindVertexArray(0);
+			glBindBuffer(GL_ARRAY_BUFFER, 0);
+			glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, 0);
+			
+			CCGL_DEBUG_POP_GROUP_MARKER();
+		});
 	}
 	
 	return self;
@@ -236,4 +242,16 @@ -(void)bind:(BOOL)bind
 	glBindVertexArray(bind ? _vao : 0);
 }
 
+-(void)prepare
+{
+	[_vertexBuffer prepare];
+	[_indexBuffer prepare];
+}
+
+-(void)commit
+{
+	[_vertexBuffer commit];
+	[_indexBuffer commit];
+}
+
 @end
diff --git a/cocos2d/CCNoARC.m b/cocos2d/CCNoARC.m
@@ -127,20 +127,20 @@ @implementation CCRenderer(NoARC)
 -(CCRenderBuffer)enqueueTriangles:(NSUInteger)triangleCount andVertexes:(NSUInteger)vertexCount withState:(CCRenderState *)renderState globalSortOrder:(NSInteger)globalSortOrder;
 {
 	// Need to record the first vertex or element index before pushing more vertexes.
-	NSUInteger firstVertex = _vertexBuffer->_count;
-	NSUInteger firstElement = _elementBuffer->_count;
+	NSUInteger firstVertex = _buffers->_vertexBuffer->_count;
+	NSUInteger firstIndex = _buffers->_indexBuffer->_count;
 	
-	NSUInteger elementCount = 3*triangleCount;
-	CCVertex *vertexes = CCGraphicsBufferPushElements(_vertexBuffer, vertexCount);
-	uint16_t *elements = CCGraphicsBufferPushElements(_elementBuffer, elementCount);
+	NSUInteger indexCount = 3*triangleCount;
+	CCVertex *vertexes = CCGraphicsBufferPushElements(_buffers->_vertexBuffer, vertexCount);
+	uint16_t *elements = CCGraphicsBufferPushElements(_buffers->_indexBuffer, indexCount);
 	
 	CCRenderCommandDraw *previous = _lastDrawCommand;
 	if(previous && previous->_renderState == renderState && previous->_globalSortOrder == globalSortOrder){
 		// Batch with the previous command.
-		[previous batch:elementCount];
+		[previous batch:indexCount];
 	} else {
 		// Start a new command.
-		CCRenderCommandDraw *command = [[CCRenderCommandDrawClass alloc] initWithMode:CCRenderCommandDrawTriangles renderState:renderState first:firstElement count:elementCount globalSortOrder:globalSortOrder];
+		CCRenderCommandDraw *command = [[CCRenderCommandDrawClass alloc] initWithMode:CCRenderCommandDrawTriangles renderState:renderState first:firstIndex count:indexCount globalSortOrder:globalSortOrder];
 		[_queue addObject:command];
 		[command release];
 		
@@ -153,14 +153,14 @@ -(CCRenderBuffer)enqueueTriangles:(NSUInteger)triangleCount andVertexes:(NSUInte
 -(CCRenderBuffer)enqueueLines:(NSUInteger)lineCount andVertexes:(NSUInteger)vertexCount withState:(CCRenderState *)renderState globalSortOrder:(NSInteger)globalSortOrder;
 {
 	// Need to record the first vertex or element index before pushing more vertexes.
-	NSUInteger firstVertex = _vertexBuffer->_count;
-	NSUInteger firstElement = _elementBuffer->_count;
+	NSUInteger firstVertex = _buffers->_vertexBuffer->_count;
+	NSUInteger firstIndex = _buffers->_indexBuffer->_count;
 	
-	NSUInteger elementCount = 2*lineCount;
-	CCVertex *vertexes = CCGraphicsBufferPushElements(_vertexBuffer, vertexCount);
-	uint16_t *elements = CCGraphicsBufferPushElements(_elementBuffer, elementCount);
+	NSUInteger indexCount = 2*lineCount;
+	CCVertex *vertexes = CCGraphicsBufferPushElements(_buffers->_vertexBuffer, vertexCount);
+	uint16_t *elements = CCGraphicsBufferPushElements(_buffers->_indexBuffer, indexCount);
 	
-	CCRenderCommandDraw *command = [[CCRenderCommandDrawClass alloc] initWithMode:CCRenderCommandDrawLines renderState:renderState first:firstElement count:elementCount globalSortOrder:globalSortOrder];
+	CCRenderCommandDraw *command = [[CCRenderCommandDrawClass alloc] initWithMode:CCRenderCommandDrawLines renderState:renderState first:firstIndex count:indexCount globalSortOrder:globalSortOrder];
 	[_queue addObject:command];
 	[command release];
 	
@@ -174,7 +174,7 @@ -(CCRenderBuffer)enqueueLines:(NSUInteger)lineCount andVertexes:(NSUInteger)vert
 CCRendererBindBuffers(CCRenderer *self, BOOL bind)
 {
  	if(bind != self->_buffersBound){
-		[self->_bufferBindings bind:bind];
+		[self->_buffers bind:bind];
 		self->_buffersBound = bind;
 	}
 }
diff --git a/cocos2d/CCRenderer.m b/cocos2d/CCRenderer.m
@@ -605,6 +605,19 @@ -(void)dealloc
 @end
 
 
+//MARK: CCGraphicsBufferBindings
+
+
+@implementation CCGraphicsBufferBindings
+
+// Base implementations do do nothing.
+-(void)prepare {}
+-(void)commit {}
+-(void)bind {}
+
+@end
+
+
 //MARK: Render Queue
 
 
@@ -620,31 +633,10 @@ -(void)invalidateState
 -(instancetype)init
 {
 	if((self = [super init])){
-		CCRenderDispatch(NO, ^{
-			const NSUInteger CCRENDERER_INITIAL_VERTEX_CAPACITY = 16*1024;
-			_vertexBuffer = [[CCGraphicsBufferClass alloc] initWithCapacity:CCRENDERER_INITIAL_VERTEX_CAPACITY elementSize:sizeof(CCVertex) type:CCGraphicsBufferTypeVertex];
-			[_vertexBuffer prepare];
-			
-			_elementBuffer = [[CCGraphicsBufferClass alloc] initWithCapacity:CCRENDERER_INITIAL_VERTEX_CAPACITY*1.5 elementSize:sizeof(uint16_t) type:CCGraphicsBufferTypeIndex];
-			[_elementBuffer prepare];
-			
-			_bufferBindings = [CCGraphicsBufferBindingsClass alloc];
-			_bufferBindings = [_bufferBindings initWithVertexBuffer:_vertexBuffer indexBuffer:_elementBuffer];
-		});
-		
+		_buffers = [[CCGraphicsBufferBindingsClass alloc] init];
+				
 		_threadsafe = YES;
 		_queue = [NSMutableArray array];
-		
-#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;
@@ -742,14 +734,8 @@ -(void)flush
 {
 	CCRENDERER_DEBUG_PUSH_GROUP_MARKER(@"CCRenderer: Flush");
 	
-	// Commit the geometry buffers to be used by the rendering commmands.
-	CCRENDERER_DEBUG_INSERT_EVENT_MARKER(@"Buffering");
-	[_vertexBuffer commit];
-	[_elementBuffer commit];
-	CCRENDERER_DEBUG_CHECK_ERRORS();
-	
-	// The render commands build the uniform buffers. (only used by Metal currently)
-	[_uniformBuffer prepare];
+	// Commit the buffers.
+	[_buffers commit];
 	
 	// 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...
@@ -779,12 +765,8 @@ -(void)flush
 	
 	[_queue removeAllObjects];
 	
-	// Commit the uniform buffers.
-	[_uniformBuffer commit];	
-	
-	// Prepare the geometry buffers for use next time the renderer is reused.
-	[_vertexBuffer prepare];
-	[_elementBuffer prepare];
+	// Prepare the buffers.
+	[_buffers prepare];
 	
 	CCRENDERER_DEBUG_POP_GROUP_MARKER();
 	CCRENDERER_DEBUG_CHECK_ERRORS();
diff --git a/cocos2d/CCRenderer_private.h b/cocos2d/CCRenderer_private.h
@@ -186,18 +186,30 @@ CCGraphicsBufferPushElements(CCGraphicsBuffer *buffer, size_t requestedCount)
 
 
 /// Internal abstract class used to wrap vertex buffer state. (GL VAOs, etc)
-@protocol CCGraphicsBufferBindings
--(instancetype)initWithVertexBuffer:(CCGraphicsBuffer *)vertexBuffer indexBuffer:(CCGraphicsBuffer *)indexBuffer;
+@interface CCGraphicsBufferBindings : NSObject {
+	@public
+	CCGraphicsBuffer *_vertexBuffer;
+	CCGraphicsBuffer *_indexBuffer;
+	
+	// Not used by the GL2 renderer.
+	CCGraphicsBuffer *_uniformBuffer;
+}
+
+/// Prepare buffers for changes.
+-(void)prepare;
+
+/// Commit changes to buffers.
+-(void)commit;
+
+/// Bind the buffers. (Not used by Metal)
 -(void)bind:(BOOL)bind;
+
 @end
 
 
 @interface CCRenderer(){
 	@public
-	CCGraphicsBuffer *_vertexBuffer;
-	CCGraphicsBuffer *_elementBuffer;
-	CCGraphicsBuffer *_uniformBuffer; // Currently only used by the Metal renderer.
-	id<CCGraphicsBufferBindings> _bufferBindings;
+	CCGraphicsBufferBindings *_buffers;
 	
 	NSDictionary *_globalShaderUniforms;
 	
diff --git a/cocos2d/Platforms/iOS/CCMetalSupport.m b/cocos2d/Platforms/iOS/CCMetalSupport.m
@@ -130,30 +130,31 @@ -(void)commit; {}
 @end
 
 
-@interface CCGraphicsBufferBindingsMetal : NSObject <CCGraphicsBufferBindings> @end
-@implementation CCGraphicsBufferBindingsMetal {
-	CCGraphicsBufferMetal *_vertexBuffer;
-	CCGraphicsBufferMetal *_indexBuffer;
-}
+@interface CCGraphicsBufferBindingsMetal : CCGraphicsBufferBindings @end
+@implementation CCGraphicsBufferBindingsMetal
 
--(instancetype)initWithVertexBuffer:(CCGraphicsBufferMetal *)vertexBuffer indexBuffer:(CCGraphicsBufferMetal *)indexBuffer
+-(instancetype)init
 {
 	if((self = [super init])){
-		_vertexBuffer = vertexBuffer;
-		_indexBuffer = indexBuffer;
+		CCRenderDispatch(NO, ^{
+			const NSUInteger CCRENDERER_INITIAL_VERTEX_CAPACITY = 16*1024;
+			_vertexBuffer = [[CCGraphicsBufferMetal alloc] initWithCapacity:CCRENDERER_INITIAL_VERTEX_CAPACITY elementSize:sizeof(CCVertex) type:CCGraphicsBufferTypeVertex];
+			[_vertexBuffer prepare];
+			
+			_indexBuffer = [[CCGraphicsBufferMetal alloc] initWithCapacity:CCRENDERER_INITIAL_VERTEX_CAPACITY*1.5 elementSize:sizeof(uint16_t) type:CCGraphicsBufferTypeIndex];
+			[_indexBuffer prepare];
+			
+//			_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];
+		});
 	}
 	
 	return self;
 }
 
--(void)bind:(BOOL)bind
-{
-	id<MTLRenderCommandEncoder> renderEncoder = [CCMetalContext currentContext].currentRenderCommandEncoder;
-	
-	CCMTL_DEBUG_INSERT_EVENT_MARKER(renderEncoder, @"CCGraphicsBufferBindingsMetal: Bind vertex array.");
-	[renderEncoder setVertexBuffer:_vertexBuffer->_buffer offset:0 atIndex:0];
-}
-
 @end
 
 #endif
