Skip to content

Commit

Permalink
Merge remote-tracking branch 'refs/remotes/araker/issue1254' into dev…
Browse files Browse the repository at this point in the history 
…elop
  • Loading branch information
@ricardoquesada
ricardoquesada committed Oct 10, 2011
2 parents c58d71e + 9b72e1f commit fdcfd6b
Show file tree
Hide file tree
Showing 4 changed files with 129 additions and 129 deletions.
7 changes: 3 additions & 4 deletions cocos2d/Platforms/iOS/EAGLView.m
View file
Expand Up @@ -185,7 +185,6 @@ -(BOOL) setupSurfaceWithSharegroup:(EAGLSharegroup*)sharegroup
return NO;

context_ = [renderer_ context];
[context_ renderbufferStorage:GL_RENDERBUFFER_OES fromDrawable:eaglLayer];

discardFramebufferSupported_ = [[CCConfiguration sharedConfiguration] supportsDiscardFramebuffer];

Expand All @@ -203,10 +202,9 @@ - (void) dealloc

- (void) layoutSubviews
{
size_ = [renderer_ backingSize];

[renderer_ resizeFromLayer:(CAEAGLLayer*)self.layer];

size_ = [renderer_ backingSize];

// Issue #914 #924
CCDirector *director = [CCDirector sharedDirector];
[director reshapeProjection:size_];
Expand Down Expand Up @@ -268,6 +266,7 @@ - (void) swapBuffers
CHECK_GL_ERROR();
#endif

if (![renderer_ defaultFrameBuffer]) [renderer_ createFrameBuffer:(CAEAGLLayer*) self.layer];
// We can safely re-bind the framebuffer here, since this will be the
// 1st instruction of the new main loop
if( multiSampling_ )
Expand Down
10 changes: 6 additions & 4 deletions cocos2d/Platforms/iOS/ES1Renderer.h
View file
Expand Up @@ -50,14 +50,14 @@
unsigned int pixelFormat_;

// The OpenGL ES names for the framebuffer and renderbuffer used to render to this view
GLuint defaultFramebuffer_;
GLuint colorRenderbuffer_;
GLuint defaultFrameBuffer_;
GLuint colorRenderBuffer_;
GLuint depthBuffer_;


//buffers for MSAA
GLuint msaaFramebuffer_;
GLuint msaaColorbuffer_;
GLuint msaaFrameBuffer_;
GLuint msaaColorBuffer_;

EAGLContext *context_;
}
Expand All @@ -66,6 +66,8 @@
@property (nonatomic,readonly) EAGLContext* context;

- (BOOL)resizeFromLayer:(CAEAGLLayer *)layer;
- (void) createFrameBuffer:(CAEAGLLayer *)layer;
- (void) destroyFrameBuffer;

@end

Expand Down
240 changes: 119 additions & 121 deletions cocos2d/Platforms/iOS/ES1Renderer.m
View file
Expand Up @@ -42,7 +42,6 @@ - (GLenum) convertPixelFormat:(int) pixelFormat;

@end


@implementation ES1Renderer

@synthesize context=context_;
Expand All @@ -67,123 +66,151 @@ - (id) initWithDepthFormat:(unsigned int)depthFormat withPixelFormat:(unsigned i
}

backingWidth_ = backingHeight_ = 0;

// Create default framebuffer object. The backing will be allocated for the current layer in -resizeFromLayer
glGenFramebuffersOES(1, &defaultFramebuffer_);
NSAssert( defaultFramebuffer_, @"Can't create default frame buffer");
glGenRenderbuffersOES(1, &colorRenderbuffer_);
NSAssert( colorRenderbuffer_, @"Can't create default render buffer");

glBindFramebufferOES(GL_FRAMEBUFFER_OES, defaultFramebuffer_);
glBindRenderbufferOES(GL_RENDERBUFFER_OES, colorRenderbuffer_);
glFramebufferRenderbufferOES(GL_FRAMEBUFFER_OES, GL_COLOR_ATTACHMENT0_OES, GL_RENDERBUFFER_OES, colorRenderbuffer_);

depthFormat_ = depthFormat;
depthBuffer_ = colorRenderBuffer_ = defaultFrameBuffer_ = msaaColorBuffer_ = msaaFrameBuffer_ = 0;

if( depthFormat_ ) {
// glGenRenderbuffersOES(1, &depthBuffer_);
// glBindRenderbufferOES(GL_RENDERBUFFER_OES, depthBuffer_);
// glRenderbufferStorageOES(GL_RENDERBUFFER_OES, depthFormat_, 100, 100);
// glFramebufferRenderbufferOES(GL_FRAMEBUFFER_OES, GL_DEPTH_ATTACHMENT_OES, GL_RENDERBUFFER_OES, depthBuffer_);

// default buffer
// glBindRenderbufferOES(GL_RENDERBUFFER_OES, colorRenderbuffer_);
}
depthFormat_ = depthFormat;

pixelFormat_ = pixelFormat;
multiSampling_ = multiSampling;

if (multiSampling_)
{
GLint maxSamplesAllowed;
glGetIntegerv(GL_MAX_SAMPLES_APPLE, &maxSamplesAllowed);
samplesToUse_ = MIN(maxSamplesAllowed,requestedSamples);

/* Create the MSAA framebuffer (offscreen) */
glGenFramebuffersOES(1, &msaaFramebuffer_);
glBindFramebufferOES(GL_FRAMEBUFFER_OES, msaaFramebuffer_);

}

CHECK_GL_ERROR();
}

return self;
}

- (BOOL)resizeFromLayer:(CAEAGLLayer *)layer
{
// Allocate color buffer backing based on the current layer size

glBindRenderbufferOES(GL_RENDERBUFFER_OES, colorRenderbuffer_);

int oldWidth = backingWidth_;
int oldHeight = backingHeight_;
- (void) destroyFrameBuffer
{
// Tear down GL
if(defaultFrameBuffer_)
{
glDeleteFramebuffersOES(1, &defaultFrameBuffer_);
defaultFrameBuffer_ = 0;
}

if (![context_ renderbufferStorage:GL_RENDERBUFFER_OES fromDrawable:layer])
if(colorRenderBuffer_)
{
glDeleteRenderbuffersOES(1, &colorRenderBuffer_);
colorRenderBuffer_ = 0;
}

if( depthBuffer_ )
{
CCLOG(@"failed to call context");
glDeleteRenderbuffersOES(1, &depthBuffer_);
depthBuffer_ = 0;
}

if ( msaaColorBuffer_)
{
glDeleteRenderbuffersOES(1, &msaaColorBuffer_);
msaaColorBuffer_ = 0;
}

glGetRenderbufferParameterivOES(GL_RENDERBUFFER_OES, GL_RENDERBUFFER_WIDTH_OES, &backingWidth_);
glGetRenderbufferParameterivOES(GL_RENDERBUFFER_OES, GL_RENDERBUFFER_HEIGHT_OES, &backingHeight_);

if (oldWidth != backingWidth_ || oldHeight != backingHeight_)
if ( msaaFrameBuffer_)
{
glDeleteRenderbuffersOES(1, &msaaFrameBuffer_);
msaaFrameBuffer_ = 0;
}
}

CCLOG(@"cocos2d: surface size: %dx%d", (int)backingWidth_, (int)backingHeight_);
- (void) createFrameBuffer:(CAEAGLLayer *)layer
{
glGenFramebuffersOES(1, &defaultFrameBuffer_);
glBindFramebufferOES(GL_FRAMEBUFFER_OES, defaultFrameBuffer_);

NSAssert( defaultFrameBuffer_, @"Can't create default frame buffer");

glGenRenderbuffersOES(1, &colorRenderBuffer_);
glBindRenderbufferOES(GL_RENDERBUFFER_OES, colorRenderBuffer_);

if (multiSampling_)
{

if ( msaaColorbuffer_) {
glDeleteRenderbuffersOES(1, &msaaColorbuffer_);
msaaColorbuffer_ = 0;
}
NSAssert( colorRenderBuffer_, @"Can't create default render buffer");

/* Create the offscreen MSAA color buffer.
After rendering, the contents of this will be blitted into ColorRenderbuffer */

//msaaFrameBuffer needs to be binded
glBindFramebufferOES(GL_FRAMEBUFFER_OES, msaaFramebuffer_);
glGenRenderbuffersOES(1, &msaaColorbuffer_);
glBindRenderbufferOES(GL_RENDERBUFFER_OES, msaaColorbuffer_);
glRenderbufferStorageMultisampleAPPLE(GL_RENDERBUFFER_OES, samplesToUse_,pixelFormat_ , backingWidth_, backingHeight_);
glFramebufferRenderbufferOES(GL_FRAMEBUFFER_OES, GL_COLOR_ATTACHMENT0_OES, GL_RENDERBUFFER_OES, msaaColorbuffer_);

if (glCheckFramebufferStatusOES(GL_FRAMEBUFFER_OES) != GL_FRAMEBUFFER_COMPLETE_OES)
{
CCLOG(@"Failed to make complete framebuffer object %x", glCheckFramebufferStatusOES(GL_FRAMEBUFFER_OES));
return NO;
}
}
// Create default framebuffer object. The backing will be allocated for the current layer in -resizeFromLayer
if (![context_ renderbufferStorage:GL_RENDERBUFFER_OES fromDrawable:layer])
{
CCLOG(@"failed to call context");
}

glFramebufferRenderbufferOES(GL_FRAMEBUFFER_OES, GL_COLOR_ATTACHMENT0_OES, GL_RENDERBUFFER_OES, colorRenderBuffer_);

glGetRenderbufferParameterivOES(GL_RENDERBUFFER_OES, GL_RENDERBUFFER_WIDTH_OES, &backingWidth_);
glGetRenderbufferParameterivOES(GL_RENDERBUFFER_OES, GL_RENDERBUFFER_HEIGHT_OES, &backingHeight_);

if (multiSampling_)
{
/* Create the offscreen MSAA color buffer.
After rendering, the contents of this will be blitted into ColorRenderbuffer */

if (depthFormat_)
{
if( ! depthBuffer_ )
glGenRenderbuffersOES(1, &depthBuffer_);

glBindRenderbufferOES(GL_RENDERBUFFER_OES, depthBuffer_);
if( multiSampling_ )
glRenderbufferStorageMultisampleAPPLE(GL_RENDERBUFFER_OES, samplesToUse_, depthFormat_,backingWidth_, backingHeight_);
else
glRenderbufferStorageOES(GL_RENDERBUFFER_OES, depthFormat_, backingWidth_, backingHeight_);
glFramebufferRenderbufferOES(GL_FRAMEBUFFER_OES, GL_DEPTH_ATTACHMENT_OES, GL_RENDERBUFFER_OES, depthBuffer_);

// bind color buffer
glBindRenderbufferOES(GL_RENDERBUFFER_OES, colorRenderbuffer_);
}
glGenFramebuffersOES(1, &msaaFrameBuffer_);
glBindFramebufferOES(GL_FRAMEBUFFER_OES, msaaFrameBuffer_);

glGenRenderbuffersOES(1, &msaaColorBuffer_);
glBindRenderbufferOES(GL_RENDERBUFFER_OES, msaaColorBuffer_);

glRenderbufferStorageMultisampleAPPLE(GL_RENDERBUFFER_OES, samplesToUse_,pixelFormat_ , backingWidth_, backingHeight_);

glBindFramebufferOES(GL_FRAMEBUFFER_OES, defaultFramebuffer_);
glFramebufferRenderbufferOES(GL_FRAMEBUFFER_OES, GL_COLOR_ATTACHMENT0_OES, GL_RENDERBUFFER_OES, msaaColorBuffer_);

if (glCheckFramebufferStatusOES(GL_FRAMEBUFFER_OES) != GL_FRAMEBUFFER_COMPLETE_OES)
{
CCLOG(@"Failed to make complete framebuffer object %x", glCheckFramebufferStatusOES(GL_FRAMEBUFFER_OES));
return NO;
}
}

if (depthFormat_)
{
glGenRenderbuffersOES(1, &depthBuffer_);
glBindRenderbufferOES(GL_RENDERBUFFER_OES, depthBuffer_);

if( multiSampling_ )
glRenderbufferStorageMultisampleAPPLE(GL_RENDERBUFFER_OES, samplesToUse_, depthFormat_,backingWidth_, backingHeight_);
else
glRenderbufferStorageOES(GL_RENDERBUFFER_OES, depthFormat_, backingWidth_, backingHeight_);

CHECK_GL_ERROR();
}
return YES;
glFramebufferRenderbufferOES(GL_FRAMEBUFFER_OES, GL_DEPTH_ATTACHMENT_OES, GL_RENDERBUFFER_OES, depthBuffer_);

// bind color buffer
glBindRenderbufferOES(GL_RENDERBUFFER_OES, colorRenderBuffer_);

}

glBindFramebufferOES(GL_FRAMEBUFFER_OES, defaultFrameBuffer_);

if (glCheckFramebufferStatusOES(GL_FRAMEBUFFER_OES) != GL_FRAMEBUFFER_COMPLETE_OES)
{
CCLOG(@"Failed to make complete framebuffer object %x", glCheckFramebufferStatusOES(GL_FRAMEBUFFER_OES));
}

CHECK_GL_ERROR();
}

- (BOOL)resizeFromLayer:(CAEAGLLayer *)layer
{
if (colorRenderBuffer_)
{
CGRect bounds = layer.bounds;
//issue #1153, view is always resized, even when size is the same
if (backingWidth_ != bounds.size.width || backingHeight_ != bounds.size.height)
{
//issue #1254 possible freeze of EAGLView, always destroy and recreate buffers when needed
[self destroyFrameBuffer];


CCLOG(@"cocos2d: surface size: %dx%d, resizing buffers", (int)backingWidth_, (int)backingHeight_);
}
}
else
{//first time
[self createFrameBuffer:layer];
CCLOG(@"cocos2d: surface size: %dx%d", (int)backingWidth_, (int)backingHeight_);
}

return YES;
}

-(CGSize) backingSize
Expand All @@ -201,36 +228,7 @@ - (void)dealloc
{
CCLOGINFO(@"cocos2d: deallocing %@", self);

// Tear down GL
if(defaultFramebuffer_)
{
glDeleteFramebuffersOES(1, &defaultFramebuffer_);
defaultFramebuffer_ = 0;
}

if(colorRenderbuffer_)
{
glDeleteRenderbuffersOES(1, &colorRenderbuffer_);
colorRenderbuffer_ = 0;
}

if( depthBuffer_ )
{
glDeleteRenderbuffersOES(1, &depthBuffer_);
depthBuffer_ = 0;
}

if ( msaaColorbuffer_)
{
glDeleteRenderbuffersOES(1, &msaaColorbuffer_);
msaaColorbuffer_ = 0;
}

if ( msaaFramebuffer_)
{
glDeleteRenderbuffersOES(1, &msaaFramebuffer_);
msaaFramebuffer_ = 0;
}
[self destroyFrameBuffer];

// Tear down context
if ([EAGLContext currentContext] == context_)
Expand All @@ -244,22 +242,22 @@ - (void)dealloc

- (unsigned int) colorRenderBuffer
{
return colorRenderbuffer_;
return colorRenderBuffer_;
}

- (unsigned int) defaultFrameBuffer
{
return defaultFramebuffer_;
return defaultFrameBuffer_;
}

- (unsigned int) msaaFrameBuffer
{
return msaaFramebuffer_;
return msaaFrameBuffer_;
}

- (unsigned int) msaaColorBuffer
{
return msaaColorbuffer_;
return msaaColorBuffer_;
}

@end
Expand Down
1 change: 1 addition & 0 deletions cocos2d/Platforms/iOS/ESRenderer.h
View file
Expand Up @@ -41,6 +41,7 @@
- (id) initWithDepthFormat:(unsigned int)depthFormat withPixelFormat:(unsigned int)pixelFormat withSharegroup:(EAGLSharegroup*)sharegroup withMultiSampling:(BOOL) multiSampling withNumberOfSamples:(unsigned int) requestedSamples;

- (BOOL) resizeFromLayer:(CAEAGLLayer *)layer;
- (void) createFrameBuffer:(CAEAGLLayer *)layer;

- (EAGLContext*) context;
- (CGSize) backingSize;
Expand Down

0 comments on commit fdcfd6b

Please sign in to comment.