-
Notifications
You must be signed in to change notification settings - Fork 2k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
V3.8.5 ray query #17719
Draft
star-e
wants to merge
106
commits into
cocos:v3.8.5
Choose a base branch
from
star-e:v3.8.5-ray-query
base: v3.8.5
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+4,811
−21
Draft
V3.8.5 ray query #17719
Changes from all commits
Commits
Show all changes
106 commits
Select commit
Hold shift + click to select a range
71c899e
add acceleration structure
Makalou 284cbc4
Implement VKaccelerationStructure compaction
Makalou aaa4061
add accelStruct chunk and ray query effect
Makalou b6448c5
fix some bugs
Makalou 3503481
add some ray query effect
Makalou 3473df3
add glslV460 support
Makalou 3796d35
add effect compiler acceleration structure support
Makalou af4c385
fix some bugs
Makalou c44d453
fix some bugs
Makalou 7893aaa
add accelerationstructure Ref se-to-native support
Makalou ce0ceab
memory barrier bugs
Makalou 0a71a2d
refactor
Makalou 603002f
fix device memory leak
Makalou 993e0d0
change VKAccelerationStructure instanceData buffer upload schema
Makalou 3be1113
fix accel struct descriptor invalid issue
Makalou df2e629
add AABB blas (memory leak)
Makalou c489843
add AABB blas (mem leak fixed)
Makalou 62f179b
reformat
Makalou 38bbc2d
dummy implementations for Acceleration Structure on unsupport platforms
Makalou 5ebf592
change CMakeList
Makalou 6605f13
Merge branch 'develop' into gfx-ray-query
Makalou 6645c04
merge develop gfx-ray-query
Makalou c3d7558
dummy implementations for device and commandbuffer
Makalou 4978af4
modify
Makalou 7be44d3
fix vkbuffer leak
Makalou dcc94d2
fix jsb_conversion_spec
Makalou adccc03
reformat
Makalou 6c57b56
rename
Makalou 9d29f87
rename
Makalou 3614b40
fix small bug
Makalou 8475e7b
fix include files missing
Makalou e73c8ff
refactor fillBlasInfo
Makalou 50de0b8
refactor
Makalou 978ecf2
refactor
Makalou 0029c27
refactor
Makalou c29dfcb
Merge branch 'develop' into gfx-ray-query
Makalou dcd8124
Merge branch 'develop' into gfx-ray-query
Makalou 174b5bf
defered lighting
Makalou a07e068
Merge branch 'develop' into gfx-ray-query
Makalou 94d403f
add shadow ray shading
Makalou 1d24101
Merge branch 'develop' into gfx-ray-query
Makalou a21d51f
add stochastic AO
Makalou 1adda81
Merge branch 'develop' into gfx-ray-query
Makalou fb57d5d
Refactor
Makalou 84b44ce
Merge branch 'develop' into gfx-ray-query
Makalou 94b2294
refactor
Makalou 8d5dadb
Merge branch 'develop' into gfx-ray-query
Makalou b9ccd2f
scene desc experiment
Makalou d3ea42c
Merge branch 'develop' into gfx-ray-query
Makalou f8d9ada
scene desc experiment refactor
Makalou ba67a9e
Merge branch 'develop' into gfx-ray-query
Makalou e6aa3af
refactor
Makalou 17ce24a
add blue noise
Makalou 36aec0c
try add rtpipeline but trigger gfxBuffer bug
Makalou 6954df0
fix gfx::buffer bug
Makalou e19ef05
comment unused function
Makalou 30d57cf
Merge branch 'develop' into gfx-ray-query
Makalou 88a8cf3
refactor rtpipeline creation"
Makalou 543e087
refactor
Makalou 41cd937
add hit group SBT
Makalou 25c701b
merge develop to gfx-ray-query
Makalou 8775b21
refactor
Makalou d8cd5c7
rtpipeline
Makalou e1feb29
refactor
Makalou bd94dff
Merge branch 'develop' into gfx-ray-query
Makalou 4a56034
refactor
Makalou 6d2cc60
Merge branch 'develop' into gfx-ray-query
Makalou 7a2d648
Merge branch 'develop' into gfx-ray-query
Makalou d24a730
Merge branch 'develop' into gfx-ray-query
Makalou 995fdfe
refactor
Makalou b19d64e
refactor
Makalou 5896a0e
refactor
Makalou 8f235be
refactor
Makalou 4687229
refactor
Makalou 53f2c87
refactor
Makalou 8cf9e7d
refactor
Makalou 567e323
refactor
Makalou ce4d659
refactor
Makalou 28f9ab7
refactor
Makalou 1ab301c
refactor
Makalou ccf136e
arena allocator
Makalou 3314702
Merge branch 'develop' into gfx-ray-query
Makalou 10631ce
Merge branch 'develop' into gfx-ray-query
Makalou 6f08a99
arena allocatorq
Makalou 1aad8f0
refactor
Makalou fff7a8d
refactor
Makalou 60c3a8e
Merge branch 'develop' into gfx-ray-query
Makalou d32d567
Merge branch 'develop' into gfx-ray-query
Makalou 933efa3
refactor
Makalou 9c4e508
Merge branch 'develop' into gfx-ray-query
Makalou e8cca69
refactor
Makalou a452e70
refactor
Makalou c2be24b
Merge branch 'develop' into gfx-ray-query
Makalou c6dc861
fix acceleration structure scratch buffer alignemen issue
Makalou fb6947a
refactor
Makalou c522a69
refactor
Makalou 3b40dea
Merge branch 'develop' into gfx-ray-query
Makalou 3536e81
refactor
Makalou dac5563
refactor
Makalou 5f2fd95
Merge branch 'develop' into gfx-ray-query
Makalou 92cd779
refactor
Makalou a415bed
refactor
Makalou d0d475c
Merge branch 'develop' into gfx-ray-query
Makalou 5131614
reformat
Makalou c7c47ab
Merge branch 'develop' into gfx-ray-query
Makalou 86b6365
Merge branch 'gfx-ray-query' into v3.8.5-pipeline
star-e File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
6 changes: 6 additions & 0 deletions
6
editor/assets/chunks/builtin/uniforms/cc-acceleration-structure.chunk
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,6 @@ | ||
|
||
#pragma extension([GL_EXT_ray_query, __VERSION__ >= 460, enable]) | ||
|
||
#pragma builtin(global) | ||
layout(set = 0, binding = 8) uniform accelerationStructureEXT cc_topLevelAS; | ||
|
34 changes: 34 additions & 0 deletions
34
editor/assets/chunks/builtin/uniforms/cc-scene-shading-data.chunk
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,34 @@ | ||
#pragma extension([GL_EXT_scalar_block_layout, __VERSION__ >= 450, enable]) | ||
#pragma extension([GL_EXT_buffer_reference2, __VERSION__ >= 450, require]) | ||
#pragma extension([GL_EXT_shader_explicit_arithmetic_types,__VERSION__>=450,enable]) | ||
|
||
layout(buffer_reference, scalar) readonly buffer IndicesBuffer32 { ivec3 i[]; }; | ||
layout(buffer_reference, scalar) readonly buffer IndicesBuffer16 { i16vec3 i[]; }; | ||
|
||
struct VertexAttributes { | ||
vec3 position; | ||
vec3 normal; | ||
vec2 texCoord; | ||
vec4 tangent; | ||
}; | ||
|
||
layout(buffer_reference, scalar) readonly buffer VertexAttributesBuffer { VertexAttributes v[];}; | ||
|
||
struct GeomDesc{ | ||
uint64_t indexAddress; | ||
uint64_t vertexAddress; | ||
}; | ||
|
||
struct MeshDesc | ||
{ | ||
uint16_t subMeshGeometryOffset; | ||
uint16_t subMeshMaterialOffset; | ||
uint16_t subMeshCount; | ||
uint16_t padding; | ||
}; | ||
|
||
#pragma builtin(global) | ||
layout(set = 0, binding = 9) readonly buffer cc_scene_geometry_desc {GeomDesc geomDescs[];}; | ||
|
||
#pragma builtin(global) | ||
layout(set = 0, binding = 10) readonly buffer cc_scene_instance_desc {MeshDesc instanceDescs[];}; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
II -> I ?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Infp -> Info