Updates for final Vulkan ray tracing extensions (#2466)
* Fix traceRay/executeCallable to have id instead of constant. Update to final (non-provisional) SPIR-V capabilities (includes review feedback) - Change visibilty of findLinkerObjects. See merge request GLSL/glslang!78 * Add support for OpConvertUToAccelerationStructureKHR. GLSL : https://gitlab.khronos.org/GLSL/GLSL/-/merge_requests/60 SPV : https://gitlab.khronos.org/spirv/spirv-extensions/-/merge_requests/182 See merge request GLSL/glslang!77 * Add volatile qualifier to certain builtins for ray tracing. See merge request GLSL/glslang!81 * make gl_RayTmaxEXT volatile in intersection shader Vulkan Issue #2268 * Add testing for layouts on SBT vulkan/vulkan#2230 - no layout specified should be same as std430 - explicitly test std140, std430, scalar layouts See merge request GLSL/glslang!86 * Support for new opcodes OpIgnoreIntersectionKHR and OpTerminateRayKHR vulkan/vulkan#2374 Add support for ignoreIntersectionEXT and terminateRayEXT as block terminator statements. See merge request GLSL/glslang!87 * Fix code-generation issues with global ray query variables See merge request GLSL/glslang!88 * update dependencies for spirv-headers and tools And update mesh shader results * Fix indeterminate argument ordering Authored-by: David Neto <dneto@google.com> Co-authored-by: Ashwin Lele (NVIDIA Corporation) <alele@nvidia.com> Co-authored-by: Neslisah <Neslisah.Torosdagli@amd.com>
This commit is contained in:
parent
7f6559d280
commit
ffccefddfd
76 changed files with 4951 additions and 3663 deletions
|
|
@ -3,12 +3,12 @@ spv.ext.RayGenShader.rgen
|
|||
// Generated by (magic number): 8000a
|
||||
// Id's are bound by 58
|
||||
|
||||
Capability RayTraversalPrimitiveCullingProvisionalKHR
|
||||
Capability RayTracingProvisionalKHR
|
||||
Capability RayTraversalPrimitiveCullingKHR
|
||||
Capability RayTracingKHR
|
||||
Extension "SPV_KHR_ray_tracing"
|
||||
1: ExtInstImport "GLSL.std.450"
|
||||
MemoryModel Logical GLSL450
|
||||
EntryPoint RayGenerationKHR 4 "main" 11 21 29 40 51 54 57
|
||||
EntryPoint RayGenerationKHR 4 "main" 11 21 29 40 53 54 57
|
||||
Source GLSL 460
|
||||
SourceExtension "GL_EXT_ray_flags_primitive_culling"
|
||||
SourceExtension "GL_EXT_ray_tracing"
|
||||
|
|
@ -24,9 +24,9 @@ spv.ext.RayGenShader.rgen
|
|||
MemberName 38(block) 0 "dir"
|
||||
MemberName 38(block) 1 "origin"
|
||||
Name 40 ""
|
||||
Name 51 "accEXT1"
|
||||
Name 54 "imageu"
|
||||
Name 57 "payload"
|
||||
Name 53 "payload"
|
||||
Name 54 "accEXT1"
|
||||
Name 57 "imageu"
|
||||
Decorate 11(gl_LaunchIDEXT) BuiltIn LaunchIdKHR
|
||||
Decorate 21(gl_LaunchSizeEXT) BuiltIn LaunchSizeKHR
|
||||
Decorate 29(accEXT0) DescriptorSet 0
|
||||
|
|
@ -36,11 +36,11 @@ spv.ext.RayGenShader.rgen
|
|||
Decorate 38(block) Block
|
||||
Decorate 40 DescriptorSet 0
|
||||
Decorate 40 Binding 3
|
||||
Decorate 51(accEXT1) DescriptorSet 0
|
||||
Decorate 51(accEXT1) Binding 1
|
||||
Decorate 54(imageu) DescriptorSet 0
|
||||
Decorate 54(imageu) Binding 2
|
||||
Decorate 57(payload) Location 0
|
||||
Decorate 53(payload) Location 1
|
||||
Decorate 54(accEXT1) DescriptorSet 0
|
||||
Decorate 54(accEXT1) Binding 1
|
||||
Decorate 57(imageu) DescriptorSet 0
|
||||
Decorate 57(imageu) Binding 2
|
||||
2: TypeVoid
|
||||
3: TypeFunction 2
|
||||
6: TypeInt 32 0
|
||||
|
|
@ -67,13 +67,13 @@ spv.ext.RayGenShader.rgen
|
|||
46: 36(float) Constant 1056964608
|
||||
47: 41(int) Constant 0
|
||||
50: 36(float) Constant 1061158912
|
||||
51(accEXT1): 28(ptr) Variable UniformConstant
|
||||
52: TypeImage 6(int) 2D nonsampled format:R32ui
|
||||
53: TypePointer UniformConstant 52
|
||||
54(imageu): 53(ptr) Variable UniformConstant
|
||||
55: TypeVector 36(float) 4
|
||||
56: TypePointer RayPayloadKHR 55(fvec4)
|
||||
57(payload): 56(ptr) Variable RayPayloadKHR
|
||||
51: TypeVector 36(float) 4
|
||||
52: TypePointer RayPayloadKHR 51(fvec4)
|
||||
53(payload): 52(ptr) Variable RayPayloadKHR
|
||||
54(accEXT1): 28(ptr) Variable UniformConstant
|
||||
55: TypeImage 6(int) 2D nonsampled format:R32ui
|
||||
56: TypePointer UniformConstant 55
|
||||
57(imageu): 56(ptr) Variable UniformConstant
|
||||
4(main): 2 Function None 3
|
||||
5: Label
|
||||
8(lx): 7(ptr) Variable Function
|
||||
|
|
@ -101,6 +101,6 @@ spv.ext.RayGenShader.rgen
|
|||
45: 37(fvec3) Load 44
|
||||
48: 43(ptr) AccessChain 40 47
|
||||
49: 37(fvec3) Load 48
|
||||
TraceRayKHR 30 31 32 33 34 35 45 46 49 50 42
|
||||
TraceRayKHR 30 31 32 33 34 35 45 46 49 50 53(payload)
|
||||
Return
|
||||
FunctionEnd
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue