Skip to content

Commit ffc45de

Browse files
alelenvalelenv
committed
Address review feedback for inconsistencies wrt spec.
1 parent 5ec26ce commit ffc45de

File tree

1 file changed

+45
-45
lines changed

1 file changed

+45
-45
lines changed

‎include/spirv/unified1/spirv.core.grammar.json‎

Lines changed: 45 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -6382,7 +6382,7 @@
63826382
{ "kind" : "IdRef", "name" : "Hit Object" },
63836383
{ "kind" : "IdRef", "name" : "Ray Query" },
63846384
{ "kind" : "IdRef", "name" : "SBT Record Index" },
6385-
{ "kind" : "IdRef", "name" : "Hit Object Attribute" }
6385+
{ "kind" : "IdRef", "name" : "Hit Object Attributes" }
63866386
],
63876387
"capabilities" : [ "ShaderInvocationReorderEXT" ],
63886388
"version" : "None"
@@ -6394,11 +6394,11 @@
63946394
"operands" : [
63956395
{ "kind" : "IdRef", "name" : "Hit Object" },
63966396
{ "kind" : "IdRef", "name" : "Ray Flags" },
6397-
{ "kind" : "IdRef", "name" : "SBT Index" },
6398-
{ "kind" : "IdRef", "name" : "Origin" },
6399-
{ "kind" : "IdRef", "name" : "TMin" },
6400-
{ "kind" : "IdRef", "name" : "Direction" },
6401-
{ "kind" : "IdRef", "name" : "TMax" }
6397+
{ "kind" : "IdRef", "name" : "Miss Index" },
6398+
{ "kind" : "IdRef", "name" : "Ray Origin" },
6399+
{ "kind" : "IdRef", "name" : "Ray Tmin" },
6400+
{ "kind" : "IdRef", "name" : "Ray Direction" },
6401+
{ "kind" : "IdRef", "name" : "Ray Tmax" }
64026402
],
64036403
"capabilities" : [ "ShaderInvocationReorderEXT" ],
64046404
"version" : "None"
@@ -6410,11 +6410,11 @@
64106410
"operands" : [
64116411
{ "kind" : "IdRef", "name" : "Hit Object" },
64126412
{ "kind" : "IdRef", "name" : "Ray Flags" },
6413-
{ "kind" : "IdRef", "name" : "SBT Index" },
6414-
{ "kind" : "IdRef", "name" : "Origin" },
6415-
{ "kind" : "IdRef", "name" : "TMin" },
6416-
{ "kind" : "IdRef", "name" : "Direction" },
6417-
{ "kind" : "IdRef", "name" : "TMax" },
6413+
{ "kind" : "IdRef", "name" : "Miss Index" },
6414+
{ "kind" : "IdRef", "name" : "Ray Origin" },
6415+
{ "kind" : "IdRef", "name" : "Ray Tmin" },
6416+
{ "kind" : "IdRef", "name" : "Ray Direction" },
6417+
{ "kind" : "IdRef", "name" : "Ray Tmax" },
64186418
{ "kind" : "IdRef", "name" : "Current Time" }
64196419
],
64206420
"capabilities" : [ "ShaderInvocationReorderEXT", "RayTracingMotionBlurNV" ],
@@ -6475,15 +6475,15 @@
64756475
"operands" : [
64766476
{ "kind" : "IdRef", "name" : "Hit Object" },
64776477
{ "kind" : "IdRef", "name" : "Acceleration Structure"},
6478-
{ "kind" : "IdRef", "name" : "RayFlags"},
6479-
{ "kind" : "IdRef", "name" : "Cullmask"},
6480-
{ "kind" : "IdRef", "name" : "SBT Record Offset"},
6481-
{ "kind" : "IdRef", "name" : "SBT Record Stride"},
6478+
{ "kind" : "IdRef", "name" : "Ray Flags"},
6479+
{ "kind" : "IdRef", "name" : "Cull Mask"},
6480+
{ "kind" : "IdRef", "name" : "SBT Offset"},
6481+
{ "kind" : "IdRef", "name" : "SBT Stride"},
64826482
{ "kind" : "IdRef", "name" : "Miss Index"},
6483-
{ "kind" : "IdRef", "name" : "Origin"},
6484-
{ "kind" : "IdRef", "name" : "TMin"},
6485-
{ "kind" : "IdRef", "name" : "Direction"},
6486-
{ "kind" : "IdRef", "name" : "TMax"},
6483+
{ "kind" : "IdRef", "name" : "Ray Origin"},
6484+
{ "kind" : "IdRef", "name" : "Ray Tmin"},
6485+
{ "kind" : "IdRef", "name" : "Ray Direction"},
6486+
{ "kind" : "IdRef", "name" : "Ray Tmax"},
64876487
{ "kind" : "IdRef", "name" : "Payload"},
64886488
{ "kind" : "IdRef", "quantifier" : "?", "name" : "Hint" },
64896489
{ "kind" : "IdRef", "quantifier" : "?", "name" : "Bits" }
@@ -6498,16 +6498,16 @@
64986498
"operands" : [
64996499
{ "kind" : "IdRef", "name" : "Hit Object" },
65006500
{ "kind" : "IdRef", "name" : "Acceleration Structure"},
6501-
{ "kind" : "IdRef", "name" : "RayFlags"},
6502-
{ "kind" : "IdRef", "name" : "Cullmask"},
6503-
{ "kind" : "IdRef", "name" : "SBT Record Offset"},
6504-
{ "kind" : "IdRef", "name" : "SBT Record Stride"},
6501+
{ "kind" : "IdRef", "name" : "Ray Flags"},
6502+
{ "kind" : "IdRef", "name" : "Cull Mask"},
6503+
{ "kind" : "IdRef", "name" : "SBT Offset"},
6504+
{ "kind" : "IdRef", "name" : "SBT Stride"},
65056505
{ "kind" : "IdRef", "name" : "Miss Index"},
6506-
{ "kind" : "IdRef", "name" : "Origin"},
6507-
{ "kind" : "IdRef", "name" : "TMin"},
6508-
{ "kind" : "IdRef", "name" : "Direction"},
6509-
{ "kind" : "IdRef", "name" : "TMax"},
6510-
{ "kind" : "IdRef", "name" : "Time"},
6506+
{ "kind" : "IdRef", "name" : "Ray Origin"},
6507+
{ "kind" : "IdRef", "name" : "Ray Tmin"},
6508+
{ "kind" : "IdRef", "name" : "Ray Direction"},
6509+
{ "kind" : "IdRef", "name" : "Ray Tmax"},
6510+
{ "kind" : "IdRef", "name" : "Current Time"},
65116511
{ "kind" : "IdRef", "name" : "Payload"},
65126512
{ "kind" : "IdRef", "quantifier" : "?", "name" : "Hint" },
65136513
{ "kind" : "IdRef", "quantifier" : "?", "name" : "Bits" }
@@ -6555,15 +6555,15 @@
65556555
"operands" : [
65566556
{ "kind" : "IdRef", "name" : "Hit Object" },
65576557
{ "kind" : "IdRef", "name" : "Acceleration Structure"},
6558-
{ "kind" : "IdRef", "name" : "RayFlags"},
6559-
{ "kind" : "IdRef", "name" : "Cullmask"},
6560-
{ "kind" : "IdRef", "name" : "SBT Record Offset"},
6561-
{ "kind" : "IdRef", "name" : "SBT Record Stride"},
6558+
{ "kind" : "IdRef", "name" : "Ray Flags"},
6559+
{ "kind" : "IdRef", "name" : "Cull Mask"},
6560+
{ "kind" : "IdRef", "name" : "SBT Offset"},
6561+
{ "kind" : "IdRef", "name" : "SBT Stride"},
65626562
{ "kind" : "IdRef", "name" : "Miss Index"},
6563-
{ "kind" : "IdRef", "name" : "Origin"},
6564-
{ "kind" : "IdRef", "name" : "TMin"},
6565-
{ "kind" : "IdRef", "name" : "Direction"},
6566-
{ "kind" : "IdRef", "name" : "TMax"},
6563+
{ "kind" : "IdRef", "name" : "Ray Origin"},
6564+
{ "kind" : "IdRef", "name" : "Ray Tmin"},
6565+
{ "kind" : "IdRef", "name" : "Ray Direction"},
6566+
{ "kind" : "IdRef", "name" : "Ray Tmax"},
65676567
{ "kind" : "IdRef", "name" : "Payload"}
65686568
],
65696569
"capabilities" : [ "ShaderInvocationReorderEXT" ],
@@ -6576,16 +6576,16 @@
65766576
"operands" : [
65776577
{ "kind" : "IdRef", "name" : "Hit Object" },
65786578
{ "kind" : "IdRef", "name" : "Acceleration Structure"},
6579-
{ "kind" : "IdRef", "name" : "RayFlags"},
6580-
{ "kind" : "IdRef", "name" : "Cullmask"},
6581-
{ "kind" : "IdRef", "name" : "SBT Record Offset"},
6582-
{ "kind" : "IdRef", "name" : "SBT Record Stride"},
6579+
{ "kind" : "IdRef", "name" : "Ray Flags"},
6580+
{ "kind" : "IdRef", "name" : "Cull Mask"},
6581+
{ "kind" : "IdRef", "name" : "SBT Offset"},
6582+
{ "kind" : "IdRef", "name" : "SBT Stride"},
65836583
{ "kind" : "IdRef", "name" : "Miss Index"},
6584-
{ "kind" : "IdRef", "name" : "Origin"},
6585-
{ "kind" : "IdRef", "name" : "TMin"},
6586-
{ "kind" : "IdRef", "name" : "Direction"},
6587-
{ "kind" : "IdRef", "name" : "TMax"},
6588-
{ "kind" : "IdRef", "name" : "Time"},
6584+
{ "kind" : "IdRef", "name" : "Ray Origin"},
6585+
{ "kind" : "IdRef", "name" : "Ray Tmin"},
6586+
{ "kind" : "IdRef", "name" : "Ray Direction"},
6587+
{ "kind" : "IdRef", "name" : "Ray Tmax"},
6588+
{ "kind" : "IdRef", "name" : "Current Time"},
65896589
{ "kind" : "IdRef", "name" : "Payload"}
65906590
],
65916591
"capabilities" : [ "ShaderInvocationReorderEXT", "RayTracingMotionBlurNV" ],

0 commit comments

Comments
 (0)