Fix compile issues for Android.

slembcke · slembcke · commit c1353a63225a · 2014-09-23T09:44:09.000-05:00
diff --git a/CCRendererGLSupport.m b/CCRendererGLSupport.m
@@ -280,30 +280,30 @@ -(instancetype)initWithTexture:(CCTexture *)texture depthStencilFormat:(GLuint)d
 			
 					if(![[CCConfiguration sharedConfiguration] supportsPackedDepthStencil])
 					{
-							glGenRenderbuffers(1, &depthRenderBuffer);
-							glBindRenderbuffer(GL_RENDERBUFFER, depthRenderBuffer);
+							glGenRenderbuffers(1, &_depthRenderBuffer);
+							glBindRenderbuffer(GL_RENDERBUFFER, _depthRenderBuffer);
 							glRenderbufferStorage(GL_RENDERBUFFER, GL_DEPTH_COMPONENT16, width, height); //GL_DEPTH_COMPONENT24_OES
-							glFramebufferRenderbuffer(GL_FRAMEBUFFER, GL_DEPTH_ATTACHMENT, GL_RENDERBUFFER, depthRenderBuffer);
+							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, width, powH);
-									glFramebufferRenderbuffer(GL_FRAMEBUFFER, GL_STENCIL_ATTACHMENT, GL_RENDERBUFFER, stencilRenderBuffer);
+									glGenRenderbuffers(1, &_stencilRenderBuffer);
+									glBindRenderbuffer(GL_RENDERBUFFER, _stencilRenderBuffer);
+									glRenderbufferStorage(GL_RENDERBUFFER, GL_STENCIL_INDEX8, width, height);
+									glFramebufferRenderbuffer(GL_FRAMEBUFFER, GL_STENCIL_ATTACHMENT, GL_RENDERBUFFER, _stencilRenderBuffer);
 							}
 					}
 					else
 					{
-							glGenRenderbuffers(1, &depthRenderBuffer);
-							glBindRenderbuffer(GL_RENDERBUFFER, depthRenderBuffer);
+							glGenRenderbuffers(1, &_depthRenderBuffer);
+							glBindRenderbuffer(GL_RENDERBUFFER, _depthRenderBuffer);
 							glRenderbufferStorage(GL_RENDERBUFFER, _depthStencilFormat, width, height);
-							glFramebufferRenderbuffer(GL_FRAMEBUFFER, GL_DEPTH_ATTACHMENT, GL_RENDERBUFFER, depthRenderBuffer);
+							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);
+									glFramebufferRenderbuffer(GL_FRAMEBUFFER, GL_STENCIL_ATTACHMENT, GL_RENDERBUFFER, _depthRenderBuffer);
 							}
 					}
 			}
diff --git a/cocos2d-ios.xcodeproj/project.pbxproj b/cocos2d-ios.xcodeproj/project.pbxproj
@@ -558,6 +558,7 @@
 		D39FA9C818C1BC6B00441627 /* CCShader_Private.h in Headers */ = {isa = PBXBuildFile; fileRef = D39FA9C718C1BC6B00441627 /* CCShader_Private.h */; };
 		D3A2E7D2181E12750033614C /* CCPhysicsShape.h in Headers */ = {isa = PBXBuildFile; fileRef = D3A2E7D0181E12750033614C /* CCPhysicsShape.h */; };
 		D3A2E7D3181E12750033614C /* CCPhysicsShape.m in Sources */ = {isa = PBXBuildFile; fileRef = D3A2E7D1181E12750033614C /* CCPhysicsShape.m */; };
+		D3BEEFA419CFE8730055B624 /* CCRendererBasicTypes.m in Sources */ = {isa = PBXBuildFile; fileRef = D34CAD6819C3A7B3009BED7A /* CCRendererBasicTypes.m */; };
 		D3E3752F19CC842A0076CDBB /* CCRendererSharedTypes.h in Headers */ = {isa = PBXBuildFile; fileRef = D3E3752E19CC842A0076CDBB /* CCRendererSharedTypes.h */; };
 		E01E6D8C121F130E001A484F /* CCLabelBMFont.h in Headers */ = {isa = PBXBuildFile; fileRef = E01E6D8A121F130E001A484F /* CCLabelBMFont.h */; };
 		E01E6D8D121F130E001A484F /* CCLabelBMFont.m in Sources */ = {isa = PBXBuildFile; fileRef = E01E6D8B121F130E001A484F /* CCLabelBMFont.m */; };
@@ -2341,6 +2342,7 @@
 				D2FEB6BD194F6C9E00FC0574 /* CCActionInterval.m in Sources */,
 				D2FEB6C0194F6C9E00FC0574 /* CCPhysicsJoint.m in Sources */,
 				D268FE2B1980791D00ECBCD0 /* CCEffectReflection.m in Sources */,
+				D3BEEFA419CFE8730055B624 /* CCRendererBasicTypes.m in Sources */,
 				D2FEB6C2194F6C9E00FC0574 /* CCTouchEvent.m in Sources */,
 				D2FEB6C3194F6C9E00FC0574 /* CCLabelTTF.m in Sources */,
 				D2FEB6C4194F6C9E00FC0574 /* CCEffectContrast.m in Sources */,
diff --git a/cocos2d/Platforms/Android/CCGLView.h b/cocos2d/Platforms/Android/CCGLView.h
@@ -60,6 +60,8 @@ BRIDGE_CLASS("org.cocos2d.CCGLView")
 - (void)addGestureDetector:(AndroidGestureDetector *)detector;
 - (void)removeGestureDetector:(AndroidGestureDetector *)detector;
 
+-(GLuint)fbo;
+
 @end
 #endif // __CC_PLATFORM_ANDROID
 
diff --git a/cocos2d/Platforms/Android/CCGLView.m b/cocos2d/Platforms/Android/CCGLView.m
@@ -579,6 +579,11 @@ -(void)presentFrame
 	[self swapBuffers];
 }
 
+-(GLuint)fbo
+{
+	return 0;
+}
+
 @end
 #endif // __CC_PLATFORM_ANDROID
 
diff --git a/cocos2d/Platforms/CCGL.h b/cocos2d/Platforms/CCGL.h
@@ -53,7 +53,9 @@
 #define CC_CHECK_GL_ERROR_DEBUG() __CC_CHECK_GL_ERROR_DEBUG(__FUNCTION__, __LINE__)
 static inline void __CC_CHECK_GL_ERROR_DEBUG(const char *function, int line)
 {
+#if __CC_PLATFORM_IOS
 	NSCAssert([EAGLContext currentContext], @"GL context is not set.");
+#endif
 	
 	GLenum error;
 	while((error = glGetError())){

Original file line number	Diff line number	Diff line change
`@@ -280,30 +280,30 @@ -(instancetype)initWithTexture:(CCTexture *)texture depthStencilFormat:(GLuint)d`
`280`	`280`
`281`	`281`	`if(![[CCConfiguration sharedConfiguration] supportsPackedDepthStencil])`
`282`	`282`	`{`
`283`		`- glGenRenderbuffers(1, &depthRenderBuffer);`
`284`		`- glBindRenderbuffer(GL_RENDERBUFFER, depthRenderBuffer);`
	`283`	`+ glGenRenderbuffers(1, &_depthRenderBuffer);`
	`284`	`+ glBindRenderbuffer(GL_RENDERBUFFER, _depthRenderBuffer);`
`285`	`285`	`glRenderbufferStorage(GL_RENDERBUFFER, GL_DEPTH_COMPONENT16, width, height); //GL_DEPTH_COMPONENT24_OES`
`286`		`- glFramebufferRenderbuffer(GL_FRAMEBUFFER, GL_DEPTH_ATTACHMENT, GL_RENDERBUFFER, depthRenderBuffer);`
	`286`	`+ glFramebufferRenderbuffer(GL_FRAMEBUFFER, GL_DEPTH_ATTACHMENT, GL_RENDERBUFFER, _depthRenderBuffer);`
`287`	`287`
`288`	`288`	`// if depth format is the one with stencil part, bind same render buffer as stencil attachment`
`289`	`289`	`if(_depthStencilFormat == GL_DEPTH24_STENCIL8)`
`290`	`290`	`{`
`291`		`- glGenRenderbuffers(1, &stencilRenderBuffer);`
`292`		`- glBindRenderbuffer(GL_RENDERBUFFER, stencilRenderBuffer);`
`293`		`- glRenderbufferStorage(GL_RENDERBUFFER, GL_STENCIL_INDEX8, width, powH);`
`294`		`- glFramebufferRenderbuffer(GL_FRAMEBUFFER, GL_STENCIL_ATTACHMENT, GL_RENDERBUFFER, stencilRenderBuffer);`
	`291`	`+ glGenRenderbuffers(1, &_stencilRenderBuffer);`
	`292`	`+ glBindRenderbuffer(GL_RENDERBUFFER, _stencilRenderBuffer);`
	`293`	`+ glRenderbufferStorage(GL_RENDERBUFFER, GL_STENCIL_INDEX8, width, height);`
	`294`	`+ glFramebufferRenderbuffer(GL_FRAMEBUFFER, GL_STENCIL_ATTACHMENT, GL_RENDERBUFFER, _stencilRenderBuffer);`
`295`	`295`	`}`
`296`	`296`	`}`
`297`	`297`	`else`
`298`	`298`	`{`
`299`		`- glGenRenderbuffers(1, &depthRenderBuffer);`
`300`		`- glBindRenderbuffer(GL_RENDERBUFFER, depthRenderBuffer);`
	`299`	`+ glGenRenderbuffers(1, &_depthRenderBuffer);`
	`300`	`+ glBindRenderbuffer(GL_RENDERBUFFER, _depthRenderBuffer);`
`301`	`301`	`glRenderbufferStorage(GL_RENDERBUFFER, _depthStencilFormat, width, height);`
`302`		`- glFramebufferRenderbuffer(GL_FRAMEBUFFER, GL_DEPTH_ATTACHMENT, GL_RENDERBUFFER, depthRenderBuffer);`
	`302`	`+ glFramebufferRenderbuffer(GL_FRAMEBUFFER, GL_DEPTH_ATTACHMENT, GL_RENDERBUFFER, _depthRenderBuffer);`
`303`	`303`
`304`	`304`	`// if depth format is the one with stencil part, bind same render buffer as stencil attachment`
`305`	`305`	`if(_depthStencilFormat == GL_DEPTH24_STENCIL8){`
`306`		`- glFramebufferRenderbuffer(GL_FRAMEBUFFER, GL_STENCIL_ATTACHMENT, GL_RENDERBUFFER, depthRenderBuffer);`
	`306`	`+ glFramebufferRenderbuffer(GL_FRAMEBUFFER, GL_STENCIL_ATTACHMENT, GL_RENDERBUFFER, _depthRenderBuffer);`
`307`	`307`	`}`
`308`	`308`	`}`
`309`	`309`	`}`
Original file line number	Diff line number	Diff line change
`@@ -53,7 +53,9 @@`
`53`	`53`	`#define CC_CHECK_GL_ERROR_DEBUG() __CC_CHECK_GL_ERROR_DEBUG(__FUNCTION__, __LINE__)`
`54`	`54`	`static inline void __CC_CHECK_GL_ERROR_DEBUG(const char *function, int line)`
`55`	`55`	`{`
	`56`	`+#if __CC_PLATFORM_IOS`
`56`	`57`	`NSCAssert([EAGLContext currentContext], @"GL context is not set.");`
	`58`	`+#endif`
`57`	`59`
`58`	`60`	`GLenum error;`
`59`	`61`	`while((error = glGetError())){`