Automatic setters for texture size uniforms.

Author: slembcke

cocos2d/CCRenderer.m

@@ -666,13 +666,14 @@ -(void)setRenderState:(CCRenderState *)renderState
 
 	// Set the shader's uniform state.
 	__unsafe_unretained NSDictionary *shaderUniforms = renderState->_shaderUniforms;
+	__unsafe_unretained NSDictionary *globalShaderUniforms = _globalShaderUniforms;
 	if(shaderUniforms != _shaderUniforms){
 		glInsertEventMarkerEXT(0, "Uniforms");
 
 		__unsafe_unretained NSDictionary *setters = shader->_uniformSetters;
 		for(NSString *uniformName in setters){
 			__unsafe_unretained CCUniformSetter setter = setters[uniformName];
-			setter(self, shaderUniforms[uniformName] ?: _globalShaderUniforms[uniformName]);
+			setter(self, shaderUniforms, globalShaderUniforms);
 		}
 		_shaderUniforms = shaderUniforms;
 	}

cocos2d/CCShader.m

@@ -235,8 +235,8 @@ +(GLuint)createVAOforCCVertexBuffer:(GLuint)vbo elementBuffer:(GLuint)ebo
 static CCUniformSetter
 SetFloat(NSString *name, GLint location)
 {
-	return ^(CCRenderer *renderer, NSNumber *value){
-		value = value ?: @0;
+	return ^(CCRenderer *renderer, NSDictionary *shaderUniforms, NSDictionary *globalShaderUniforms){
+		NSNumber *value = shaderUniforms[name] ?: globalShaderUniforms[name] ?: @(0.0);
 		NSCAssert([value isKindOfClass:[NSNumber class]], @"Shader uniform '%@' value must be wrapped in a NSNumber.", name);
 
 		glUniform1f(location, value.floatValue);
@@ -246,8 +246,29 @@ +(GLuint)createVAOforCCVertexBuffer:(GLuint)vbo elementBuffer:(GLuint)ebo
 static CCUniformSetter
 SetVec2(NSString *name, GLint location)
 {
-	return ^(CCRenderer *renderer, NSValue *value){
-		value = value ?: [NSValue valueWithGLKVector2:GLKVector2Make(0.0f, 0.0f)];
+	NSString *textureName = nil;
+	bool pixelSize = [name hasSuffix:@"PixelSize"];
+	if(pixelSize){
+		textureName = [name substringToIndex:name.length - @"PixelSize".length];
+	} else if([name hasSuffix:@"Size"]){
+		textureName = [name substringToIndex:name.length - @"Size".length];
+	}
+	
+	return ^(CCRenderer *renderer, NSDictionary *shaderUniforms, NSDictionary *globalShaderUniforms){
+		NSValue *value = shaderUniforms[name] ?: globalShaderUniforms[name];
+		
+		// Fall back on looking up the actual texture size if the name matches a texture.
+		if(value == nil && textureName){
+			CCTexture *texture = shaderUniforms[textureName] ?: globalShaderUniforms[textureName];
+			GLKVector2 sizeInPixels = GLKVector2Make(texture.pixelWidth, texture.pixelHeight);
+			
+			GLKVector2 size = GLKVector2MultiplyScalar(sizeInPixels, pixelSize ? 1.0 : 1.0/texture.contentScale);
+			value = [NSValue valueWithGLKVector2:size];
+		}
+		
+		// Finally fall back on 0.
+		if(value == nil) value = [NSValue valueWithGLKVector2:GLKVector2Make(0.0f, 0.0f)];
+		
 		NSCAssert([value isKindOfClass:[NSValue class]], @"Shader uniform '%@' value must be wrapped in a NSValue.", name);
 
 		if(strcmp(value.objCType, @encode(GLKVector2)) == 0){
@@ -268,8 +289,8 @@ +(GLuint)createVAOforCCVertexBuffer:(GLuint)vbo elementBuffer:(GLuint)ebo
 static CCUniformSetter
 SetVec3(NSString *name, GLint location)
 {
-	return ^(CCRenderer *renderer, NSValue *value){
-		value = value ?: [NSValue valueWithGLKVector3:GLKVector3Make(0.0f, 0.0f, 0.0f)];
+	return ^(CCRenderer *renderer, NSDictionary *shaderUniforms, NSDictionary *globalShaderUniforms){
+		NSValue *value = shaderUniforms[name] ?: globalShaderUniforms[name] ?: [NSValue valueWithGLKVector3:GLKVector3Make(0.0f, 0.0f, 0.0f)];
 		NSCAssert([value isKindOfClass:[NSValue class]], @"Shader uniform '%@' value must be wrapped in a NSValue.", name);
 		NSCAssert(strcmp(value.objCType, @encode(GLKVector3)) == 0, @"Shader uniformm 'vec3 %@' value must be passed using [NSValue valueWithGLKVector3:]", name);
 
@@ -281,8 +302,8 @@ +(GLuint)createVAOforCCVertexBuffer:(GLuint)vbo elementBuffer:(GLuint)ebo
 static CCUniformSetter
 SetVec4(NSString *name, GLint location)
 {
-	return ^(CCRenderer *renderer, id value){
-		value = value ?: [NSValue valueWithGLKVector4:GLKVector4Make(0.0f, 0.0f, 0.0f, 1.0f)];
+	return ^(CCRenderer *renderer, NSDictionary *shaderUniforms, NSDictionary *globalShaderUniforms){
+		NSValue *value = shaderUniforms[name] ?: globalShaderUniforms[name] ?: [NSValue valueWithGLKVector4:GLKVector4Make(0.0f, 0.0f, 0.0f, 1.0f)];
 
 		if([value isKindOfClass:[NSValue class]]){
 			NSCAssert(strcmp([(NSValue *)value objCType], @encode(GLKVector4)) == 0, @"Shader uniformm 'vec4 %@' value must be passed using [NSValue valueWithGLKVector4:].", name);
@@ -301,8 +322,8 @@ +(GLuint)createVAOforCCVertexBuffer:(GLuint)vbo elementBuffer:(GLuint)ebo
 static CCUniformSetter
 SetMat4(NSString *name, GLint location)
 {
-	return ^(CCRenderer *renderer, NSValue *value){
-		value = value ?: [NSValue valueWithGLKMatrix4:GLKMatrix4Identity];
+	return ^(CCRenderer *renderer, NSDictionary *shaderUniforms, NSDictionary *globalShaderUniforms){
+		NSValue *value = shaderUniforms[name] ?: globalShaderUniforms[name] ?: [NSValue valueWithGLKMatrix4:GLKMatrix4Identity];
 		NSCAssert([value isKindOfClass:[NSValue class]], @"Shader uniform '%@' value must be wrapped in a NSValue.", name);
 		NSCAssert(strcmp(value.objCType, @encode(GLKMatrix4)) == 0, @"Shader uniformm 'mat4 %@' value must be passed using [NSValue valueWithGLKMatrix4:]", name);
 
@@ -344,8 +365,8 @@ -(NSDictionary *)uniformSettersForProgram:(GLuint)program
 			case GL_FLOAT_MAT4: uniformSetters[name] = SetMat4(name, location); break;
 			case GL_SAMPLER_2D: {
 				// Sampler setters are handled a differently since the real work is binding the texture and not setting the uniform value.
-				uniformSetters[name] = ^(CCRenderer *renderer, CCTexture *texture){
-					texture = texture ?: [CCTexture none];
+				uniformSetters[name] = ^(CCRenderer *renderer, NSDictionary *shaderUniforms, NSDictionary *globalShaderUniforms){
+					CCTexture *texture = shaderUniforms[name] ?: globalShaderUniforms[name] ?: [CCTexture none];
 					NSAssert([texture isKindOfClass:[CCTexture class]], @"Shader uniform '%@' value must be a CCTexture object.", name);
 
 					// Bind the texture to the texture unit for the uniform.

cocos2d/CCShader_Private.h

@@ -1,7 +1,11 @@
 #import "CCShader.h"
 
 @class CCRenderer;
-typedef void (^CCUniformSetter)(__unsafe_unretained CCRenderer *renderer, __unsafe_unretained id value);
+typedef void (^CCUniformSetter)(
+	__unsafe_unretained CCRenderer *renderer,
+	__unsafe_unretained NSDictionary *shaderUniforms,
+	__unsafe_unretained NSDictionary *globalShaderUniforms
+);
 
 @interface CCShader() {
 	@public