Commit Graph

5183 Commits

Author SHA1 Message Date
troublemaker52025 666b8cb0c0 fix multi-light source rendering translucent material for v3.4.0 (#3910)
* fix merge error

* update

* update ds to globalDS

* safe destroy

* fix ci error

* fix ci error
2021-09-28 18:00:17 +08:00
troublemaker52025 b00ecadad6 fix spot light bug for v3.4.0 (#3933)
* fix spot light bug for v3.4.0

* fix ci error

* revert
2021-09-28 16:41:55 +08:00
江战 b24c278f88 remove password authentication (#3932) 2021-09-28 15:03:19 +08:00
minggo 571d825a74 Fix compiling error (#3930) 2021-09-28 15:03:07 +08:00
minggo c0fa3af246 Fxaa (#3928)
* Adaptation fxaa

Co-authored-by: zhengxiangkui <476393671@qq.com>
2021-09-28 11:05:55 +08:00
江战 db9babccdf V3.4.0 CI force cxx standard (#3922)
* force cxx standard

* use win2016

* use vs 20-17
2021-09-27 21:27:23 +08:00
江战 17a101227a fix path (#3927) 2021-09-27 20:50:01 +08:00
Yun Hsiao Wu 023c684b95 fix ES2 uniform parsing (#3925) 2021-09-27 17:31:25 +08:00
江战 e4e019561d remove if constexpr (#3921) 2021-09-27 09:09:52 +08:00
Yun Hsiao Wu 23a9d75bee fg: present with move if possible (#3919)
* fg: present with move if possible

* fix ia state cache
2021-09-26 17:37:28 +08:00
zhakesi 18f268126f fix dragonbone render error with z value. (#3918) 2021-09-24 18:09:32 +08:00
minggo 746709ebb1 Merge pull request #3917 from minggo/merge-v3.3.2
Merge v3.3.2
2021-09-24 14:27:48 +08:00
minggo e14fd73506 fix compling error and review 2021-09-24 14:09:30 +08:00
Cocos Robot b5bc53297f [ci skip][AUTO]: updating jsbinding automatically: 1b0198a4 (#3916)
Co-authored-by: cocos-robot <engine-deploy@cocos.com>
2021-09-24 13:55:44 +08:00
minggo ea980f509c merge v3.3.2 2021-09-24 12:38:10 +08:00
Yun Hsiao Wu 1b0198a476 fix manual js bindings (#3914) 2021-09-24 11:57:29 +08:00
Zeqiang Li 1b721c4a65 fix mtl pixelformat (#3911)
* fix mtl pixelformat

* add comment

* correct shader obj-c object
2021-09-23 18:53:56 +08:00
Yun Hsiao Wu 2dd9263085 remove resizable flag (#3908)
* misc fixes

* remove resizable flag
2021-09-23 18:34:31 +08:00
troublemaker52025 b419fa958c Culling performance optimization for v3.4.0 (#3909)
* matShadowViewInv is matShadowTrans
2021-09-23 18:00:26 +08:00
Zeqiang Li c5aef2467f subpass fallback (#3907) 2021-09-22 20:49:16 +08:00
Zeqiang Li 2bf1e00ffa compute texture format & mtlcompare function (#3906) 2021-09-22 14:08:16 +08:00
Cocos Robot 63e6172f6e [ci skip][AUTO]: updating jsbinding automatically: 32fb726d (#3904)
Co-authored-by: cocos-robot <engine-deploy@cocos.com>
2021-09-22 10:30:50 +08:00
timlyeee 4c620f60cd Update config.json (#3901) 2021-09-22 10:17:51 +08:00
江战 32fb726dbf fix cmake error (#3902) 2021-09-22 10:17:37 +08:00
江战 7833da0210 fix cmake error (#3903) 2021-09-22 10:17:24 +08:00
江战 5074a5a826 V3.4.0 usec++14 (#3898)
This reverts commit fff4cc8fc94fb9b1a8424a2b89e9966184c6c4ce.
2021-09-18 13:53:58 +08:00
GengineJS 01b186e575 ForwardPipeline docking with FrameGraph (#3893)
* ForwardPipeline docking with FrameGraph

* update

* Fix the problem that ui does not display

* Modify Rect writing
2021-09-18 10:52:00 +08:00
Zeqiang Li ad746b16cd fix crash with metal (#3899)
* swapchain texture sync acquire/relase

* mtl swapchain sync & spv null protection

* temp memoryless strategy
2021-09-18 09:37:10 +08:00
Cocos Robot b2a6448c7d [ci skip][AUTO]: updating jsbinding automatically: 3d1b6f98 (#3896)
Co-authored-by: cocos-robot <engine-deploy@cocos.com>
2021-09-17 11:52:12 +08:00
Yun Hsiao Wu 3d1b6f9835 misc fixes (#3895) 2021-09-17 11:42:19 +08:00
李吉林 fa210fa955 add octree scene manager (#3891)
* add octree scene manager
Co-authored-by: lijilin <jilin.li@cocos.com>
2021-09-17 11:20:05 +08:00
江战 3b77662e87 fix double conversion (#3892) 2021-09-16 18:33:51 +08:00
timlyeee 2da31bdd80 Update jsb_conversion.h to fix issue (#3890)
Issue from https://github.com/cocos-creator/3d-tasks/issues/9202, a simple way to get rid of char* judgement
2021-09-16 16:55:48 +08:00
Yun Hsiao Wu 1016f7d609 should trigger update when set instance (#3888) 2021-09-16 10:23:29 +08:00
Yun Hsiao Wu 89131fad2d GL: better subpass support (#3887)
* vk: better subpass dependency deduction

* GL: better subpass support

* uint -> uint32_t

* officially make viewport/scissor dynamic by default

* gfx: states store hashes

* gfx: defend against usages after destroy
2021-09-16 09:43:26 +08:00
timlyeee 3e6730c0ad Fix swapchain resize issue. (#3886)
* Fix swapchain resize issue.

* If the new surface created by resize event is using the same address with the one store  in context, error occurs
* Should set to EGL_NO_SURFACE when destroy the original surface

* NOLINT for function size
2021-09-15 17:08: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
江战 a4b215cd7a [3.4.0] fix bigint conversion (#3882)
* fix bigint

* Update cocos/bindings/manual/jsb_conversions.h
2021-09-14 16:10:41 +08:00
Jackie0110 01b45dbc11 - fix spine rotation in cache mode (#3884)
Co-authored-by: Viet <>
2021-09-13 17:17:18 +08:00
江战 1bac46bb23 Use c++14 by default (#3880) 2021-09-13 10:41:27 +08:00
troublemaker52025 cc9f23ce25 fix no shadow scene error for v3.3.1 (#3879) 2021-09-10 14:26:44 +08:00
minggo 43fba39022 Merge pull request #3877 from cocos-robot/update_js_bindings_1631174923
[ci skip][AUTO]: updating jsbinding automatically: d4441705
2021-09-09 17:39:23 +08:00
minggo b1976329df Merge pull request #3874 from minggo/merge_v3.3.1
Merge v3.3.1
2021-09-09 17:29:35 +08:00
cocos-robot 4f4f06acc4 [ci skip][AUTO]: updating jsbinding automatically: d4441705 2021-09-09 08:08:44 +00:00
Yun Hsiao Wu d4441705e6 unify gfx resize event (#3875) 2021-09-09 16:00:21 +08:00
GengineJS cbaa9530ad Fix the crash of camera scene in testcase3d (#3876)
Co-authored-by: zhengxiangkui <>
2021-09-09 15:39:10 +08:00
江战 6a553f105b 3.3.1 fix mac crash (#3873) 2021-09-09 13:58:03 +08:00
minggo f3049c0acb merge v3.3.1 to v3.4.0 2021-09-09 11:00:18 +08:00
troublemaker52025 e9cf6704b7 GLES2 using packing mode to render shadow map for v3.3.1 (#3872) 2021-09-09 10:25:59 +08:00
Cocos Robot 548be02785 [ci skip][AUTO]: updating jsbinding automatically: 627b02d3 (#3871)
Co-authored-by: cocos-robot <engine-deploy@cocos.com>
2021-09-08 13:54:32 +08:00