CCEffects - buildFragmentFunctions and buildVertexFunctions reallocate their arrays

Thayer J Andrews · Thayer J Andrews · commit 2df048a1ec8d · 2014-07-08T11:21:47.000-07:00
diff --git a/cocos2d/CCEffect.m b/cocos2d/CCEffect.m
@@ -328,7 +328,6 @@ - (void)buildEffectWithFragmentFunction:(NSMutableArray*) fragmentFunctions vert
     }
     else
     {
-        _fragmentFunctions = [[NSMutableArray alloc] init];
         [self buildFragmentFunctions];
     }
     
@@ -338,7 +337,6 @@ - (void)buildEffectWithFragmentFunction:(NSMutableArray*) fragmentFunctions vert
     }
     else
     {
-        _vertexFunctions = [[NSMutableArray alloc] init];
         [self buildVertexFunctions];
     }
     
@@ -495,14 +493,14 @@ -(void)buildEffectShader
 
 -(void)buildFragmentFunctions
 {
-    CCEffectFunction* fragmentFunction = [[CCEffectFunction alloc] initWithName:@"defaultEffect" body:@"return cc_FragColor;" inputs:nil returnType:@"vec4"];
-    [_fragmentFunctions addObject:fragmentFunction];
+    _fragmentFunctions = [[NSMutableArray alloc] init];
+    [_fragmentFunctions addObject:[[CCEffectFunction alloc] initWithName:@"defaultEffect" body:@"return cc_FragColor;" inputs:nil returnType:@"vec4"]];
 }
 
 -(void)buildVertexFunctions
 {
-    CCEffectFunction* vertexFunction = [[CCEffectFunction alloc] initWithName:@"defaultEffect" body:@"return cc_Position;" inputs:nil returnType:@"vec4"];
-    [_vertexFunctions addObject:vertexFunction];
+    _vertexFunctions = [[NSMutableArray alloc] init];
+    [_vertexFunctions addObject:[[CCEffectFunction alloc] initWithName:@"defaultEffect" body:@"return cc_Position;" inputs:nil returnType:@"vec4"]];
 }
 
 -(void)buildRenderPasses
diff --git a/cocos2d/CCEffectBloom.m b/cocos2d/CCEffectBloom.m
@@ -122,6 +122,8 @@ +(id)effectWithPixelBlurRadius:(NSUInteger)blurRadius intensity:(float)intensity
 
 -(void)buildFragmentFunctions
 {
+    self.fragmentFunctions = [[NSMutableArray alloc] init];
+
     GLfloat *standardGaussianWeights = calloc(_blurRadius + 1, sizeof(GLfloat));
     GLfloat sumOfWeights = 0.0;
     for (NSUInteger currentGaussianWeightIndex = 0; currentGaussianWeightIndex < _blurRadius + 1; currentGaussianWeightIndex++)
@@ -218,6 +220,8 @@ -(void)buildFragmentFunctions
 
 -(void)buildVertexFunctions
 {
+    self.vertexFunctions = [[NSMutableArray alloc] init];
+    
     GLfloat* standardGaussianWeights = calloc(_blurRadius + 1, sizeof(GLfloat));
     GLfloat sumOfWeights = 0.0;
     for (NSUInteger currentGaussianWeightIndex = 0; currentGaussianWeightIndex < _blurRadius + 1; currentGaussianWeightIndex++)
diff --git a/cocos2d/CCEffectBrightness.m b/cocos2d/CCEffectBrightness.m
@@ -52,6 +52,8 @@ +(id)effectWithBrightness:(float)brightness
 
 -(void)buildFragmentFunctions
 {
+    self.fragmentFunctions = [[NSMutableArray alloc] init];
+
     CCEffectFunctionInput *input = [[CCEffectFunctionInput alloc] initWithType:@"vec4" name:@"inputValue" snippet:@"texture2D(cc_PreviousPassTexture, cc_FragTexCoord1)"];
 
     NSString* effectBody = CC_GLSL(
diff --git a/cocos2d/CCEffectContrast.m b/cocos2d/CCEffectContrast.m
@@ -53,6 +53,8 @@ +(id)effectWithContrast:(float)contrast
 
 -(void)buildFragmentFunctions
 {
+    self.fragmentFunctions = [[NSMutableArray alloc] init];
+
     CCEffectFunctionInput *input = [[CCEffectFunctionInput alloc] initWithType:@"vec4" name:@"inputValue" snippet:@"texture2D(cc_PreviousPassTexture, cc_FragTexCoord1)"];
 
     NSString* effectBody = CC_GLSL(
diff --git a/cocos2d/CCEffectGaussianBlur.m b/cocos2d/CCEffectGaussianBlur.m
@@ -99,6 +99,8 @@ +(id)effectWithPixelBlurRadius:(NSUInteger)blurRadius
 
 -(void)buildFragmentFunctions
 {
+    self.fragmentFunctions = [[NSMutableArray alloc] init];
+
     GLfloat *standardGaussianWeights = calloc(_blurRadius + 1, sizeof(GLfloat));
     GLfloat sumOfWeights = 0.0;
     for (NSUInteger currentGaussianWeightIndex = 0; currentGaussianWeightIndex < _blurRadius + 1; currentGaussianWeightIndex++)
@@ -175,6 +177,8 @@ -(void)buildFragmentFunctions
 
 -(void)buildVertexFunctions
 {
+    self.vertexFunctions = [[NSMutableArray alloc] init];
+    
     GLfloat* standardGaussianWeights = calloc(_blurRadius + 1, sizeof(GLfloat));
     GLfloat sumOfWeights = 0.0;
     for (NSUInteger currentGaussianWeightIndex = 0; currentGaussianWeightIndex < _blurRadius + 1; currentGaussianWeightIndex++)
diff --git a/cocos2d/CCEffectPixellate.m b/cocos2d/CCEffectPixellate.m
@@ -88,6 +88,8 @@ +(id)effectWithBlockSize:(float)blockSize;
 
 -(void)buildFragmentFunctions
 {
+    self.fragmentFunctions = [[NSMutableArray alloc] init];
+
     // Image pixellation shader based on pixellation filter in GPUImage - https://github.com/BradLarson/GPUImage
     NSString* effectBody = CC_GLSL(
                                    vec2 samplePos = cc_FragTexCoord1 - mod(cc_FragTexCoord1, vec2(u_uStep, u_vStep)) + 0.5 * vec2(u_uStep, u_vStep);
diff --git a/cocos2d/CCEffectRefraction.m b/cocos2d/CCEffectRefraction.m
@@ -57,6 +57,8 @@ +(id)effectWithRefraction:(float)refraction environment:(CCSprite *)environment
 
 -(void)buildFragmentFunctions
 {
+    self.fragmentFunctions = [[NSMutableArray alloc] init];
+
     CCEffectFunctionInput *input = [[CCEffectFunctionInput alloc] initWithType:@"vec4" name:@"inputValue" snippet:@"texture2D(cc_PreviousPassTexture, cc_FragTexCoord1)"];
     
     NSString* effectBody = CC_GLSL(
diff --git a/cocos2d/CCEffectSaturation.m b/cocos2d/CCEffectSaturation.m
@@ -87,6 +87,8 @@ +(id)effectWithSaturation:(float)saturation
 
 -(void)buildFragmentFunctions
 {
+    self.fragmentFunctions = [[NSMutableArray alloc] init];
+
     CCEffectFunctionInput *input = [[CCEffectFunctionInput alloc] initWithType:@"vec4" name:@"inputValue" snippet:@"texture2D(cc_PreviousPassTexture, cc_FragTexCoord1)"];
     
     // Image saturation shader based on saturation filter in GPUImage - https://github.com/BradLarson/GPUImage

Original file line number	Diff line number	Diff line change
`@@ -328,7 +328,6 @@ - (void)buildEffectWithFragmentFunction:(NSMutableArray*) fragmentFunctions vert`
`328`	`328`	`}`
`329`	`329`	`else`
`330`	`330`	`{`
`331`		`- _fragmentFunctions = [[NSMutableArray alloc] init];`
`332`	`331`	`[self buildFragmentFunctions];`
`333`	`332`	`}`
`334`	`333`
`@@ -338,7 +337,6 @@ - (void)buildEffectWithFragmentFunction:(NSMutableArray*) fragmentFunctions vert`
`338`	`337`	`}`
`339`	`338`	`else`
`340`	`339`	`{`
`341`		`- _vertexFunctions = [[NSMutableArray alloc] init];`
`342`	`340`	`[self buildVertexFunctions];`
`343`	`341`	`}`
`344`	`342`
`@@ -495,14 +493,14 @@ -(void)buildEffectShader`
`495`	`493`
`496`	`494`	`-(void)buildFragmentFunctions`
`497`	`495`	`{`
`498`		`- CCEffectFunction* fragmentFunction = [[CCEffectFunction alloc] initWithName:@"defaultEffect" body:@"return cc_FragColor;" inputs:nil returnType:@"vec4"];`
`499`		`- [_fragmentFunctions addObject:fragmentFunction];`
	`496`	`+ _fragmentFunctions = [[NSMutableArray alloc] init];`
	`497`	`+ [_fragmentFunctions addObject:[[CCEffectFunction alloc] initWithName:@"defaultEffect" body:@"return cc_FragColor;" inputs:nil returnType:@"vec4"]];`
`500`	`498`	`}`
`501`	`499`
`502`	`500`	`-(void)buildVertexFunctions`
`503`	`501`	`{`
`504`		`- CCEffectFunction* vertexFunction = [[CCEffectFunction alloc] initWithName:@"defaultEffect" body:@"return cc_Position;" inputs:nil returnType:@"vec4"];`
`505`		`- [_vertexFunctions addObject:vertexFunction];`
	`502`	`+ _vertexFunctions = [[NSMutableArray alloc] init];`
	`503`	`+ [_vertexFunctions addObject:[[CCEffectFunction alloc] initWithName:@"defaultEffect" body:@"return cc_Position;" inputs:nil returnType:@"vec4"]];`
`506`	`504`	`}`
`507`	`505`
`508`	`506`	`-(void)buildRenderPasses`
Original file line number	Diff line number	Diff line change
`@@ -52,6 +52,8 @@ +(id)effectWithBrightness:(float)brightness`
`52`	`52`
`53`	`53`	`-(void)buildFragmentFunctions`
`54`	`54`	`{`
	`55`	`+ self.fragmentFunctions = [[NSMutableArray alloc] init];`
	`56`	`+`
`55`	`57`	`CCEffectFunctionInput *input = [[CCEffectFunctionInput alloc] initWithType:@"vec4" name:@"inputValue" snippet:@"texture2D(cc_PreviousPassTexture, cc_FragTexCoord1)"];`
`56`	`58`
`57`	`59`	`NSString* effectBody = CC_GLSL(`
Original file line number	Diff line number	Diff line change
`@@ -53,6 +53,8 @@ +(id)effectWithContrast:(float)contrast`
`53`	`53`
`54`	`54`	`-(void)buildFragmentFunctions`
`55`	`55`	`{`
	`56`	`+ self.fragmentFunctions = [[NSMutableArray alloc] init];`
	`57`	`+`
`56`	`58`	`CCEffectFunctionInput *input = [[CCEffectFunctionInput alloc] initWithType:@"vec4" name:@"inputValue" snippet:@"texture2D(cc_PreviousPassTexture, cc_FragTexCoord1)"];`
`57`	`59`
`58`	`60`	`NSString* effectBody = CC_GLSL(`
Original file line number	Diff line number	Diff line change
`@@ -88,6 +88,8 @@ +(id)effectWithBlockSize:(float)blockSize;`
`88`	`88`
`89`	`89`	`-(void)buildFragmentFunctions`
`90`	`90`	`{`
	`91`	`+ self.fragmentFunctions = [[NSMutableArray alloc] init];`
	`92`	`+`
`91`	`93`	`// Image pixellation shader based on pixellation filter in GPUImage - https://github.com/BradLarson/GPUImage`
`92`	`94`	`NSString* effectBody = CC_GLSL(`
`93`	`95`	`vec2 samplePos = cc_FragTexCoord1 - mod(cc_FragTexCoord1, vec2(u_uStep, u_vStep)) + 0.5 * vec2(u_uStep, u_vStep);`
Original file line number	Diff line number	Diff line change
`@@ -57,6 +57,8 @@ +(id)effectWithRefraction:(float)refraction environment:(CCSprite *)environment`
`57`	`57`
`58`	`58`	`-(void)buildFragmentFunctions`
`59`	`59`	`{`
	`60`	`+ self.fragmentFunctions = [[NSMutableArray alloc] init];`
	`61`	`+`
`60`	`62`	`CCEffectFunctionInput *input = [[CCEffectFunctionInput alloc] initWithType:@"vec4" name:@"inputValue" snippet:@"texture2D(cc_PreviousPassTexture, cc_FragTexCoord1)"];`
`61`	`63`
`62`	`64`	`NSString* effectBody = CC_GLSL(`
Original file line number	Diff line number	Diff line change
`@@ -87,6 +87,8 @@ +(id)effectWithSaturation:(float)saturation`
`87`	`87`
`88`	`88`	`-(void)buildFragmentFunctions`
`89`	`89`	`{`
	`90`	`+ self.fragmentFunctions = [[NSMutableArray alloc] init];`
	`91`	`+`
`90`	`92`	`CCEffectFunctionInput *input = [[CCEffectFunctionInput alloc] initWithType:@"vec4" name:@"inputValue" snippet:@"texture2D(cc_PreviousPassTexture, cc_FragTexCoord1)"];`
`91`	`93`
`92`	`94`	`// Image saturation shader based on saturation filter in GPUImage - https://github.com/BradLarson/GPUImage`