Commit Graph

30 Commits

Author SHA1 Message Date
minggo f08555248f fix conflict 2022-01-24 17:23:03 +08:00
Yun Hsiao Wu 14a17c9d22 license upgrade (#4210) 2022-01-24 17:18:47 +08:00
Zeqiang Li 4b1422a7f3 event init & mem align (#4116) 2021-12-21 11:08:11 +08:00
Yun Hsiao Wu 5524b5c5d4 nx adaptation framework (#4050) 2021-12-14 15:04:57 +08:00
minggo ac7418f1c1 fix conflict 2021-11-30 10:48:30 +08:00
oahcy 5379e6ef35 引擎适配linux平台 (#4035) 2021-11-29 17:17:15 +08:00
李吉林 bed27fcccf V3.4.0 occlusion query2 (#3975)
* occlusion query
Co-authored-by: lijilin <jilin.li@cocos.com>
2021-10-13 18:21:03 +08:00
minggo ea980f509c merge v3.3.2 2021-09-24 12:38:10 +08:00
江战 5074a5a826 V3.4.0 usec++14 (#3898)
This reverts commit fff4cc8fc94fb9b1a8424a2b89e9966184c6c4ce.
2021-09-18 13:53:58 +08:00
Zeqiang Li 3e28c2821a api min required -> ios 10.0 (#3885)
* ios 10 alignas
* ios 10 api
2021-09-15 16:03:12 +08:00
江战 1bac46bb23 Use c++14 by default (#3880) 2021-09-13 10:41:27 +08:00
李吉林 81167fbfbf V3.4.0 20210816 (#3835)
* memory leak detector
* memory leak detector for mac&io
2021-08-17 09:25:11 +08:00
minggo cf0a79b98a add ogre license (#3825) 2021-08-13 16:38:33 +08:00
minggo aa522396a3 CC_INLINE to inline (#3664) 2021-06-28 16:41:13 +08:00
Yun Hsiao Wu e1c240f2d0 Clang-Tidy adaptations (#3379)
* gfx: CommandBuffer.draw accept DrawInfo

* clang-tidy config

* tidy adapt

* enable function name check

* better workflow
2021-04-12 09:41:28 +08:00
minggo d8824f8a11 fix coding style (#3371) 2021-04-02 09:55:12 +08:00
Yun Hsiao Wu ea88ba33c6 codebase structure update (#3289)
* structure

* fix jsb auto binding license issue
2021-03-01 12:00:10 +08:00
Yun Hsiao Wu e0fdfef054 license upgrader 2021-02-05 14:08:22 +08:00
pandamicro ec5401aed9 Merge remote-tracking branch 'origin/v3.1' into device-proof
# 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
2021-01-28 19:50:53 +08:00
minggo 0386bed212 fix audio code format (#3212)
* fix audio code format

* format base files
2021-01-13 13:38:07 +08:00
Yun Hsiao Wu 6a935a7129 virtual top node for tbb job graph 2021-01-11 17:12:43 +08:00
Yun Hsiao Wu e0c28d4b62 gl: full secondary cb 2021-01-11 17:12:30 +08:00
Yun Hsiao Wu ccab942007 vk: triple buffer 2021-01-11 17:12:28 +08:00
Yun Hsiao Wu 98982e6d54 proxy destroy 2021-01-04 11:01:21 +08:00
Yun Hsiao Wu 9d3d6647dd merge latest device layer (#3145) 2020-12-28 17:23:16 +08:00
minggo b08407c501 remove CC/cc prefix for file names (#2728) 2020-08-28 15:23:29 +08:00
Yun Hsiao Wu 46ba30ae13 GFX Descriptor Set (#2713)
* GFX Descriptor Set: GLES3

* GFX Descriptor Set: GLES2

* GFX Descriptor Set: Vulkan

* upper layer adaptions

* GFX Descriptor Set: Metal

Co-authored-by: coulsonwang <coulsonwang@126.com>
2020-08-24 17:11:06 +08:00
minggo 6a17148d40 use .cpp/.h for source file suffix (#2654) 2020-07-22 15:00:28 +08:00
minggo 7efee066fd Remove duplicate (#2597) 2020-06-19 11:07:21 +08:00
minggo cf60075203 move some files from renderer/core to cocos/base (#2591) 2020-06-18 13:47:25 +08:00