CCEffects - Don't apply name mangling to the texture coordinate center and extent uniforms

Thayer J Andrews · Thayer J Andrews · commit f7395f571702 · 2014-09-03T11:44:08.000-07:00
They're CCEffect built-ins (not effect implementation specific) so they are shared between stacked
effects and should not be mangled.
diff --git a/cocos2d/CCEffect.m b/cocos2d/CCEffect.m
@@ -298,7 +298,13 @@ + (NSArray *)defaultEffectVertexUniforms
 
 + (NSSet *)defaultEffectFragmentUniformNames
 {
-    return [[NSSet alloc] initWithArray:@[CCShaderUniformPreviousPassTexture]];
+    return [[NSSet alloc] initWithArray:@[
+                                          CCShaderUniformPreviousPassTexture,
+                                          CCShaderUniformTexCoord1Center,
+                                          CCShaderUniformTexCoord1Extents,
+                                          CCShaderUniformTexCoord2Center,
+                                          CCShaderUniformTexCoord2Extents
+                                          ]];
 }
 
 + (NSSet *)defaultEffectVertexUniformNames

Original file line number	Diff line number	Diff line change
`@@ -298,7 +298,13 @@ + (NSArray *)defaultEffectVertexUniforms`
`298`	`298`
`299`	`299`	`+ (NSSet *)defaultEffectFragmentUniformNames`
`300`	`300`	`{`
`301`		`- return [[NSSet alloc] initWithArray:@[CCShaderUniformPreviousPassTexture]];`
	`301`	`+ return [[NSSet alloc] initWithArray:@[`
	`302`	`+ CCShaderUniformPreviousPassTexture,`
	`303`	`+ CCShaderUniformTexCoord1Center,`
	`304`	`+ CCShaderUniformTexCoord1Extents,`
	`305`	`+ CCShaderUniformTexCoord2Center,`
	`306`	`+ CCShaderUniformTexCoord2Extents`
	`307`	`+ ]];`
`302`	`308`	`}`
`303`	`309`
`304`	`310`	`+ (NSSet *)defaultEffectVertexUniformNames`