Fixes for headless.

Author: slembcke

CCRendererGLSupport.m

@@ -266,9 +266,8 @@ -(instancetype)initWithTexture:(CCTexture *)texture depthStencilFormat:(GLuint)d
 			// associate texture with FBO
 			glFramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D, texture.name, 0);
 
-			CGSize sizeInPixels = texture.contentSizeInPixels;
-			GLuint width = ceil(sizeInPixels.width);
-			GLuint height = ceil(sizeInPixels.height);
+			GLuint width = texture.pixelWidth;
+			GLuint height = texture.pixelHeight;
 
 #if __CC_PLATFORM_ANDROID
 

cocos2d-ios.xcodeproj/project.pbxproj

@@ -521,6 +521,7 @@
 		D2FEB745194F6C9E00FC0574 /* CoreText.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A06D9C131728D5F600704732 /* CoreText.framework */; };
 		D2FEB747194F6C9E00FC0574 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1D30AB110D05D00D00671497 /* Foundation.framework */; };
 		D2FEB749194F6C9E00FC0574 /* CoreGraphics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1D3623EB0D0F72F000981E51 /* CoreGraphics.framework */; };
+		D3027C8719D33FFB00006004 /* NSValue+CCRenderer.m in Sources */ = {isa = PBXBuildFile; fileRef = D34CAD6219C3A0FD009BED7A /* NSValue+CCRenderer.m */; };
 		D309055018AC23110081BF11 /* CCRenderer_Private.h in Headers */ = {isa = PBXBuildFile; fileRef = D309054F18AC23110081BF11 /* CCRenderer_Private.h */; };
 		D31C795019994126007921E1 /* CCMetalSupport.m in Sources */ = {isa = PBXBuildFile; fileRef = D31C794F19994126007921E1 /* CCMetalSupport.m */; };
 		D31C795219994197007921E1 /* CCMetalSupport_Private.h in Headers */ = {isa = PBXBuildFile; fileRef = D31C795119994197007921E1 /* CCMetalSupport_Private.h */; };
@@ -2334,6 +2335,7 @@
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				D3027C8719D33FFB00006004 /* NSValue+CCRenderer.m in Sources */,
 				57202D391970776100238D56 /* CCPlatformTextFieldAndroid.m in Sources */,
 				D2FEB6B9194F6C9E00FC0574 /* CCAction.m in Sources */,
 				D299CE7D19C2910B00519CBB /* CCEffectDFInnerGlow.m in Sources */,

cocos2d-tests-android/Headless.xcodeproj/project.pbxproj

@@ -983,6 +983,7 @@
 			buildSettings = {
 				ANDROID_MANIFEST = "$(SRCROOT)//Headless/src/main/AndroidManifest.xml";
 				ANDROID_RES_DIRS = "$(SRCROOT)//Headless/src/main/res";
+				APPORTABLE_TARGET = Android;
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage;
 				FRAMEWORK_SEARCH_PATHS = (
@@ -1020,6 +1021,7 @@
 			buildSettings = {
 				ANDROID_MANIFEST = "$(SRCROOT)//Headless/src/main/AndroidManifest.xml";
 				ANDROID_RES_DIRS = "$(SRCROOT)//Headless/src/main/res";
+				APPORTABLE_TARGET = Android;
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage;
 				FRAMEWORK_SEARCH_PATHS = (

cocos2d/CCDirector.m

@@ -203,6 +203,9 @@ - (id) init
 		_rendererPool = [NSMutableArray array];
 		_globalShaderUniforms = [NSMutableDictionary dictionary];
 
+		// Force the graphics API to be selected if it hasn't already done so.
+		// Startup code is annoyingly different for iOS/Mac/Android.
+		[[CCConfiguration sharedConfiguration] graphicsAPI];
 		_framebuffer = [[CCFrameBufferObjectClass alloc] init];
 	}
 

cocos2d/CCRenderer.m

@@ -272,6 +272,7 @@ +(void)bindRenderer:(CCRenderer *)renderer
 
 -(void)prepareWithProjection:(const GLKMatrix4 *)projection framebuffer:(CCFrameBufferObject *)framebuffer
 {
+	NSAssert(framebuffer, @"Framebuffer cannot be nil.");
 	CCDirector *director = [CCDirector sharedDirector];
 
 	// Copy in the globals from the director.

cocos2d/Platforms/Mac/CCGLView.m

@@ -166,9 +166,6 @@ - (void) prepareOpenGL
 	GLint swapInt = 1;
 	[[self openGLContext] setValues:&swapInt forParameter:NSOpenGLCPSwapInterval];	
 
-	// Force the graphics API to be set up as early as possible.
-	[[CCConfiguration sharedConfiguration] graphicsAPI];
-
 //	GLint order = -1;
 //	[[self openGLContext] setValues:&order forParameter:NSOpenGLCPSurfaceOrder];
 }