Enable depth testing when binding a CCFrameBufferObject.

Author: slembcke

CCRendererGLSupport.m

@@ -375,8 +375,13 @@ -(void)bindWithClear:(GLbitfield)mask color:(GLKVector4)color4 depth:(GLclampf)d
 	if(mask & GL_COLOR_BUFFER_BIT) glClearColor(color4.r, color4.g, color4.b, color4.a);
 	if(mask & GL_DEPTH_BUFFER_BIT) glClearDepth(depth);
 	if(mask & GL_STENCIL_BUFFER_BIT) glClearStencil(stencil);
+	if(mask) glClear(mask);
 
-	glClear(mask);
+	// Enabled depth testing if there is a depth buffer.
+	if(_depthStencilFormat){
+		glEnable(GL_DEPTH_TEST);
+		glDepthFunc(GL_LEQUAL);
+	}
 }
 
 -(void)syncWithView:(CC_VIEW<CCDirectorView> *)view;

cocos2d/CCDirector.m

@@ -396,13 +396,6 @@ -(void) setView:(CC_VIEW<CCDirectorView> *)view
 
 			[self createStatsLabel];
 			[self setProjection: _projection];
-			#warning TODO this should probably migrate somewhere else.
-//			if([(CCGLView *)view depthFormat]){
-//				CCRenderDispatch(YES, ^{
-//					glEnable(GL_DEPTH_TEST);
-//					glDepthFunc(GL_LEQUAL);
-//				});
-//			}
 		}
 
 		// Dump info once OpenGL was initilized

cocos2d/CCRendererBasicTypes.m

@@ -430,12 +430,14 @@ -(instancetype)initWithTexture:(CCTexture *)texture depthStencilFormat:(GLuint)d
 
 		_sizeInPixels = texture.contentSizeInPixels;
 		_contentScale = texture.contentScale;
+		
+		_depthStencilFormat = depthStencilFormat;
 	}
 
 	return self;
 }
 
--(void)bind
+-(void)bindWithClear:(GLbitfield)mask color:(GLKVector4)color4 depth:(GLclampf)depth stencil:(GLint)stencil
 {NSAssert(NO, @"Must be overridden.");}
 
 -(void)syncWithView:(CC_VIEW<CCDirectorView> *)view;

cocos2d/CCRendererBasicTypes_Private.h

@@ -116,7 +116,9 @@ CCGraphicsBufferPushElements(CCGraphicsBuffer *buffer, size_t requestedCount)
 @end
 
 
-@interface CCFrameBufferObject : NSObject
+@interface CCFrameBufferObject : NSObject {
+	GLuint _depthStencilFormat;
+}
 
 // Setters should be treated as protected.
 @property(nonatomic, readonly) CCTexture *texture;