mirror of
https://github.com/cocos/cocos4.git
synced 2026-11-20 23:52:40 +08:00
ec5401aed9
# Conflicts: # CMakeLists.txt # cocos/cocos2d.h # cocos/platform/ios/Application-ios.mm # cocos/platform/ios/View.h # cocos/platform/mac/Application-mac.mm # cocos/renderer/core/gfx/GFXDevice.h # cocos/renderer/gfx-metal/MTLCommandBuffer.h # cocos/renderer/gfx-metal/MTLCommandBuffer.mm # cocos/renderer/gfx-metal/MTLContext.mm # cocos/renderer/gfx-metal/MTLDevice.h # cocos/renderer/gfx-metal/MTLDevice.mm # cocos/renderer/gfx-metal/MTLFence.h # cocos/renderer/gfx-metal/MTLFence.mm # cocos/renderer/gfx-metal/MTLQueue.h # cocos/renderer/gfx-metal/MTLQueue.mm # cocos/renderer/gfx-metal/MTLUtils.mm # cocos/renderer/gfx-vulkan/VKGPUObjects.h # templates/template-link/common/CMakeLists.txt # tools/tojs/metal.ini