Skip to content

Commit 03be871

Browse files
osinolegosinoleg
committed
Merge branch 'develop' into effects
Conflicts: cocos2d-ios.xcodeproj/project.pbxproj
2 parents 351170a + 9c4f1aa commit 03be871

File tree

4 files changed

+17
-2
lines changed

4 files changed

+17
-2
lines changed

‎CCRendererGLSupport.m

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -227,7 +227,7 @@ -(instancetype)initWithVertexBuffer:(CCGraphicsBufferGLBasic *)vertexBuffer inde
227227
-(void)dealloc
228228
{
229229
GLuint vao = _vao;
230-
CCRenderDispatch(YES, ^{glDeleteVertexArraysOES(1, &vao);});
230+
CCRenderDispatch(YES, ^{glDeleteVertexArrays(1, &vao);});
231231
}
232232

233233
-(void)bind:(BOOL)bind

‎cocos2d-ios.xcodeproj/project.pbxproj

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -364,6 +364,7 @@
364364
D2DDB0A819805E8400233D80 /* CCMatrix3.m in Sources */ = {isa = PBXBuildFile; fileRef = D2DDB09219805E8400233D80 /* CCMatrix3.m */; };
365365
D2E8E1861999ABA2004F18DF /* CCEffectDropShadow.h in Headers */ = {isa = PBXBuildFile; fileRef = D2F78CC71999AB6E00229357 /* CCEffectDropShadow.h */; };
366366
D2F78CC81999AB6E00229357 /* CCEffectDropShadow.h in Headers */ = {isa = PBXBuildFile; fileRef = D2F78CC71999AB6E00229357 /* CCEffectDropShadow.h */; };
367+
D2EC6039199D9F82001A15E9 /* CCRendererGLSupport.m in Sources */ = {isa = PBXBuildFile; fileRef = D36DFA2719996EC500DEC135 /* CCRendererGLSupport.m */; };
367368
D2FEB611194F6C9E00FC0574 /* CCBLocalizationManager.h in Headers */ = {isa = PBXBuildFile; fileRef = B7D273041822F4AA0054849B /* CCBLocalizationManager.h */; };
368369
D2FEB612194F6C9E00FC0574 /* CCAction.h in Headers */ = {isa = PBXBuildFile; fileRef = 5018F2520DFDEAFF00C013A5 /* CCAction.h */; };
369370
D2FEB613194F6C9E00FC0574 /* CCNode.h in Headers */ = {isa = PBXBuildFile; fileRef = 5018F2540DFDEAFF00C013A5 /* CCNode.h */; };
@@ -862,7 +863,7 @@
862863
5BC3CB5219626E4F00C4F0D0 /* CCGestureListener.java */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.java; path = CCGestureListener.java; sourceTree = "<group>"; };
863864
5BC3CB5719626FA000C4F0D0 /* CCGestureListener.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CCGestureListener.h; path = Android/CCGestureListener.h; sourceTree = "<group>"; };
864865
5BC3CB5819626FA000C4F0D0 /* CCGestureListener.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = CCGestureListener.m; path = Android/CCGestureListener.m; sourceTree = "<group>"; };
865-
5BF3267A195F8D8800D9A51A /* cocos2dJava.jar */ = {isa = PBXFileReference; includeInIndex = 0; lastKnownFileType = archive.jar; path = cocos2dJava.jar; sourceTree = BUILT_PRODUCTS_DIR; };
866+
5BF3267A195F8D8800D9A51A /* cocos2dJava.jar */ = {isa = PBXFileReference; explicitFileType = compiled.java.jar; includeInIndex = 0; path = cocos2dJava.jar; sourceTree = BUILT_PRODUCTS_DIR; };
866867
5BF3268C195F8E0300D9A51A /* CCActivity.java */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.java; path = CCActivity.java; sourceTree = "<group>"; };
867868
5BF3268D195F8E0300D9A51A /* CCGLView.java */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.java; path = CCGLView.java; sourceTree = "<group>"; };
868869
5BF32696195F947800D9A51A /* CCActivity.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CCActivity.h; path = Android/CCActivity.h; sourceTree = "<group>"; };
@@ -2678,6 +2679,7 @@
26782679
D2FEB6D9194F6C9E00FC0574 /* CCFileUtils.m in Sources */,
26792680
D2FEB6DA194F6C9E00FC0574 /* OALAudioActions.m in Sources */,
26802681
D2FEB6DB194F6C9E00FC0574 /* CCTouch.m in Sources */,
2682+
D2EC6039199D9F82001A15E9 /* CCRendererGLSupport.m in Sources */,
26812683
D2FEB6DC194F6C9E00FC0574 /* CCEffectNode.m in Sources */,
26822684
D2FEB6DD194F6C9E00FC0574 /* CCTiledMapObjectGroup.m in Sources */,
26832685
D2FEB6DE194F6C9E00FC0574 /* CGPointExtension.m in Sources */,

‎cocos2d-osx.xcodeproj/project.pbxproj

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -172,6 +172,8 @@
172172
D2342007199AD36D00DF8FCD /* CCNoARC.m in Sources */ = {isa = PBXBuildFile; fileRef = D2342004199AD36D00DF8FCD /* CCNoARC.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; };
173173
D2342008199AD36D00DF8FCD /* CCRenderDispatch.h in Headers */ = {isa = PBXBuildFile; fileRef = D2342005199AD36D00DF8FCD /* CCRenderDispatch.h */; };
174174
D2342009199AD36D00DF8FCD /* CCRenderDispatch.m in Sources */ = {isa = PBXBuildFile; fileRef = D2342006199AD36D00DF8FCD /* CCRenderDispatch.m */; };
175+
D2570849199D81C900B56E04 /* CCDirectorView.h in Headers */ = {isa = PBXBuildFile; fileRef = D2570847199D81C900B56E04 /* CCDirectorView.h */; };
176+
D257084A199D81C900B56E04 /* CCRenderDispatch_Private.h in Headers */ = {isa = PBXBuildFile; fileRef = D2570848199D81C900B56E04 /* CCRenderDispatch_Private.h */; };
175177
D2D598641987132700BDAF25 /* CCEffect_Private.h in Headers */ = {isa = PBXBuildFile; fileRef = D2D598421987132700BDAF25 /* CCEffect_Private.h */; };
176178
D2D598651987132700BDAF25 /* CCEffect.h in Headers */ = {isa = PBXBuildFile; fileRef = D2D598431987132700BDAF25 /* CCEffect.h */; };
177179
D2D598661987132700BDAF25 /* CCEffect.m in Sources */ = {isa = PBXBuildFile; fileRef = D2D598441987132700BDAF25 /* CCEffect.m */; };
@@ -203,6 +205,7 @@
203205
D2D598831987132700BDAF25 /* CCEffectStackProtocol.h in Headers */ = {isa = PBXBuildFile; fileRef = D2D598611987132700BDAF25 /* CCEffectStackProtocol.h */; };
204206
D2D598841987132700BDAF25 /* CCEffectUtils.h in Headers */ = {isa = PBXBuildFile; fileRef = D2D598621987132700BDAF25 /* CCEffectUtils.h */; };
205207
D2D598851987132700BDAF25 /* CCEffectUtils.m in Sources */ = {isa = PBXBuildFile; fileRef = D2D598631987132700BDAF25 /* CCEffectUtils.m */; };
208+
D2EC6034199D9F2E001A15E9 /* CCRendererGLSupport.m in Sources */ = {isa = PBXBuildFile; fileRef = D2EC6033199D9F2E001A15E9 /* CCRendererGLSupport.m */; };
206209
D37EE9FE187D4E7800CB5EF2 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D37EE9FD187D4E7800CB5EF2 /* Foundation.framework */; };
207210
D37EEA6E187D4F5200CB5EF2 /* libObjectiveChipmunk.a in Frameworks */ = {isa = PBXBuildFile; fileRef = D37EE9FC187D4E7700CB5EF2 /* libObjectiveChipmunk.a */; };
208211
D37EEB03187D4F9600CB5EF2 /* ChipmunkBody.m in Sources */ = {isa = PBXBuildFile; fileRef = D37EEADF187D4F9600CB5EF2 /* ChipmunkBody.m */; };
@@ -546,6 +549,8 @@
546549
D2342004199AD36D00DF8FCD /* CCNoARC.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CCNoARC.m; sourceTree = "<group>"; };
547550
D2342005199AD36D00DF8FCD /* CCRenderDispatch.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCRenderDispatch.h; sourceTree = "<group>"; };
548551
D2342006199AD36D00DF8FCD /* CCRenderDispatch.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CCRenderDispatch.m; sourceTree = "<group>"; };
552+
D2570847199D81C900B56E04 /* CCDirectorView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCDirectorView.h; sourceTree = "<group>"; };
553+
D2570848199D81C900B56E04 /* CCRenderDispatch_Private.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCRenderDispatch_Private.h; sourceTree = "<group>"; };
549554
D2D598421987132700BDAF25 /* CCEffect_Private.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCEffect_Private.h; sourceTree = "<group>"; };
550555
D2D598431987132700BDAF25 /* CCEffect.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCEffect.h; sourceTree = "<group>"; };
551556
D2D598441987132700BDAF25 /* CCEffect.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CCEffect.m; sourceTree = "<group>"; };
@@ -577,6 +582,7 @@
577582
D2D598611987132700BDAF25 /* CCEffectStackProtocol.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCEffectStackProtocol.h; sourceTree = "<group>"; };
578583
D2D598621987132700BDAF25 /* CCEffectUtils.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCEffectUtils.h; sourceTree = "<group>"; };
579584
D2D598631987132700BDAF25 /* CCEffectUtils.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CCEffectUtils.m; sourceTree = "<group>"; };
585+
D2EC6033199D9F2E001A15E9 /* CCRendererGLSupport.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CCRendererGLSupport.m; sourceTree = SOURCE_ROOT; };
580586
D37EE9FC187D4E7700CB5EF2 /* libObjectiveChipmunk.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libObjectiveChipmunk.a; sourceTree = BUILT_PRODUCTS_DIR; };
581587
D37EE9FD187D4E7800CB5EF2 /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; };
582588
D37EEA0B187D4E7800CB5EF2 /* XCTest.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = XCTest.framework; path = Library/Frameworks/XCTest.framework; sourceTree = DEVELOPER_DIR; };
@@ -1346,6 +1352,7 @@
13461352
E076E6791225EC7400DE0DA2 /* CCScheduler.m */,
13471353
B706B19A1820A42300B27A2C /* CCDirector_Private.h */,
13481354
D3AD531F18C84FC9005B6CF3 /* CCRenderer_private.h */,
1355+
D2EC6033199D9F2E001A15E9 /* CCRendererGLSupport.m */,
13491356
D3AD532018C84FC9005B6CF3 /* CCRenderer.h */,
13501357
D3AD532118C84FC9005B6CF3 /* CCRenderer.m */,
13511358
D2342004199AD36D00DF8FCD /* CCNoARC.m */,
@@ -1358,6 +1365,8 @@
13581365
E076E69F1225EC7400DE0DA2 /* Platforms */ = {
13591366
isa = PBXGroup;
13601367
children = (
1368+
D2570847199D81C900B56E04 /* CCDirectorView.h */,
1369+
D2570848199D81C900B56E04 /* CCRenderDispatch_Private.h */,
13611370
E0D5D6FB1344056600A7B1B9 /* iOS */,
13621371
E076E6B11225EC7400DE0DA2 /* Mac */,
13631372
E076E6A01225EC7400DE0DA2 /* CCGL.h */,
@@ -1685,6 +1694,7 @@
16851694
B7E776531858EC79004221AA /* CCParticleSystemBase.h in Headers */,
16861695
B77060671831B0C40043CC67 /* OALUtilityActions.h in Headers */,
16871696
B770606D1831B0C40043CC67 /* OALAudioTracks.h in Headers */,
1697+
D2570849199D81C900B56E04 /* CCDirectorView.h in Headers */,
16881698
B77060991831B0C40043CC67 /* OALTools.h in Headers */,
16891699
D389412C18639DD400725CFC /* CCPhysicsShape.h in Headers */,
16901700
B77060691831B0C40043CC67 /* OALAudioTrack.h in Headers */,
@@ -1706,6 +1716,7 @@
17061716
B77060871831B0C40043CC67 /* OpenALManager.h in Headers */,
17071717
B77060751831B0C40043CC67 /* ALCaptureDevice.h in Headers */,
17081718
B7D273331822F5460054849B /* CCBSequenceProperty.h in Headers */,
1719+
D257084A199D81C900B56E04 /* CCRenderDispatch_Private.h in Headers */,
17091720
D3903B03199527AA003AA81A /* CCEffectBlur.h in Headers */,
17101721
A046E2B614C1E5000005BBF2 /* CCESRenderer.h in Headers */,
17111722
A046E2B714C1E5000005BBF2 /* CCGLView.h in Headers */,
@@ -1879,6 +1890,7 @@
18791890
D2D5987D1987132700BDAF25 /* CCEffectRenderer.m in Sources */,
18801891
E076E6DA1225EC7400DE0DA2 /* CCActionInstant.m in Sources */,
18811892
E076E6DC1225EC7400DE0DA2 /* CCActionInterval.m in Sources */,
1893+
D2EC6034199D9F2E001A15E9 /* CCRendererGLSupport.m in Sources */,
18821894
B77060901831B0C40043CC67 /* mach_timing.c in Sources */,
18831895
D2342009199AD36D00DF8FCD /* CCRenderDispatch.m in Sources */,
18841896
E076E6DE1225EC7400DE0DA2 /* CCActionManager.m in Sources */,

‎cocos2d/Platforms/CCGL.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -101,6 +101,7 @@ __attribute__((deprecated)) static const GLenum CC_BLEND_DST = GL_ONE_MINUS_SRC_
101101
#define glBindVertexArray glBindVertexArrayOES
102102
#define glMapBuffer glMapBufferOES
103103
#define glUnmapBuffer glUnmapBufferOES
104+
#define glDeleteVertexArrays glDeleteVertexArraysOES
104105

105106
#define GL_DEPTH24_STENCIL8 GL_DEPTH24_STENCIL8_OES
106107
#define GL_WRITE_ONLY GL_WRITE_ONLY_OES

0 commit comments

Comments
 (0)