mirror of
https://github.com/cocos/cocos4.git
synced 2026-11-21 16:12:40 +08:00
5005752386
# Conflicts: # cocos/core/builtin/effects.ts # cocos/core/builtin/shader-sources/glsl1.ts # cocos/core/builtin/shader-sources/glsl3.ts # cocos/core/builtin/shader-sources/glsl4.ts # cocos/core/gfx/define-class.ts # cocos/core/gfx/define.ts # cocos/core/gfx/webgl/webgl-buffer.ts # cocos/core/gfx/webgl2/webgl2-buffer.ts # cocos/core/pipeline/forward/forward-pipeline.ts # cocos/core/pipeline/planar-shadow-queue.ts # cocos/core/pipeline/render-additive-light-queue.ts # cocos/particle/renderer/particle-system-renderer-data.ts # editor/assets/chunks/cc-shadow-map-fs.chunk # editor/assets/chunks/shading-standard.chunk