Extracting framebuffer objects into their own class. CCRenderers are bound to a single FBO. Implementation for effects and render textures not finished.

Author: slembcke

cocos2d-ios.xcodeproj/project.pbxproj

@@ -1906,15 +1906,15 @@
 				D34CAD6519C3A7A5009BED7A /* CCRendererBasicTypes.h */,
 				D34CAD6A19C3AA10009BED7A /* CCRendererBasicTypes_Private.h */,
 				D34CAD6819C3A7B3009BED7A /* CCRendererBasicTypes.m */,
-				D38058181889AD6000822437 /* CCRenderer.h */,
-				D309054F18AC23110081BF11 /* CCRenderer_Private.h */,
-				D38058191889AD6000822437 /* CCRenderer.m */,
-				D36DFA2719996EC500DEC135 /* CCRendererGLSupport.m */,
 				E0BC7D9B1342CE7B001B4DCC /* CCShader.h */,
 				D39FA9C718C1BC6B00441627 /* CCShader_Private.h */,
 				E0BC7D9C1342CE7B001B4DCC /* CCShader.m */,
 				D34CAD5F19C3A0B5009BED7A /* NSValue+CCRenderer.h */,
 				D34CAD6219C3A0FD009BED7A /* NSValue+CCRenderer.m */,
+				D38058181889AD6000822437 /* CCRenderer.h */,
+				D309054F18AC23110081BF11 /* CCRenderer_Private.h */,
+				D38058191889AD6000822437 /* CCRenderer.m */,
+				D36DFA2719996EC500DEC135 /* CCRendererGLSupport.m */,
 			);
 			name = Rendering;
 			sourceTree = "<group>";

cocos2d/CCDirector.m

@@ -96,7 +96,9 @@ -(void) calculateDeltaTime;
 -(void) calculateMPF;
 @end
 
-@implementation CCDirector
+@implementation CCDirector {
+	CCFrameBufferObject *_framebuffer;
+}
 
 @synthesize animationInterval = _animationInterval;
 @synthesize runningScene = _runningScene;
@@ -200,6 +202,8 @@ - (id) init
 
 		_rendererPool = [NSMutableArray array];
 		_globalShaderUniforms = [NSMutableDictionary dictionary];
+		
+		_framebuffer = [[CCFrameBufferObject alloc] init];
 	}
 
 	return self;
@@ -237,8 +241,11 @@ - (void) drawScene
 	if(CCRenderDispatchBeginFrame()){
 		GLKMatrix4 projection = self.projectionMatrix;
 
+		// Synchronize the framebuffer with the view.
+		[_framebuffer syncWithView:self.view];
+		
 		CCRenderer *renderer = [self rendererFromPool];
-		[renderer prepareWithProjection:&projection viewSize:self.viewSize contentScale:self.contentScaleFactor];
+		[renderer prepareWithProjection:&projection framebuffer:_framebuffer];
 		[CCRenderer bindRenderer:renderer];
 
 		[renderer enqueueClear:(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT) color:_runningScene.colorRGBA.glkVector4 depth:1.0f stencil:0 globalSortOrder:NSIntegerMin];

cocos2d/CCRenderTexture.m

@@ -83,31 +83,6 @@ - (CGAffineTransform)nodeToWorldTransform
 @end
 
 
-@interface CCRenderTextureFBO : NSObject
-
-@property (nonatomic, readonly) GLuint FBO;
-@property (nonatomic, readonly) GLuint depthRenderBuffer;
-@property (nonatomic, readonly) GLuint stencilRenderBuffer;
-
-@end
-
-
-@implementation CCRenderTextureFBO
-
-- (id)initWithFBO:(GLuint)fbo depthRenderBuffer:(GLuint)depthBuffer stencilRenderBuffer:(GLuint)stencilRenderBuffer
-{
-    if((self = [super init]))
-    {
-        _FBO = fbo;
-        _depthRenderBuffer = depthBuffer;
-        _stencilRenderBuffer = stencilRenderBuffer;
-    }
-    return self;
-}
-
-@end
-
-
 @implementation CCRenderTexture
 
 +(id)renderTextureWithWidth:(int)w height:(int)h pixelFormat:(CCTexturePixelFormat) format depthStencilFormat:(GLuint)depthStencilFormat
@@ -139,7 +114,6 @@ - (id)initWithWidth:(int)w height:(int)h pixelFormat:(CCTexturePixelFormat)forma
 -(id)initWithWidth:(int)width height:(int)height pixelFormat:(CCTexturePixelFormat) format depthStencilFormat:(GLuint)depthStencilFormat
 {
 	if((self = [super init])){
-        
 		NSAssert(format != CCTexturePixelFormat_A8, @"only RGB and RGBA formats are valid for a render texture");
 
 		CCDirector *director = [CCDirector sharedDirector];
@@ -149,20 +123,21 @@ -(id)initWithWidth:(int)width height:(int)height pixelFormat:(CCTexturePixelForm
 			CCLOGWARN(@"cocos2d: WARNING. CCRenderTexture is running on its own thread. Make sure that an OpenGL context is being used on this thread!");
 
 		_contentScale = [CCDirector sharedDirector].contentScaleFactor;
-        [self setContentSize:CGSizeMake(width, height)];
+		[self setContentSize:CGSizeMake(width, height)];
 		_pixelFormat = format;
 		_depthStencilFormat = depthStencilFormat;
 
 		// Flip the projection matrix on the y-axis since Cocos2D uses upside down textures.
 		_projection = GLKMatrix4MakeOrtho(0.0f, width, 0.0f, height, -1024.0f, 1024.0f);
 
-        CCRenderTextureSprite *rtSprite = [CCRenderTextureSprite spriteWithTexture:[CCTexture none]];
-        rtSprite.renderTexture = self;
-        _sprite = rtSprite;
+		CCRenderTextureSprite *rtSprite = [CCRenderTextureSprite spriteWithTexture:[CCTexture none]];
+		rtSprite.renderTexture = self;
+		_sprite = rtSprite;
 
 		// Diabled by default.
 		_autoDraw = NO;
 	}
+	
 	return self;
 }
 
@@ -182,8 +157,6 @@ -(void)createTextureAndFboWithPixelSize:(CGSize)pixelSize
 {
 	CCGL_DEBUG_PUSH_GROUP_MARKER("CCRenderTexture: Create");
 
-	glGetIntegerv(GL_FRAMEBUFFER_BINDING, &_oldFBO);
-
 	// textures must be power of two
 	NSUInteger powW;
 	NSUInteger powH;
@@ -197,120 +170,21 @@ -(void)createTextureAndFboWithPixelSize:(CGSize)pixelSize
 	}
 
 	void *data = calloc(powW*powH, 4);
-
 	CCTexture *texture = [[CCTexture alloc] initWithData:data pixelFormat:_pixelFormat pixelsWide:powW pixelsHigh:powH contentSizeInPixels:pixelSize contentScale:_contentScale];
 	self.texture = texture;
 	free(data);
 
 	// Render textures are nearest filtered for legacy reasons.
 	self.texture.antialiased = NO;
 
-	CCRenderDispatch(NO, ^{
-		CCGL_DEBUG_PUSH_GROUP_MARKER("CCRenderTexture: Create");
-		
-		glGetIntegerv(GL_FRAMEBUFFER_BINDING, &_oldFBO);
-	
-		GLint oldRBO;
-		glGetIntegerv(GL_RENDERBUFFER_BINDING, &oldRBO);
-
-		// generate FBO
-		GLuint fbo;
-		glGenFramebuffers(1, &fbo);
-		glBindFramebuffer(GL_FRAMEBUFFER, fbo);
-		
-		// associate texture with FBO
-		glFramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D, texture.name, 0);
-
-		GLuint depthRenderBuffer = 0;
-    GLuint stencilRenderBuffer = 0;
-    
-#if __CC_PLATFORM_ANDROID
-    
-    // Some android devices *only* support combined depth buffers (like all iOS devices), some android devices do not
-    // support combined depth buffers, thus we have to create a seperate stencil buffer
-    if(_depthStencilFormat)
-    {
-        //create and attach depth buffer
-		
-        if(![[CCConfiguration sharedConfiguration] supportsPackedDepthStencil])
-        {
-            glGenRenderbuffers(1, &depthRenderBuffer);
-            glBindRenderbuffer(GL_RENDERBUFFER, depthRenderBuffer);
-            glRenderbufferStorage(GL_RENDERBUFFER, GL_DEPTH_COMPONENT16, (GLsizei)powW, (GLsizei)powH); //GL_DEPTH_COMPONENT24_OES
-            glFramebufferRenderbuffer(GL_FRAMEBUFFER, GL_DEPTH_ATTACHMENT, GL_RENDERBUFFER, depthRenderBuffer);
-
-            // if depth format is the one with stencil part, bind same render buffer as stencil attachment
-            if(_depthStencilFormat == GL_DEPTH24_STENCIL8)
-            {
-                glGenRenderbuffers(1, &stencilRenderBuffer);
-                glBindRenderbuffer(GL_RENDERBUFFER, stencilRenderBuffer);
-                glRenderbufferStorage(GL_RENDERBUFFER, GL_STENCIL_INDEX8, (GLsizei)powW, (GLsizei)powH);
-                glFramebufferRenderbuffer(GL_FRAMEBUFFER, GL_STENCIL_ATTACHMENT, GL_RENDERBUFFER, stencilRenderBuffer);
-            }
-        }
-        else
-        {
-            glGenRenderbuffers(1, &depthRenderBuffer);
-            glBindRenderbuffer(GL_RENDERBUFFER, depthRenderBuffer);
-            glRenderbufferStorage(GL_RENDERBUFFER, _depthStencilFormat, (GLsizei)powW, (GLsizei)powH);
-            glFramebufferRenderbuffer(GL_FRAMEBUFFER, GL_DEPTH_ATTACHMENT, GL_RENDERBUFFER, depthRenderBuffer);
-            
-            // if depth format is the one with stencil part, bind same render buffer as stencil attachment
-            if(_depthStencilFormat == GL_DEPTH24_STENCIL8){
-                glFramebufferRenderbuffer(GL_FRAMEBUFFER, GL_STENCIL_ATTACHMENT, GL_RENDERBUFFER, depthRenderBuffer);
-            }
-        }
-		}
-    
-#else
-		
-		if(_depthStencilFormat)
-			{
-			//create and attach depth buffer
-			glGenRenderbuffers(1, &depthRenderBuffer);
-			glBindRenderbuffer(GL_RENDERBUFFER, depthRenderBuffer);
-			glRenderbufferStorage(GL_RENDERBUFFER, _depthStencilFormat, (GLsizei)powW, (GLsizei)powH);
-			glFramebufferRenderbuffer(GL_FRAMEBUFFER, GL_DEPTH_ATTACHMENT, GL_RENDERBUFFER, depthRenderBuffer);
-
-			// associate texture with FBO
-			glFramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D, texture.name, 0);
-
-			if(_depthStencilFormat){
-				//create and attach depth buffer
-				glGenRenderbuffers(1, &depthRenderBuffer);
-				glBindRenderbuffer(GL_RENDERBUFFER, depthRenderBuffer);
-				glRenderbufferStorage(GL_RENDERBUFFER, _depthStencilFormat, (GLsizei)powW, (GLsizei)powH);
-				glFramebufferRenderbuffer(GL_FRAMEBUFFER, GL_DEPTH_ATTACHMENT, GL_RENDERBUFFER, depthRenderBuffer);
-
-				// if depth format is the one with stencil part, bind same render buffer as stencil attachment
-				if(_depthStencilFormat == GL_DEPTH24_STENCIL8){
-					glFramebufferRenderbuffer(GL_FRAMEBUFFER, GL_STENCIL_ATTACHMENT, GL_RENDERBUFFER, depthRenderBuffer);
-				}
-			}
-		}
-		
-#endif
-	
-		// check if it worked (probably worth doing :) )
-//		NSAssert( glCheckFramebufferStatus(GL_FRAMEBUFFER) == GL_FRAMEBUFFER_COMPLETE, @"Could not attach texture to framebuffer");
-		
-		_FBO = [[CCRenderTextureFBO alloc] initWithFBO:fbo depthRenderBuffer:depthRenderBuffer stencilRenderBuffer:stencilRenderBuffer];
-		
-		glBindRenderbuffer(GL_RENDERBUFFER, oldRBO);
-		glBindFramebuffer(GL_FRAMEBUFFER, _oldFBO);
-		
-		CCGL_DEBUG_POP_GROUP_MARKER();
-		CC_CHECK_GL_ERROR_DEBUG();
-	});
+	_framebuffer = [[CCFrameBufferObject alloc] initWithTexture:texture depthStencilFormat:_depthStencilFormat];
 
     // XXX Thayer says: I think this is incorrect for any situations where the content
     // size type isn't (points, points). The call to setTextureRect below eventually arrives
     // at some code that assumes the supplied size is in points so, if the size is not in points,
     // things break.
-	CGRect rect = CGRectMake(0, 0, _contentSize.width, _contentSize.height);
-	
 	[self assignSpriteTexture];
-	[_sprite setTextureRect:rect];
+	[_sprite setTextureRect:CGRectMake(0, 0, _contentSize.width, _contentSize.height)];
 }
 
 -(void)assignSpriteTexture
@@ -329,25 +203,7 @@ -(void)setContentScale:(float)contentScale
 
 -(void)destroy
 {
-	GLuint fbo = _FBO.FBO;
-	GLuint depthRenderBuffer = _FBO.depthRenderBuffer;
-	GLuint stencilRenderBuffer = _FBO.stencilRenderBuffer;
-	
-	CCRenderDispatch(YES, ^{
-    glDeleteFramebuffers(1, &fbo);
-		
-    if (depthRenderBuffer)
-    {
-        glDeleteRenderbuffers(1, &depthRenderBuffer);
-    }
-    
-    if (depthRenderBuffer)
-    {
-        glDeleteRenderbuffers(1, &stencilRenderBuffer);
-    }
-	});
-
-	_FBO = nil;
+	_framebuffer = nil;
 	self.texture = nil;
 }
 
@@ -366,39 +222,20 @@ -(CCTexture *)texture
     return super.texture;
 }
 
--(GLuint)fbo
-{
-    if (super.texture == nil)
-    {
-        [self create];
-    }
-    
-    return _FBO.FBO;
-}
-
 -(CCRenderer *)begin
 {
 	CCTexture *texture = self.texture;
+	if(texture == nil){
+		[self create];
+		texture = self.texture;
+	}
 
 	CCRenderer *renderer = [[CCDirector sharedDirector] rendererFromPool];
-	[renderer prepareWithProjection:&_projection viewSize:texture.contentSize contentScale:texture.contentScale];
+	[renderer prepareWithProjection:&_projection framebuffer:_framebuffer];
 
 	_previousRenderer = [CCRenderer currentRenderer];
 	[CCRenderer bindRenderer:renderer];
 
-	CGSize pixelSize = texture.contentSizeInPixels;
-	GLuint fbo = [self fbo];
-	
-	[renderer pushGroup];
-	
-	[renderer enqueueBlock:^{
-		glGetFloatv(GL_VIEWPORT, _oldViewport.v);
-		glViewport(0, 0, pixelSize.width, pixelSize.height );
-		
-		glGetIntegerv(GL_FRAMEBUFFER_BINDING, &_oldFBO);
-		glBindFramebuffer(GL_FRAMEBUFFER, fbo);
-	} globalSortOrder:NSIntegerMin debugLabel:@"CCRenderTexture: Bind FBO" threadSafe:NO];
-	
 	return renderer;
 }
 
@@ -427,13 +264,6 @@ -(void)end
 {
 	CCRenderer *renderer = [CCRenderer currentRenderer];
 
-	[renderer enqueueBlock:^{
-		glBindFramebuffer(GL_FRAMEBUFFER, _oldFBO);
-		glViewport(_oldViewport.v[0], _oldViewport.v[1], _oldViewport.v[2], _oldViewport.v[3]);
-	} globalSortOrder:NSIntegerMax debugLabel:@"CCRenderTexture: Restore FBO" threadSafe:NO];
-	
-	[renderer popGroupWithDebugLabel:@"CCRenderTexture begin/end" globalSortOrder:0];
-	
 	__unsafe_unretained CCDirector *director = [CCDirector sharedDirector];
 	CCRenderDispatch(renderer.threadsafe, ^{
 		[director addFrameCompletionHandler:^{

cocos2d/CCRenderTexture_Private.h

@@ -8,41 +8,32 @@
 
 #import "CCRenderTexture.h"
 
-@class CCRenderTextureFBO;
+@class CCFrameBufferObject;
 
 @interface CCRenderTexture() {
 
 @protected
     GLenum _pixelFormat;
     GLuint _depthStencilFormat;
 
-		#warning TODO remove me.
-    CCRenderer *_renderer;
 		// Reference to the previous render to be restored by end.
 		CCRenderer *_previousRenderer;
 
     GLKVector4 _clearColor;
 
-    GLKVector4 _oldViewport;
-    GLint _oldFBO;
-    NSDictionary *_oldGlobalUniforms;
-
-
     float _contentScale;
     GLKMatrix4 _projection;
 
     CCSprite* _sprite;
 
-    CCRenderTextureFBO *_FBO;
+    CCFrameBufferObject *_framebuffer;
 
     BOOL _contentSizeChanged;
 }
 
 -(void)createTextureAndFboWithPixelSize:(CGSize)pixelSize;
 -(void)destroy;
 
--(GLuint)fbo;
-
 -(void)assignSpriteTexture;
 
 @end