Skip to content

Commit 93ab3ba

Browse files
committed
Update generated files
1 parent 836012d commit 93ab3ba

2 files changed

Lines changed: 18 additions & 21 deletions

File tree

include/dxc/DXIL/DxilConstants.h

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -893,7 +893,12 @@ enum class OpCode : unsigned {
893893
// operation with a mipmap-level offset
894894

895895
// Shader Execution Reordering
896-
HitObject_Attributes = 289, // Returns the attributes set for this HitObject
896+
HitObject_Attributes = 289, // Returns the attributes set for this HitObject
897+
HitObject_FromRayQuery = 263, // Creates a new HitObject representing a
898+
// committed hit from a RayQuery
899+
HitObject_FromRayQueryWithAttrs =
900+
264, // Creates a new HitObject representing a committed hit from a
901+
// RayQuery and committed attributes
897902
HitObject_GeometryIndex = 281, // Returns the geometry index committed on hit
898903
HitObject_HitKind = 285, // Returns the HitKind of the hit
899904
HitObject_InstanceID = 283, // Returns the instance id committed on hit
@@ -903,11 +908,6 @@ enum class OpCode : unsigned {
903908
HitObject_IsNop = 271, // Returns `true` if the HitObject represents a nop
904909
HitObject_LoadLocalRootTableConstant =
905910
288, // Returns the root table constant for this HitObject and offset
906-
HitObject_FromRayQuery = 263, // Creates a new HitObject representing a
907-
// committed hit from a RayQuery
908-
HitObject_FromRayQueryWithAttrs =
909-
264, // Creates a new HitObject representing a committed hit from a
910-
// RayQuery and committed attributes
911911
HitObject_MakeMiss = 265, // Creates a new HitObject representing a miss
912912
HitObject_MakeNop = 266, // Creates an empty nop HitObject
913913
HitObject_ObjectRayDirection =
@@ -1306,9 +1306,9 @@ enum class OpCodeClass : unsigned {
13061306

13071307
// Shader Execution Reordering
13081308
HitObject_Attributes,
1309-
HitObject_LoadLocalRootTableConstant,
13101309
HitObject_FromRayQuery,
13111310
HitObject_FromRayQueryWithAttrs,
1311+
HitObject_LoadLocalRootTableConstant,
13121312
HitObject_MakeMiss,
13131313
HitObject_MakeNop,
13141314
HitObject_SetShaderTableIndex,

lib/DXIL/DxilOperations.cpp

Lines changed: 11 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -3449,22 +3449,19 @@ void OP::GetMinShaderModelAndMask(OpCode C, bool bWithTranslation,
34493449
minor = 9;
34503450
return;
34513451
}
3452-
// Instructions: HitObject_MakeMiss=265, HitObject_MakeNop=266,
3453-
// HitObject_IsMiss=269, HitObject_IsHit=270, HitObject_IsNop=271,
3454-
// HitObject_RayFlags=272, HitObject_RayTMin=273, HitObject_RayTCurrent=274,
3455-
// HitObject_WorldRayOrigin=275, HitObject_WorldRayDirection=276,
3456-
// HitObject_ObjectRayOrigin=277, HitObject_ObjectRayDirection=278,
3457-
// HitObject_ObjectToWorld3x4=279, HitObject_WorldToObject3x4=280,
3458-
// HitObject_GeometryIndex=281, HitObject_InstanceIndex=282,
3459-
// HitObject_InstanceID=283, HitObject_PrimitiveIndex=284,
3460-
// HitObject_HitKind=285, HitObject_ShaderTableIndex=286,
3461-
// HitObject_SetShaderTableIndex=287,
3462-
// HitObject_LoadLocalRootTableConstant=288, HitObject_Attributes=289
3463-
if ((265 <= op && op <= 266) || (269 <= op && op <= 289)) {
34643452
// Instructions: HitObject_FromRayQuery=263,
34653453
// HitObject_FromRayQueryWithAttrs=264, HitObject_MakeMiss=265,
3466-
// HitObject_MakeNop=266
3467-
if ((263 <= op && op <= 266)) {
3454+
// HitObject_MakeNop=266, HitObject_IsMiss=269, HitObject_IsHit=270,
3455+
// HitObject_IsNop=271, HitObject_RayFlags=272, HitObject_RayTMin=273,
3456+
// HitObject_RayTCurrent=274, HitObject_WorldRayOrigin=275,
3457+
// HitObject_WorldRayDirection=276, HitObject_ObjectRayOrigin=277,
3458+
// HitObject_ObjectRayDirection=278, HitObject_ObjectToWorld3x4=279,
3459+
// HitObject_WorldToObject3x4=280, HitObject_GeometryIndex=281,
3460+
// HitObject_InstanceIndex=282, HitObject_InstanceID=283,
3461+
// HitObject_PrimitiveIndex=284, HitObject_HitKind=285,
3462+
// HitObject_ShaderTableIndex=286, HitObject_SetShaderTableIndex=287,
3463+
// HitObject_LoadLocalRootTableConstant=288, HitObject_Attributes=289
3464+
if ((263 <= op && op <= 266) || (269 <= op && op <= 289)) {
34683465
major = 6;
34693466
minor = 9;
34703467
mask =

0 commit comments

Comments
 (0)