Make gl_HitT proper aliases of gl_RayTmax
Changes the gl_HitT builtins properly alias their gl_RayTmax. Previously they ended up as duplicate variables, rather than aliased.
This commit is contained in:
Max Andersson
arcady-lunarg
parent
7c3c50ea94
commit
1cad045cc2
9 changed files with 303 additions and 327 deletions
|
|
@ -1,7 +1,7 @@
|
|||
spv.ext.ClosestHitShader.rchit
|
||||
// Module Version 10400
|
||||
// Generated by (magic number): 8000b
|
||||
// Id's are bound by 109
|
||||
// Id's are bound by 108
|
||||
|
||||
Capability RayTracingKHR
|
||||
Capability RayTracingPositionFetchKHR
|
||||
|
|
@ -11,7 +11,7 @@ spv.ext.ClosestHitShader.rchit
|
|||
Extension "SPV_KHR_ray_tracing_position_fetch"
|
||||
1: ExtInstImport "GLSL.std.450"
|
||||
MemoryModel Logical GLSL450
|
||||
EntryPoint ClosestHitKHR 4 "main" 11 14 20 23 26 33 36 39 42 47 50 53 58 64 67 70 82 88 94 106 108
|
||||
EntryPoint ClosestHitKHR 4 "main" 11 14 20 23 26 33 36 39 42 47 50 57 63 66 69 81 87 93 105 107
|
||||
Source GLSL 460
|
||||
SourceExtension "GL_EXT_ray_cull_mask"
|
||||
SourceExtension "GL_EXT_ray_tracing"
|
||||
|
|
@ -40,24 +40,23 @@ spv.ext.ClosestHitShader.rchit
|
|||
Name 49 "v10"
|
||||
Name 50 "gl_RayTmaxEXT"
|
||||
Name 52 "v11"
|
||||
Name 53 "gl_HitTEXT"
|
||||
Name 56 "v12"
|
||||
Name 58 "gl_HitKindEXT"
|
||||
Name 62 "v13"
|
||||
Name 64 "gl_ObjectToWorldEXT"
|
||||
Name 66 "v14"
|
||||
Name 67 "gl_WorldToObjectEXT"
|
||||
Name 69 "v15"
|
||||
Name 70 "gl_GeometryIndexEXT"
|
||||
Name 75 "v16"
|
||||
Name 78 "v17"
|
||||
Name 81 "v18"
|
||||
Name 82 "gl_CullMaskEXT"
|
||||
Name 84 "v19"
|
||||
Name 88 "gl_HitTriangleVertexPositionsEXT"
|
||||
Name 94 "accEXT"
|
||||
Name 106 "incomingPayload"
|
||||
Name 108 "localPayload"
|
||||
Name 55 "v12"
|
||||
Name 57 "gl_HitKindEXT"
|
||||
Name 61 "v13"
|
||||
Name 63 "gl_ObjectToWorldEXT"
|
||||
Name 65 "v14"
|
||||
Name 66 "gl_WorldToObjectEXT"
|
||||
Name 68 "v15"
|
||||
Name 69 "gl_GeometryIndexEXT"
|
||||
Name 74 "v16"
|
||||
Name 77 "v17"
|
||||
Name 80 "v18"
|
||||
Name 81 "gl_CullMaskEXT"
|
||||
Name 83 "v19"
|
||||
Name 87 "gl_HitTriangleVertexPositionsEXT"
|
||||
Name 93 "accEXT"
|
||||
Name 105 "incomingPayload"
|
||||
Name 107 "localPayload"
|
||||
Decorate 11(gl_LaunchIDEXT) BuiltIn LaunchIdKHR
|
||||
Decorate 14(gl_LaunchSizeEXT) BuiltIn LaunchSizeKHR
|
||||
Decorate 20(gl_PrimitiveID) BuiltIn PrimitiveId
|
||||
|
|
@ -69,15 +68,14 @@ spv.ext.ClosestHitShader.rchit
|
|||
Decorate 42(gl_ObjectRayDirectionEXT) BuiltIn ObjectRayDirectionKHR
|
||||
Decorate 47(gl_RayTminEXT) BuiltIn RayTminKHR
|
||||
Decorate 50(gl_RayTmaxEXT) BuiltIn RayTmaxKHR
|
||||
Decorate 53(gl_HitTEXT) BuiltIn RayTmaxKHR
|
||||
Decorate 58(gl_HitKindEXT) BuiltIn HitKindKHR
|
||||
Decorate 64(gl_ObjectToWorldEXT) BuiltIn ObjectToWorldKHR
|
||||
Decorate 67(gl_WorldToObjectEXT) BuiltIn WorldToObjectKHR
|
||||
Decorate 70(gl_GeometryIndexEXT) BuiltIn RayGeometryIndexKHR
|
||||
Decorate 82(gl_CullMaskEXT) BuiltIn CullMaskKHR
|
||||
Decorate 88(gl_HitTriangleVertexPositionsEXT) BuiltIn HitTriangleVertexPositionsKHR
|
||||
Decorate 94(accEXT) DescriptorSet 0
|
||||
Decorate 94(accEXT) Binding 0
|
||||
Decorate 57(gl_HitKindEXT) BuiltIn HitKindKHR
|
||||
Decorate 63(gl_ObjectToWorldEXT) BuiltIn ObjectToWorldKHR
|
||||
Decorate 66(gl_WorldToObjectEXT) BuiltIn WorldToObjectKHR
|
||||
Decorate 69(gl_GeometryIndexEXT) BuiltIn RayGeometryIndexKHR
|
||||
Decorate 81(gl_CullMaskEXT) BuiltIn CullMaskKHR
|
||||
Decorate 87(gl_HitTriangleVertexPositionsEXT) BuiltIn HitTriangleVertexPositionsKHR
|
||||
Decorate 93(accEXT) DescriptorSet 0
|
||||
Decorate 93(accEXT) Binding 0
|
||||
2: TypeVoid
|
||||
3: TypeFunction 2
|
||||
6: TypeInt 32 0
|
||||
|
|
@ -104,41 +102,40 @@ spv.ext.ClosestHitShader.rchit
|
|||
46: TypePointer Input 28(float)
|
||||
47(gl_RayTminEXT): 46(ptr) Variable Input
|
||||
50(gl_RayTmaxEXT): 46(ptr) Variable Input
|
||||
53(gl_HitTEXT): 46(ptr) Variable Input
|
||||
55: TypePointer Function 6(int)
|
||||
57: TypePointer Input 6(int)
|
||||
58(gl_HitKindEXT): 57(ptr) Variable Input
|
||||
60: TypeMatrix 29(fvec3) 4
|
||||
61: TypePointer Function 60
|
||||
63: TypePointer Input 60
|
||||
64(gl_ObjectToWorldEXT): 63(ptr) Variable Input
|
||||
67(gl_WorldToObjectEXT): 63(ptr) Variable Input
|
||||
70(gl_GeometryIndexEXT): 19(ptr) Variable Input
|
||||
72: TypeVector 28(float) 4
|
||||
73: TypeMatrix 72(fvec4) 3
|
||||
74: TypePointer Function 73
|
||||
82(gl_CullMaskEXT): 57(ptr) Variable Input
|
||||
85: 6(int) Constant 3
|
||||
86: TypeArray 29(fvec3) 85
|
||||
87: TypePointer Input 86
|
||||
88(gl_HitTriangleVertexPositionsEXT): 87(ptr) Variable Input
|
||||
89: 16(int) Constant 0
|
||||
92: TypeAccelerationStructureKHR
|
||||
93: TypePointer UniformConstant 92
|
||||
94(accEXT): 93(ptr) Variable UniformConstant
|
||||
96: 6(int) Constant 0
|
||||
97: 6(int) Constant 1
|
||||
98: 6(int) Constant 2
|
||||
99: 28(float) Constant 1056964608
|
||||
100: 29(fvec3) ConstantComposite 99 99 99
|
||||
101: 28(float) Constant 1065353216
|
||||
102: 29(fvec3) ConstantComposite 101 101 101
|
||||
103: 28(float) Constant 1061158912
|
||||
104: 16(int) Constant 1
|
||||
105: TypePointer IncomingRayPayloadKHR 72(fvec4)
|
||||
106(incomingPayload): 105(ptr) Variable IncomingRayPayloadKHR
|
||||
107: TypePointer RayPayloadKHR 72(fvec4)
|
||||
108(localPayload): 107(ptr) Variable RayPayloadKHR
|
||||
54: TypePointer Function 6(int)
|
||||
56: TypePointer Input 6(int)
|
||||
57(gl_HitKindEXT): 56(ptr) Variable Input
|
||||
59: TypeMatrix 29(fvec3) 4
|
||||
60: TypePointer Function 59
|
||||
62: TypePointer Input 59
|
||||
63(gl_ObjectToWorldEXT): 62(ptr) Variable Input
|
||||
66(gl_WorldToObjectEXT): 62(ptr) Variable Input
|
||||
69(gl_GeometryIndexEXT): 19(ptr) Variable Input
|
||||
71: TypeVector 28(float) 4
|
||||
72: TypeMatrix 71(fvec4) 3
|
||||
73: TypePointer Function 72
|
||||
81(gl_CullMaskEXT): 56(ptr) Variable Input
|
||||
84: 6(int) Constant 3
|
||||
85: TypeArray 29(fvec3) 84
|
||||
86: TypePointer Input 85
|
||||
87(gl_HitTriangleVertexPositionsEXT): 86(ptr) Variable Input
|
||||
88: 16(int) Constant 0
|
||||
91: TypeAccelerationStructureKHR
|
||||
92: TypePointer UniformConstant 91
|
||||
93(accEXT): 92(ptr) Variable UniformConstant
|
||||
95: 6(int) Constant 0
|
||||
96: 6(int) Constant 1
|
||||
97: 6(int) Constant 2
|
||||
98: 28(float) Constant 1056964608
|
||||
99: 29(fvec3) ConstantComposite 98 98 98
|
||||
100: 28(float) Constant 1065353216
|
||||
101: 29(fvec3) ConstantComposite 100 100 100
|
||||
102: 28(float) Constant 1061158912
|
||||
103: 16(int) Constant 1
|
||||
104: TypePointer IncomingRayPayloadKHR 71(fvec4)
|
||||
105(incomingPayload): 104(ptr) Variable IncomingRayPayloadKHR
|
||||
106: TypePointer RayPayloadKHR 71(fvec4)
|
||||
107(localPayload): 106(ptr) Variable RayPayloadKHR
|
||||
4(main): 2 Function None 3
|
||||
5: Label
|
||||
9(v0): 8(ptr) Variable Function
|
||||
|
|
@ -153,14 +150,14 @@ spv.ext.ClosestHitShader.rchit
|
|||
45(v9): 44(ptr) Variable Function
|
||||
49(v10): 44(ptr) Variable Function
|
||||
52(v11): 44(ptr) Variable Function
|
||||
56(v12): 55(ptr) Variable Function
|
||||
62(v13): 61(ptr) Variable Function
|
||||
66(v14): 61(ptr) Variable Function
|
||||
69(v15): 17(ptr) Variable Function
|
||||
75(v16): 74(ptr) Variable Function
|
||||
78(v17): 74(ptr) Variable Function
|
||||
81(v18): 55(ptr) Variable Function
|
||||
84(v19): 30(ptr) Variable Function
|
||||
55(v12): 54(ptr) Variable Function
|
||||
61(v13): 60(ptr) Variable Function
|
||||
65(v14): 60(ptr) Variable Function
|
||||
68(v15): 17(ptr) Variable Function
|
||||
74(v16): 73(ptr) Variable Function
|
||||
77(v17): 73(ptr) Variable Function
|
||||
80(v18): 54(ptr) Variable Function
|
||||
83(v19): 30(ptr) Variable Function
|
||||
12: 7(ivec3) Load 11(gl_LaunchIDEXT)
|
||||
Store 9(v0) 12
|
||||
15: 7(ivec3) Load 14(gl_LaunchSizeEXT)
|
||||
|
|
@ -183,28 +180,28 @@ spv.ext.ClosestHitShader.rchit
|
|||
Store 45(v9) 48
|
||||
51: 28(float) Load 50(gl_RayTmaxEXT)
|
||||
Store 49(v10) 51
|
||||
54: 28(float) Load 53(gl_HitTEXT)
|
||||
Store 52(v11) 54
|
||||
59: 6(int) Load 58(gl_HitKindEXT)
|
||||
Store 56(v12) 59
|
||||
65: 60 Load 64(gl_ObjectToWorldEXT)
|
||||
Store 62(v13) 65
|
||||
68: 60 Load 67(gl_WorldToObjectEXT)
|
||||
Store 66(v14) 68
|
||||
71: 16(int) Load 70(gl_GeometryIndexEXT)
|
||||
Store 69(v15) 71
|
||||
76: 60 Load 64(gl_ObjectToWorldEXT)
|
||||
77: 73 Transpose 76
|
||||
Store 75(v16) 77
|
||||
79: 60 Load 67(gl_WorldToObjectEXT)
|
||||
80: 73 Transpose 79
|
||||
Store 78(v17) 80
|
||||
83: 6(int) Load 82(gl_CullMaskEXT)
|
||||
Store 81(v18) 83
|
||||
90: 32(ptr) AccessChain 88(gl_HitTriangleVertexPositionsEXT) 89
|
||||
91: 29(fvec3) Load 90
|
||||
Store 84(v19) 91
|
||||
95: 92 Load 94(accEXT)
|
||||
TraceRayKHR 95 96 97 98 85 96 100 99 102 103 106(incomingPayload)
|
||||
53: 28(float) Load 50(gl_RayTmaxEXT)
|
||||
Store 52(v11) 53
|
||||
58: 6(int) Load 57(gl_HitKindEXT)
|
||||
Store 55(v12) 58
|
||||
64: 59 Load 63(gl_ObjectToWorldEXT)
|
||||
Store 61(v13) 64
|
||||
67: 59 Load 66(gl_WorldToObjectEXT)
|
||||
Store 65(v14) 67
|
||||
70: 16(int) Load 69(gl_GeometryIndexEXT)
|
||||
Store 68(v15) 70
|
||||
75: 59 Load 63(gl_ObjectToWorldEXT)
|
||||
76: 72 Transpose 75
|
||||
Store 74(v16) 76
|
||||
78: 59 Load 66(gl_WorldToObjectEXT)
|
||||
79: 72 Transpose 78
|
||||
Store 77(v17) 79
|
||||
82: 6(int) Load 81(gl_CullMaskEXT)
|
||||
Store 80(v18) 82
|
||||
89: 32(ptr) AccessChain 87(gl_HitTriangleVertexPositionsEXT) 88
|
||||
90: 29(fvec3) Load 89
|
||||
Store 83(v19) 90
|
||||
94: 91 Load 93(accEXT)
|
||||
TraceRayKHR 94 95 96 97 84 95 99 98 101 102 105(incomingPayload)
|
||||
Return
|
||||
FunctionEnd
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue