Commit Graph

4804 Commits

Author SHA1 Message Date
CocosRobot 6a696983e0 [ci skip][AUTO]: updating jsbinding automatically 2020-09-01 10:03:11 +00:00
minggo 04c970ad89 Merge pull request #2743 from minggo/pipline_binding
Pipline binding
2020-09-01 18:00:02 +08:00
minggo f8261ade41 Merge pull request #6 from Mee-gu/removeShadowmapBinding
remove shadowmap binding
2020-09-01 17:24:06 +08:00
coulsonwang 1b091e3f55 add get macros binding 2020-09-01 17:22:41 +08:00
minggo 20b9ce2eb1 fix buffer pool logic 2020-09-01 17:18:13 +08:00
coulsonwang c0bb7138a9 remove shadowmap binding 2020-09-01 11:24:02 +08:00
minggo fc55b39311 fix binding issue 2020-08-31 17:43:06 +08:00
coulsonwang 7feb3f299f fix pipeline binding 2020-08-31 16:37:46 +08:00
江战 360e8ba5ec skip old template name (#2741) 2020-08-31 15:13:02 +08:00
cary a86ff9b4d8 Add serialized data synchronization for pipeline. (#2736) 2020-08-31 11:17:45 +08:00
minggo 783937aa0a Update binding generator (#2739) 2020-08-31 10:45:03 +08:00
CocosRobot 738f7269f7 [ci skip][AUTO]: updating jsbinding automatically (#2738) 2020-08-31 10:25:14 +08:00
coulsonwang 8010648089 Fix metal descriptor set (#2729) 2020-08-31 09:37:05 +08:00
coulsonwang de380ae677 fix native pipeline (#2734) 2020-08-31 09:32:13 +08:00
CocosRobot 7bd82918a6 [AUTO][ci skip]: updating cocos2dx_files.json (#2735) 2020-08-28 18:01:57 +08:00
cary b2eb500d47 Add pipeline jsb binding. (#2722)
Co-authored-by: minggo <nudtzxm@gmail.com>
2020-08-28 17:48:37 +08:00
CocosRobot 36a7844945 [AUTO][ci skip]: updating cocos2dx_files.json (#2731) 2020-08-28 15:47:03 +08:00
minggo b08407c501 remove CC/cc prefix for file names (#2728) 2020-08-28 15:23:29 +08:00
zhefeng.zhang 517e5c5cc7 sync #1936 (#2712) 2020-08-27 10:30:12 +08:00
CocosRobot ce66b91918 [AUTO][ci skip]: updating cocos2dx_files.json (#2725) 2020-08-26 18:34:41 +08:00
minggo a3217c16dd remove CCRefPtr.h (#2724) 2020-08-26 18:21:30 +08:00
Yun Hsiao Wu ca23166ebf remove GFXStatus (#2719) 2020-08-25 14:34:37 +08:00
minggo 4d889c7ae7 use CC_DEBUG instead (#2718) 2020-08-25 11:58:13 +08:00
CocosRobot dddd881bdd [ci skip][AUTO]: updating jsbinding automatically (#2717) 2020-08-25 11:17:18 +08:00
coulsonwang e39071ab8d Metal Descriptor set (#2716)
* Metal Descriptor set

* remove setVertexBytes usage
2020-08-25 11:09:02 +08:00
CocosRobot 5148ee870f [AUTO][ci skip]: updating cocos2dx_files.json (#2714) 2020-08-24 17:24:42 +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
zhefeng.zhang fda166d954 sync #1919 (#2711) 2020-08-24 11:54:15 +08:00
minggo 9ba81190d1 calculate total frames (#2710) 2020-08-24 09:41:06 +08:00
CocosRobot d779f28638 [AUTO][ci skip]: updating cocos2dx_files.json (#2709) 2020-08-20 16:03:50 +08:00
minggo 95ef78f7c8 fix shared memory (#2707) 2020-08-20 15:36:04 +08:00
minggo 75bd404b51 Merge pull request #2704 from Mee-gu/RenderView
fix RenderView and RenderWindow
2020-08-20 15:16:18 +08:00
coulsonwang 4a18a34a6c add pipeline instance 2020-08-19 22:07:54 +08:00
coulsonwang 728ffb4aa0 fix RenderView and RenderWindow 2020-08-19 17:07:53 +08:00
CocosRobot 72bc816a6e [AUTO][ci skip]: updating cocos2dx_files.json 2020-08-19 04:08:52 +00:00
minggo e547b86402 Merge pull request #2701 from Mee-gu/ShadowMap
add shadow flow/stage/batchedQueue
2020-08-19 12:00:16 +08:00
coulsonwang 26e2dbb1c9 fix review 2020-08-19 10:35:28 +08:00
minggo 9f3357d3fd Merge pull request #2692 from PatriceJiang/3dgfx-fix-cmake-win32-path
fix win32 path as cmake argument
2020-08-19 09:39:50 +08:00
coulsonwang af2db26c6b add shadow flow/stage/batchedQueue 2020-08-18 18:11:36 +08:00
CocosRobot 294da5a477 [AUTO][ci skip]: updating cocos2dx_files.json 2020-08-18 06:35:46 +00:00
minggo c3e28f4f07 Merge pull request #2698 from Mee-gu/fixUBOGlobal
apply UBOGlobal modify
2020-08-18 14:27:21 +08:00
coulsonwang ab9a7bca3a apply UBOGlobal modify 2020-08-18 11:51:57 +08:00
CocosRobot 3549bf136c [ci skip][AUTO]: updating jsbinding automatically 2020-08-18 02:04:44 +00:00
coulsonwang 2513f68f20 fix 2020-08-18 09:37:53 +08:00
coulsonwang c43ee5b54f fix
# Conflicts:
#	cocos/renderer/pipeline/RenderAdditiveLightQueue.cpp
#	cocos/renderer/pipeline/RenderAdditiveLightQueue.h
#	cocos/renderer/pipeline/RenderPipeline.cpp
#	cocos/renderer/pipeline/forward/ForwardStage.cpp
2020-08-17 18:24:24 +08:00
coulsonwang a388e63369 add scene culling
# Conflicts:
#	cocos/renderer/pipeline/forward/ForwardPipeline.h
#	cocos/renderer/pipeline/helper/SharedMemory.h
2020-08-17 18:23:25 +08:00
coulsonwang b5bb1487ca fix SubModelView and PassView
# Conflicts:
#	cocos/renderer/pipeline/BatchedBuffer.cpp
#	cocos/renderer/pipeline/BatchedBuffer.h
#	cocos/renderer/pipeline/InstancedBuffer.cpp
#	cocos/renderer/pipeline/InstancedBuffer.h
#	cocos/renderer/pipeline/PipelineStateManager.cpp
#	cocos/renderer/pipeline/PipelineStateManager.h
#	cocos/renderer/pipeline/RenderAdditiveLightQueue.cpp
#	cocos/renderer/pipeline/RenderAdditiveLightQueue.h
#	cocos/renderer/pipeline/RenderInstancedQueue.cpp
#	cocos/renderer/pipeline/RenderQueue.cpp
#	cocos/renderer/pipeline/forward/ForwardStage.cpp
#	cocos/renderer/pipeline/helper/SharedMemory.h
#	cocos/renderer/pipeline/ui/UIFlow.cpp
#	cocos/renderer/pipeline/ui/UIFlow.h
#	cocos/renderer/pipeline/ui/UIStage.cpp
#	cocos/renderer/pipeline/ui/UIStage.h
#	cocos/scripting/dop/BufferPool.h
2020-08-17 18:22:34 +08:00
coulsonwang 103d4eb50f fix forward pipeline and forward flow
# Conflicts:
#	CMakeLists.txt
#	cocos/renderer/pipeline/Define.cpp
#	cocos/renderer/pipeline/RenderFlow.cpp
#	cocos/renderer/pipeline/RenderPipeline.cpp
#	cocos/renderer/pipeline/RenderWindow.h
#	cocos/renderer/pipeline/forward/ForwardFlow.cpp
#	cocos/renderer/pipeline/forward/ForwardFlow.h
#	cocos/renderer/pipeline/forward/ForwardPipeline.cpp
#	cocos/renderer/pipeline/forward/ForwardPipeline.h
#	cocos/renderer/pipeline/forward/ForwardStage.cpp
#	cocos/renderer/pipeline/helper/SharedMemory.h
#	cocos/renderer/pipeline/shadow/ShadowFlow.cpp
#	cocos/renderer/pipeline/shadow/ShadowFlow.h
#	cocos/renderer/pipeline/ui/UIFlow.h
2020-08-17 18:19:16 +08:00
coulsonwang d1002a34f0 Merge branch '3d-gfx' into ForwardStage 2020-08-17 15:04:09 +08:00
CocosRobot bde183ed4d [AUTO][ci skip]: updating cocos2dx_files.json (#2693) 2020-08-14 09:54:53 +08:00