mewin/glslang
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Updates for final Vulkan ray tracing extensions (#2466)

Browse Source 
* 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:
Daniel Koch
2020-11-23 15:41:27 -05:00
committed by GitHub
parent 7f6559d280
commit ffccefddfd
76 changed files with 4951 additions and 3663 deletions
Download Patch File Download Diff File Expand all files Collapse all files

76
Test/baseResults/rayQuery-global.rgen.out Normal file
View File

@@ -0,0 +1,76 @@
rayQuery-global.rgen
// Module Version 10000
// Generated by (magic number): 8000a
// Id's are bound by 44
Capability RayQueryKHR
Capability RayTracingKHR
Extension "SPV_KHR_ray_query"
Extension "SPV_KHR_ray_tracing"
1: ExtInstImport "GLSL.std.450"
MemoryModel Logical GLSL450
EntryPoint RayGenerationKHR 4 "main"
Source GLSL 460
SourceExtension "GL_EXT_ray_flags_primitive_culling"
SourceExtension "GL_EXT_ray_query"
Name 4 "main"
Name 10 "otherWrapper(rq1;"
Name 9 "rq"
Name 13 "wrapper(rq1;"
Name 12 "rq"
Name 17 "rqGlobal"
Name 22 "rq2"
Name 27 "rtas"
Name 40 "rq2"
Decorate 27(rtas) DescriptorSet 0
Decorate 27(rtas) Binding 1
2: TypeVoid
3: TypeFunction 2
6: TypeRayQueryProvisionalKHR
7: TypePointer Private 6
8: TypeFunction 2 7(ptr)
15: TypeBool
17(rqGlobal): 7(ptr) Variable Private
22(rq2): 7(ptr) Variable Private
25: TypeAccelerationStructureKHR
26: TypePointer UniformConstant 25
27(rtas): 26(ptr) Variable UniformConstant
29: TypeInt 32 0
30: 29(int) Constant 0
31: 29(int) Constant 255
32: TypeFloat 32
33: TypeVector 32(float) 3
34: 32(float) Constant 0
35: 33(fvec3) ConstantComposite 34 34 34
36: 32(float) Constant 1065353216
37: 33(fvec3) ConstantComposite 36 34 34
40(rq2): 7(ptr) Variable Private
4(main): 2 Function None 3
5: Label
28: 25 Load 27(rtas)
RayQueryInitializeKHR 17(rqGlobal) 28 30 31 35 34 37 36
38: 2 FunctionCall 13(wrapper(rq1;) 17(rqGlobal)
39: 2 FunctionCall 10(otherWrapper(rq1;) 17(rqGlobal)
41: 25 Load 27(rtas)
RayQueryInitializeKHR 40(rq2) 41 30 31 35 34 37 36
42: 2 FunctionCall 13(wrapper(rq1;) 40(rq2)
43: 2 FunctionCall 10(otherWrapper(rq1;) 40(rq2)
Return
FunctionEnd
10(otherWrapper(rq1;): 2 Function None 8
9(rq): 7(ptr) FunctionParameter
11: Label
16: 15(bool) RayQueryProceedKHR 9(rq)
18: 15(bool) RayQueryProceedKHR 17(rqGlobal)
Return
FunctionEnd
13(wrapper(rq1;): 2 Function None 8
12(rq): 7(ptr) FunctionParameter
14: Label
19: 15(bool) RayQueryProceedKHR 12(rq)
20: 15(bool) RayQueryProceedKHR 17(rqGlobal)
21: 2 FunctionCall 10(otherWrapper(rq1;) 12(rq)
23: 2 FunctionCall 10(otherWrapper(rq1;) 22(rq2)
24: 2 FunctionCall 10(otherWrapper(rq1;) 17(rqGlobal)
Return
FunctionEnd