More CCGLView cleanup.

Author: slembcke

CCRendererGLSupport.m

@@ -374,13 +374,11 @@ -(void)bind
 
 -(void)syncWithView:(CC_VIEW<CCDirectorView> *)view;
 {
-	#warning TODO this won't work for Mac. Need to expand the view protocol.
 	CCGLView *glView = (CCGLView *)view;
 	self.sizeInPixels = CC_SIZE_SCALE(view.bounds.size, view.contentScaleFactor);
 	self.contentScale = view.contentScaleFactor;
 
-	#warning TODO does this need to handle MSAA specially?
-	_fbo = glView.defaultFramebuffer;
+	_fbo = glView.fbo;
 }
 
 @end

cocos2d/Platforms/iOS/CCGLView.h

@@ -102,20 +102,6 @@ Copyright (C) 2008 Apple Inc. All Rights Reserved.
 	- Possible values: 0 to glGetIntegerv(GL_MAX_SAMPLES_APPLE)
  */
 @interface CCGLView : UIView <CCDirectorView>
-{
-	EAGLContext *_context;
-
-	NSString *_pixelFormat;
-	GLuint					_depthFormat;
-	BOOL					_preserveBackbuffer;
-
-	CGSize					_size;
-	BOOL					_discardFramebufferSupported;
-
-	//fsaa addition
-	BOOL					_multisampling;
-	unsigned int			_requestedSamples;
-}
 
 /** creates an initializes an CCGLView with a frame and 0-bit depth buffer, and a RGB565 color buffer. */
 + (id) viewWithFrame:(CGRect)frame;
@@ -146,7 +132,7 @@ Copyright (C) 2008 Apple Inc. All Rights Reserved.
 
 @property(nonatomic,readwrite) BOOL multiSampling;
 
-@property(nonatomic, readonly) GLuint defaultFramebuffer;
+@property(nonatomic, readonly) GLuint fbo;
 
 @end
 

cocos2d/Platforms/iOS/CCGLView.m

@@ -148,9 +148,16 @@ -(BOOL)isComplete
 @end
 
 @implementation CCGLView {
-    CCTouchEvent* _touchEvent;
+	CCTouchEvent* _touchEvent;
 	NSMutableArray *_fences;
 
+	EAGLContext *_context;
+
+	NSString *_pixelFormat;
+	GLuint _depthFormat;
+	BOOL _preserveBackbuffer;
+	BOOL _discardFramebufferSupported;
+
 	GLuint _depthBuffer;
 	GLuint _colorRenderbuffer;
 	GLuint _defaultFramebuffer;
@@ -205,9 +212,12 @@ - (id) initWithFrame:(CGRect)frame pixelFormat:(NSString*)format depthFormat:(GL
 		_pixelFormat = format;
 		_depthFormat = depth;
 		_multiSampling = sampling;
-		_requestedSamples = nSamples;
 		_preserveBackbuffer = retained;
 
+		GLint maxSamplesAllowed;
+		glGetIntegerv(GL_MAX_SAMPLES_APPLE, &maxSamplesAllowed);
+		_msaaSamples = MIN(maxSamplesAllowed, nSamples);
+		
 		// Default to "retina" being enabled.
 		self.contentScaleFactor = [UIScreen mainScreen].scale;
 
@@ -236,8 +246,7 @@ -(id) initWithCoder:(NSCoder *)aDecoder
 		_pixelFormat = kEAGLColorFormatRGB565;
 		_depthFormat = 0; // GL_DEPTH_COMPONENT24;
 		_multiSampling= NO;
-		_requestedSamples = 0;
-		_size = [eaglLayer bounds].size;
+		_msaaSamples = 0;
 
 		if( ! [self setupSurfaceWithSharegroup:nil] ) {
 			return nil;
@@ -280,10 +289,6 @@ -(BOOL) setupSurfaceWithSharegroup:(EAGLSharegroup*)sharegroup
 		glFramebufferRenderbuffer(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_RENDERBUFFER, _colorRenderbuffer);
 
 		if (_multiSampling){
-			GLint maxSamplesAllowed;
-			glGetIntegerv(GL_MAX_SAMPLES_APPLE, &maxSamplesAllowed);
-			_msaaSamples = MIN(maxSamplesAllowed, _requestedSamples);
-
 			/* Create the MSAA framebuffer (offscreen) */
 			glGenFramebuffers(1, &_msaaFramebuffer);
 			glBindFramebuffer(GL_FRAMEBUFFER, _msaaFramebuffer);
@@ -359,11 +364,10 @@ -(void)resizeFromLayer:(CAEAGLLayer *)layer
 - (void) layoutSubviews
 {
 	[self resizeFromLayer:(CAEAGLLayer*)self.layer];
-	_size = CGSizeMake( _backingWidth, _backingHeight);
 
 	// Issue #914 #924
 	CCDirector *director = [CCDirector sharedDirector];
-	[director reshapeProjection:_size];
+	[director reshapeProjection:CGSizeMake( _backingWidth, _backingHeight)];
 
 	// Avoid flicker. Issue #350
 	// Only draw if there is something to draw, otherwise it actually creates a flicker of the current glClearColor
@@ -477,6 +481,15 @@ -(void)presentFrame
 	CC_CHECK_GL_ERROR_DEBUG();
 }
 
+-(GLuint)fbo
+{
+	if(_multiSampling){
+		return _msaaFramebuffer;
+	} else {
+		return _defaultFramebuffer;
+	}
+}
+
 -(GLenum)convertPixelFormat:(NSString*)pixelFormat
 {
 	if([pixelFormat isEqualToString:@"EAGLColorFormat565"]){