Merge remote-tracking branch 'upstream/develop' into develop

Author: Thayer J Andrews

VERSION

@@ -1 +1 @@
-3.1.1
+3.2.0

cocos2d/CCConfiguration.h

@@ -75,6 +75,7 @@ typedef NS_ENUM(NSUInteger, CCDevice) {
 
 	GLint			_maxTextureSize;
 	BOOL			_supportsPVRTC;
+	BOOL			_supportsNPOT;
 	BOOL			_supportsBGRA8888;
 	BOOL			_supportsDiscardFramebuffer;
 	BOOL			_supportsShareableVAO;
@@ -91,6 +92,12 @@ typedef NS_ENUM(NSUInteger, CCDevice) {
  */
 @property (nonatomic, readonly) GLint maxTextureUnits;
 
+/** Whether or not the GPU supports NPOT (Non Power Of Two) textures.
+ OpenGL ES 2.0 already supports NPOT (iOS).
+
+ */
+@property (nonatomic, readonly) BOOL supportsNPOT;
+
 /** Whether or not PVR Texture Compressed is supported */
 @property (nonatomic, readonly) BOOL supportsPVRTC;
 

cocos2d/CCConfiguration.m

@@ -44,6 +44,7 @@ @implementation CCConfiguration
 
 @synthesize maxTextureSize = _maxTextureSize, maxTextureUnits=_maxTextureUnits;
 @synthesize supportsPVRTC = _supportsPVRTC;
+@synthesize supportsNPOT = _supportsNPOT;
 @synthesize supportsBGRA8888 = _supportsBGRA8888;
 @synthesize supportsDiscardFramebuffer = _supportsDiscardFramebuffer;
 @synthesize supportsShareableVAO = _supportsShareableVAO;
@@ -181,6 +182,12 @@ -(void) getOpenGLvariables
 		glGetIntegerv(GL_MAX_TEXTURE_SIZE, &_maxTextureSize);
 		glGetIntegerv(GL_MAX_COMBINED_TEXTURE_IMAGE_UNITS, &_maxTextureUnits );
 
+#ifdef __CC_PLATFORM_IOS
+		_supportsNPOT = YES;
+#elif defined(__CC_PLATFORM_MAC)
+		_supportsNPOT = [self checkForGLExtension:@"GL_ARB_texture_non_power_of_two"];
+#endif
+
 		_supportsPVRTC = [self checkForGLExtension:@"GL_IMG_texture_compression_pvrtc"];
 
 		// It seems that somewhere between firmware iOS 3.0 and 4.2 Apple renamed
@@ -215,6 +222,14 @@ -(GLint) maxTextureUnits
 	return _maxTextureUnits;
 }
 
+-(BOOL) supportsNPOT
+{
+	if( ! _openGLInitialized )
+		[self getOpenGLvariables];
+
+	return _supportsNPOT;
+}
+
 -(BOOL) supportsPVRTC
 {
 	if( ! _openGLInitialized )
@@ -293,6 +308,7 @@ -(void) dumpInfo
 	printf("cocos2d: GL_MAX_SAMPLES: %d\n", _maxSamplesAllowed);
 	printf("cocos2d: GL supports PVRTC: %s\n", (_supportsPVRTC ? "YES" : "NO") );
 	printf("cocos2d: GL supports BGRA8888 textures: %s\n", (_supportsBGRA8888 ? "YES" : "NO") );
+	printf("cocos2d: GL supports NPOT textures: %s\n", (_supportsNPOT ? "YES" : "NO") );
 	printf("cocos2d: GL supports discard_framebuffer: %s\n", (_supportsDiscardFramebuffer ? "YES" : "NO") );
 	printf("cocos2d: GL supports shareable VAO: %s\n", (_supportsShareableVAO ? "YES" : "NO") );
 

cocos2d/CCEffectRenderer.m

@@ -52,11 +52,26 @@ - (BOOL)setupGLResourcesWithSize:(CGSize)size
 
     glPushGroupMarkerEXT(0, "CCEffectRenderTarget: allocateRenderTarget");
 
+	// Textures may need to be a power of two
+	NSUInteger powW;
+	NSUInteger powH;
+    
+	if( [[CCConfiguration sharedConfiguration] supportsNPOT] )
+    {
+		powW = size.width;
+		powH = size.height;
+	}
+    else
+    {
+		powW = CCNextPOT(size.width);
+		powH = CCNextPOT(size.height);
+	}
+    
     static const CCTexturePixelFormat kRenderTargetDefaultPixelFormat = CCTexturePixelFormat_RGBA8888;
 
     // Create a new texture object for use as the color attachment of the new
     // FBO.
-	_texture = [[CCTexture alloc] initWithData:nil pixelFormat:kRenderTargetDefaultPixelFormat pixelsWide:size.width pixelsHigh:size.height contentSizeInPixels:size contentScale:[CCDirector sharedDirector].contentScaleFactor];
+	_texture = [[CCTexture alloc] initWithData:nil pixelFormat:kRenderTargetDefaultPixelFormat pixelsWide:powW pixelsHigh:powH contentSizeInPixels:size contentScale:[CCDirector sharedDirector].contentScaleFactor];
 	[_texture setAliasTexParameters];
 
     // Save the old FBO binding so it can be restored after we create the new

cocos2d/CCRenderTexture.m

@@ -177,8 +177,21 @@ -(void)create
 
 	glGetIntegerv(GL_FRAMEBUFFER_BINDING, &_oldFBO);
 
-	void *data = calloc(pixelW*pixelH, 4);
-	CCTexture *texture = [[CCTexture alloc] initWithData:data pixelFormat:_pixelFormat pixelsWide:pixelW pixelsHigh:pixelH contentSizeInPixels:CGSizeMake(pixelW, pixelH) contentScale:_contentScale];
+	// textures must be power of two
+	NSUInteger powW;
+	NSUInteger powH;
+
+	if( [[CCConfiguration sharedConfiguration] supportsNPOT] ) {
+		powW = pixelW;
+		powH = pixelH;
+	} else {
+		powW = CCNextPOT(pixelW);
+		powH = CCNextPOT(pixelH);
+	}
+
+	void *data = calloc(powW*powH, 4);
+
+	CCTexture *texture = [[CCTexture alloc] initWithData:data pixelFormat:_pixelFormat pixelsWide:powW pixelsHigh:powH contentSizeInPixels:CGSizeMake(pixelW, pixelH) contentScale:_contentScale];
     self.texture = texture;
 
 	free(data);
@@ -199,7 +212,7 @@ -(void)create
 		//create and attach depth buffer
 		glGenRenderbuffers(1, &depthRenderBuffer);
 		glBindRenderbuffer(GL_RENDERBUFFER, depthRenderBuffer);
-		glRenderbufferStorage(GL_RENDERBUFFER, _depthStencilFormat, (GLsizei)pixelW, (GLsizei)pixelH);
+		glRenderbufferStorage(GL_RENDERBUFFER, _depthStencilFormat, (GLsizei)powW, (GLsizei)powH);
 		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

cocos2d/CCTexture.m

@@ -399,8 +399,16 @@ - (id) initWithCGImage:(CGImageRef)cgImage contentScale:(CGFloat)contentScale
 		pixelFormat = CCTexturePixelFormat_A8;
 	}
 
-	textureWidth = CGImageGetWidth(cgImage);
-	textureHeight = CGImageGetHeight(cgImage);
+	if( ! [conf supportsNPOT]  )
+	{
+		textureWidth = CCNextPOT(CGImageGetWidth(cgImage));
+		textureHeight = CCNextPOT(CGImageGetHeight(cgImage));
+	}
+	else
+	{
+		textureWidth = CGImageGetWidth(cgImage);
+		textureHeight = CGImageGetHeight(cgImage);
+	}
 
 #ifdef __CC_PLATFORM_IOS
 

cocos2d/CCTexturePVR.m

@@ -299,6 +299,12 @@ - (BOOL)unpackPVRv2Data:(unsigned char*)data PVRLen:(NSUInteger)len
 	if( flipped )
 		CCLOGWARN(@"cocos2d: WARNING: Image is flipped. Regenerate it using PVRTexTool");
 
+	if( ! [configuration supportsNPOT] &&
+	   ( header->width != CCNextPOT(header->width) || header->height != CCNextPOT(header->height ) ) ) {
+		CCLOGWARN(@"cocos2d: ERROR: Loding an NPOT texture (%dx%d) but is not supported on this device", header->width, header->height);
+		return NO;
+	}
+
 	for( NSUInteger i=0; i < (unsigned int)PVR2_MAX_TABLE_ELEMENTS ; i++) {
 		if( v2_pixel_formathash[i].pixelFormat == formatFlags ) {