[cocos2d/cocos2d-swift] d7dcfa: Moving some metal/objc type definitions to shared ...

25 views
Skip to first unread message

GitHub

unread,
Sep 19, 2014, 11:02:45 PM9/19/14
to cocos2d-iph...@googlegroups.com
Branch: refs/heads/metal-hacking
Home: https://github.com/cocos2d/cocos2d-swift
Commit: d7dcfa184ddfd81dbb177dc0f3be429f7f79cbad
https://github.com/cocos2d/cocos2d-swift/commit/d7dcfa184ddfd81dbb177dc0f3be429f7f79cbad
Author: slembcke <slem...@gmail.com>
Date: 2014-09-19 (Fri, 19 Sep 2014)

Changed paths:
M cocos2d-ios.xcodeproj/project.pbxproj
M cocos2d-tests-ios.xcodeproj/project.pbxproj
M cocos2d/CCRenderer.m
M cocos2d/CCRendererBasicTypes.h
A cocos2d/CCRendererSharedTypes.h
M cocos2d/CCRenderer_Private.h
M cocos2d/Platforms/iOS/CCShaders.metal

Log Message:
-----------
Moving some metal/objc type definitions to shared header.


Commit: a388c58d8cafc72e1f6836057e39ad75b7fc6c91
https://github.com/cocos2d/cocos2d-swift/commit/a388c58d8cafc72e1f6836057e39ad75b7fc6c91
Author: slembcke <slem...@gmail.com>
Date: 2014-09-19 (Fri, 19 Sep 2014)

Changed paths:
M cocos2d/CCRendererBasicTypes.m

Log Message:
-----------
Uniform buffers were not being reset.


Commit: 2449289ca6c904ca9cd388966024f84f7a04a85e
https://github.com/cocos2d/cocos2d-swift/commit/2449289ca6c904ca9cd388966024f84f7a04a85e
Author: slembcke <slem...@gmail.com>
Date: 2014-09-19 (Fri, 19 Sep 2014)

Changed paths:
M CCRendererGLSupport.m
M cocos2d/CCDirector.m
M cocos2d/CCRendererBasicTypes.m
M cocos2d/CCRendererBasicTypes_Private.h

Log Message:
-----------
Enable depth testing when binding a CCFrameBufferObject.


Commit: 8d6af692ac80d405eddff4db143d053465da1f25
https://github.com/cocos2d/cocos2d-swift/commit/8d6af692ac80d405eddff4db143d053465da1f25
Author: slembcke <slem...@gmail.com>
Date: 2014-09-19 (Fri, 19 Sep 2014)

Changed paths:
M cocos2d-tests-ios.xcodeproj/project.pbxproj
M cocos2d-ui-tests/tests/CCRendererTest.m
M cocos2d/CCNoARC.m
M cocos2d/CCShader.h
M cocos2d/CCShader.m
M cocos2d/Platforms/iOS/CCShaders.metal

Log Message:
-----------
Fix some issues with setting metal shader state. More shader API for metal.


Commit: 44568f3c429cca158bad8011946016eb0f1e0b9c
https://github.com/cocos2d/cocos2d-swift/commit/44568f3c429cca158bad8011946016eb0f1e0b9c
Author: slembcke <slem...@gmail.com>
Date: 2014-09-19 (Fri, 19 Sep 2014)

Changed paths:
M cocos2d/CCNode.m
M cocos2d/CCRendererBasicTypes.m

Log Message:
-----------
Add more assertions.


Commit: 6ce398b39076ebe36296791287db1a1513d4e0ad
https://github.com/cocos2d/cocos2d-swift/commit/6ce398b39076ebe36296791287db1a1513d4e0ad
Author: slembcke <slem...@gmail.com>
Date: 2014-09-19 (Fri, 19 Sep 2014)

Changed paths:
M cocos2d/CCRenderer.m

Log Message:
-----------
Don’t copy render states if threaded rendering is not enabled.


Commit: 453a9ef7d396d0ca3ee0dddc54d96d6230a765a5
https://github.com/cocos2d/cocos2d-swift/commit/453a9ef7d396d0ca3ee0dddc54d96d6230a765a5
Author: slembcke <slem...@gmail.com>
Date: 2014-09-19 (Fri, 19 Sep 2014)

Changed paths:
A cocos2d-ui-tests/tests/TestShaders.metal
M cocos2d/CCShader.m

Log Message:
-----------
Implemented [CCShader shaderNamed:] for metal.


Commit: 67384fcc6adfdfdc5ca4fedf764d793da4141478
https://github.com/cocos2d/cocos2d-swift/commit/67384fcc6adfdfdc5ca4fedf764d793da4141478
Author: slembcke <slem...@gmail.com>
Date: 2014-09-19 (Fri, 19 Sep 2014)

Changed paths:
M cocos2d/CCTextureCache.m
M cocos2d/Platforms/iOS/CCAppDelegate.m
M cocos2d/Platforms/iOS/CCMetalView.m

Log Message:
-----------
Cleaning up some TODO warnings.


Compare: https://github.com/cocos2d/cocos2d-swift/compare/5611d0c71974...67384fcc6adf
Reply all
Reply to author
Forward
0 new messages