change *_USER_DEFINE_TYPE to *_USER_DEFINED_TYPE

include/dxc/dxcapi.internal.h

@@ -84,7 +84,7 @@ enum LEGAL_INTRINSIC_COMPTYPES {
 
   LICOMPTYPE_RAYDESC = 30,
   LICOMPTYPE_ACCELERATION_STRUCT = 31,
-  LICOMPTYPE_USER_DEFINE_TYPE = 32,
+  LICOMPTYPE_USER_DEFINED_TYPE = 32,
 
   LICOMPTYPE_COUNT = 33
 };

tools/clang/include/clang/Basic/DiagnosticSemaKinds.td

@@ -7661,7 +7661,7 @@ def err_hlsl_intrinsic_template_arg_requires_2018: Error<
 def err_hlsl_intrinsic_template_arg_scalar_vector_16: Error<
    "Explicit template arguments on intrinsic %0 are limited one to scalar or vector type up to 16 bytes in size.">;
 }
-def err_hlsl_no_struct_user_define_type: Error<
+def err_hlsl_no_struct_user_defined_type: Error<
    "User define type intrinsic arg must be struct">;
 def err_hlsl_missing_maxvertexcount_attr: Error<
    "GS entry point must have the maxvertexcount attribute">;

tools/clang/lib/Sema/SemaHLSL.cpp

@@ -182,7 +182,7 @@ enum ArBasicKind {
 
   AR_OBJECT_RAY_DESC,
   AR_OBJECT_ACCELARATION_STRUCT,
-  AR_OBJECT_USER_DEFINE_TYPE,
+  AR_OBJECT_USER_DEFINED_TYPE,
 
   AR_BASIC_MAXIMUM_COUNT
 };
@@ -444,7 +444,7 @@ const UINT g_uBasicKindProps[] =
 
   LICOMPTYPE_RAYDESC,               // AR_OBJECT_WAVE
   LICOMPTYPE_ACCELERATION_STRUCT,   // AR_OBJECT_WAVE
-  LICOMPTYPE_USER_DEFINE_TYPE,      // AR_OBJECT_WAVE
+  LICOMPTYPE_USER_DEFINED_TYPE,      // AR_OBJECT_WAVE
   // AR_BASIC_MAXIMUM_COUNT
 };
 
@@ -1080,7 +1080,7 @@ static const ArBasicKind g_AccelarationStructCT[] =
 
 static const ArBasicKind g_UDTCT[] =
 {
-  AR_OBJECT_USER_DEFINE_TYPE,
+  AR_OBJECT_USER_DEFINED_TYPE,
   AR_BASIC_UNKNOWN
 };
 
@@ -1175,7 +1175,7 @@ const ArBasicKind* g_LegalIntrinsicCompTypes[] =
   g_Numeric16OnlyCT,    // LICOMPTYPE_NUMERIC16_ONLY
   g_RayDescCT,          // LICOMPTYPE_RAYDESC
   g_AccelarationStructCT,   // LICOMPTYPE_ACCELERATION_STRUCT,
-  g_UDTCT,              // LICOMPTYPE_USER_DEFINE_TYPE
+  g_UDTCT,              // LICOMPTYPE_USER_DEFINED_TYPE
 };
 C_ASSERT(ARRAYSIZE(g_LegalIntrinsicCompTypes) == LICOMPTYPE_COUNT);
 
@@ -5060,15 +5060,15 @@ bool HLSLExternalSource::MatchArguments(
     pIntrinsicArg = &pIntrinsic->pArgs[iArg];
     DXASSERT(pIntrinsicArg->uTemplateId != INTRIN_TEMPLATE_VARARGS, "no vararg support");
 
-    if (pIntrinsicArg->uLegalComponentTypes == LICOMPTYPE_USER_DEFINE_TYPE) {
+    if (pIntrinsicArg->uLegalComponentTypes == LICOMPTYPE_USER_DEFINED_TYPE) {
       DXASSERT(objectElement.isNull(), "");
       QualType Ty = pCallArg->getType();
-      // Must be user define type for LICOMPTYPE_USER_DEFINE_TYPE arg.
+      // Must be user define type for LICOMPTYPE_USER_DEFINED_TYPE arg.
       if (!Ty->isRecordType() ||
           hlsl::IsHLSLVecMatType(Ty) ||
           hlsl::IsHLSLResourceType(Ty)) {
         m_sema->Diag(pCallArg->getExprLoc(),
-                     diag::err_hlsl_no_struct_user_define_type);
+                     diag::err_hlsl_no_struct_user_defined_type);
         return false;
       }
       objectElement = Ty;
@@ -5237,7 +5237,7 @@ bool HLSLExternalSource::MatchArguments(
     if (pArgument->uTemplateId == INTRIN_TEMPLATE_FROM_TYPE) {
       continue; // Already verified that this is available.
     }
-    if (pArgument->uLegalComponentTypes == LICOMPTYPE_USER_DEFINE_TYPE) {
+    if (pArgument->uLegalComponentTypes == LICOMPTYPE_USER_DEFINED_TYPE) {
       continue;
     }
 
@@ -5366,7 +5366,7 @@ bool HLSLExternalSource::MatchArguments(
         }
         pNewType = objectElement;
       }
-    } else if (pArgument->uLegalComponentTypes == LICOMPTYPE_USER_DEFINE_TYPE) {
+    } else if (pArgument->uLegalComponentTypes == LICOMPTYPE_USER_DEFINED_TYPE) {
       if (objectElement.isNull()) {
         return false;
       }

tools/clang/lib/Sema/gen_intrin_main_tables_15.h

@@ -43,7 +43,7 @@ static const HLSL_INTRINSIC_ARGUMENT g_Intrinsics_Args4[] =
 {
     {"CallShader", 0, 0, LITEMPLATE_VOID, 0, LICOMPTYPE_VOID, 0, 0},
     {"ShaderIndex", AR_QUAL_IN, 1, LITEMPLATE_SCALAR, 1, LICOMPTYPE_UINT, 1, 1},
-    {"Parameter", AR_QUAL_IN | AR_QUAL_OUT, 2, LITEMPLATE_SCALAR, 2, LICOMPTYPE_USER_DEFINE_TYPE, 1, 1},
+    {"Parameter", AR_QUAL_IN | AR_QUAL_OUT, 2, LITEMPLATE_SCALAR, 2, LICOMPTYPE_USER_DEFINED_TYPE, 1, 1},
 };
 
 static const HLSL_INTRINSIC_ARGUMENT g_Intrinsics_Args5[] =
@@ -431,7 +431,7 @@ static const HLSL_INTRINSIC_ARGUMENT g_Intrinsics_Args60[] =
     {"ReportHit", AR_QUAL_OUT, 0, LITEMPLATE_SCALAR, 0, LICOMPTYPE_BOOL, 1, 1},
     {"THit", AR_QUAL_IN, 1, LITEMPLATE_SCALAR, 1, LICOMPTYPE_FLOAT, 1, 1},
     {"HitKind", AR_QUAL_IN, 2, LITEMPLATE_SCALAR, 2, LICOMPTYPE_UINT, 1, 1},
-    {"Attributes", AR_QUAL_IN, 3, LITEMPLATE_SCALAR, 3, LICOMPTYPE_USER_DEFINE_TYPE, 1, 1},
+    {"Attributes", AR_QUAL_IN, 3, LITEMPLATE_SCALAR, 3, LICOMPTYPE_USER_DEFINED_TYPE, 1, 1},
 };
 
 static const HLSL_INTRINSIC_ARGUMENT g_Intrinsics_Args61[] =
@@ -444,7 +444,7 @@ static const HLSL_INTRINSIC_ARGUMENT g_Intrinsics_Args61[] =
     {"MultiplierForGeometryContributionToHitGroupIndex", AR_QUAL_IN, 5, LITEMPLATE_SCALAR, 5, LICOMPTYPE_UINT, 1, 1},
     {"MissShaderIndex", AR_QUAL_IN, 6, LITEMPLATE_SCALAR, 6, LICOMPTYPE_UINT, 1, 1},
     {"Ray", AR_QUAL_IN, 7, LITEMPLATE_OBJECT, 7, LICOMPTYPE_RAYDESC, 1, 1},
-    {"Payload", AR_QUAL_IN | AR_QUAL_OUT, 8, LITEMPLATE_SCALAR, 8, LICOMPTYPE_USER_DEFINE_TYPE, 1, 1},
+    {"Payload", AR_QUAL_IN | AR_QUAL_OUT, 8, LITEMPLATE_SCALAR, 8, LICOMPTYPE_USER_DEFINED_TYPE, 1, 1},
 };
 
 static const HLSL_INTRINSIC_ARGUMENT g_Intrinsics_Args62[] =

utils/hct/hctdb.py

@@ -2097,7 +2097,7 @@ class db_hlsl(object):
             "sampler": "LICOMPTYPE_SAMPLER",
             "ray_desc" : "LICOMPTYPE_RAYDESC",
             "acceleration_struct" : "LICOMPTYPE_ACCELERATION_STRUCT",
-            "udt" : "LICOMPTYPE_USER_DEFINE_TYPE",
+            "udt" : "LICOMPTYPE_USER_DEFINED_TYPE",
             "void": "LICOMPTYPE_VOID",
             "string": "LICOMPTYPE_STRING",
             "wave": "LICOMPTYPE_WAVE"}