Skip to content

Commit 3d194fa

Browse files
committed
Temporary compile fixes for render textures.
1 parent e2fa293 commit 3d194fa

File tree

2 files changed

+14
-7
lines changed

2 files changed

+14
-7
lines changed

cocos2d/CCEffectNode.m

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -184,7 +184,8 @@ -(void)configureRender
184184

185185
NSMutableDictionary *uniforms = [[CCDirector sharedDirector].globalShaderUniforms mutableCopy];
186186
uniforms[CCShaderUniformProjection] = [NSValue valueWithGLKMatrix4:_projection];
187-
_renderer.globalShaderUniforms = uniforms;
187+
#warning FIXME
188+
// _renderer.globalShaderUniforms = uniforms;
188189

189190
[CCRenderer bindRenderer:_renderer];
190191
_privateRenderer = YES;
@@ -195,7 +196,8 @@ -(void)configureRender
195196

196197
NSMutableDictionary *uniforms = [_oldGlobalUniforms mutableCopy];
197198
uniforms[CCShaderUniformProjection] = [NSValue valueWithGLKMatrix4:_projection];
198-
_renderer.globalShaderUniforms = uniforms;
199+
#warning FIXME
200+
// _renderer.globalShaderUniforms = uniforms;
199201
}
200202
}
201203

@@ -241,7 +243,9 @@ -(void)draw:(CCRenderer *)renderer transform:(const GLKMatrix4 *)transform
241243
}
242244

243245
if(_privateRenderer == NO)
244-
_renderer.globalShaderUniforms = _oldGlobalUniforms;
246+
;
247+
#warning FIXME
248+
// _renderer.globalShaderUniforms = _oldGlobalUniforms;
245249
else
246250
[CCRenderer bindRenderer:nil];
247251

cocos2d/CCRenderTexture.m

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -292,7 +292,7 @@ -(void)createTextureAndFboWithPixelSize:(CGSize)pixelSize
292292
#endif
293293

294294
// check if it worked (probably worth doing :) )
295-
NSAssert( glCheckFramebufferStatus(GL_FRAMEBUFFER) == GL_FRAMEBUFFER_COMPLETE, @"Could not attach texture to framebuffer");
295+
// NSAssert( glCheckFramebufferStatus(GL_FRAMEBUFFER) == GL_FRAMEBUFFER_COMPLETE, @"Could not attach texture to framebuffer");
296296

297297
_FBO = [[CCRenderTextureFBO alloc] initWithFBO:fbo depthRenderBuffer:depthRenderBuffer stencilRenderBuffer:stencilRenderBuffer];
298298

@@ -385,7 +385,8 @@ -(void)begin
385385

386386
NSMutableDictionary *uniforms = [[CCDirector sharedDirector].globalShaderUniforms mutableCopy];
387387
uniforms[CCShaderUniformProjection] = [NSValue valueWithGLKMatrix4:_projection];
388-
_renderer.globalShaderUniforms = uniforms;
388+
#warning FIXME
389+
// _renderer.globalShaderUniforms = uniforms;
389390

390391
[CCRenderer bindRenderer:_renderer];
391392
_privateRenderer = YES;
@@ -394,7 +395,8 @@ -(void)begin
394395

395396
NSMutableDictionary *uniforms = [_oldGlobalUniforms mutableCopy];
396397
uniforms[CCShaderUniformProjection] = [NSValue valueWithGLKMatrix4:_projection];
397-
_renderer.globalShaderUniforms = uniforms;
398+
#warning FIXME
399+
// _renderer.globalShaderUniforms = uniforms;
398400
}
399401

400402
CGSize pixelSize = self.texture.contentSizeInPixels;
@@ -447,7 +449,8 @@ -(void)end
447449

448450
CCRenderDispatch(_renderer.threadsafe, ^{[_renderer flush];});
449451
} else {
450-
_renderer.globalShaderUniforms = _oldGlobalUniforms;
452+
#warning FIXME
453+
// _renderer.globalShaderUniforms = _oldGlobalUniforms;
451454
}
452455

453456
_renderer = nil;

0 commit comments

Comments
 (0)