spirv-val: Label new VUID from 312 headers (#6079)

source/val/validate_decorations.cpp

diff --git a/source/val/validate_decorations.cpp b/source/val/validate_decorations.cpp
index a576525..37a5c68 100644
--- a/source/val/validate_decorations.cpp
+++ b/source/val/validate_decorations.cpp
@@ -2282,6 +2282,7 @@
     }
     if (fail_id != 0) {
       return vstate.diag(SPV_ERROR_INVALID_ID, &inst)
+             << vstate.VkErrorID(10684)
              << "Invalid explicit layout decorations on type for operand "
              << vstate.getIdName(fail_id);
     }

source/val/validation_state.cpp

diff --git a/source/val/validation_state.cpp b/source/val/validation_state.cpp
index 6c0f2db..db7e020 100644
--- a/source/val/validation_state.cpp
+++ b/source/val/validation_state.cpp
@@ -2538,6 +2538,8 @@
       return VUID_WRAP(VUID-RuntimeSpirv-Offset-10213);
     case 10583:
       return VUID_WRAP(VUID-StandaloneSpirv-Component-10583);
+    case 10684:
+      return VUID_WRAP(VUID-StandaloneSpirv-None-10684);
     default:
       return "";  // unknown id
   }

test/val/val_decoration_test.cpp

diff --git a/test/val/val_decoration_test.cpp b/test/val/val_decoration_test.cpp
index 51c16e1..22c4dba 100644
--- a/test/val/val_decoration_test.cpp
+++ b/test/val/val_decoration_test.cpp
@@ -10741,6 +10741,8 @@
 
   CompileSuccessfully(spirv, SPV_ENV_UNIVERSAL_1_5);
   EXPECT_EQ(SPV_ERROR_INVALID_ID, ValidateInstructions(SPV_ENV_VULKAN_1_3));
+  EXPECT_THAT(getDiagnosticString(),
+              AnyVUID("VUID-StandaloneSpirv-None-10684"));
   EXPECT_THAT(
       getDiagnosticString(),
       HasSubstr("Invalid explicit layout decorations on type for operand"));
@@ -10790,6 +10792,8 @@
 
   CompileSuccessfully(spirv, SPV_ENV_VULKAN_1_3);
   EXPECT_EQ(SPV_ERROR_INVALID_ID, ValidateInstructions(SPV_ENV_VULKAN_1_3));
+  EXPECT_THAT(getDiagnosticString(),
+              AnyVUID("VUID-StandaloneSpirv-None-10684"));
   EXPECT_THAT(
       getDiagnosticString(),
       HasSubstr("Invalid explicit layout decorations on type for operand"));
@@ -10843,6 +10847,8 @@
 
   CompileSuccessfully(spirv, SPV_ENV_VULKAN_1_0);
   EXPECT_EQ(SPV_ERROR_INVALID_ID, ValidateInstructions(SPV_ENV_VULKAN_1_0));
+  EXPECT_THAT(getDiagnosticString(),
+              AnyVUID("VUID-StandaloneSpirv-None-10684"));
   EXPECT_THAT(
       getDiagnosticString(),
       HasSubstr("Invalid explicit layout decorations on type for operand"));
@@ -10873,6 +10879,8 @@
 
   CompileSuccessfully(spirv, SPV_ENV_VULKAN_1_0);
   EXPECT_EQ(SPV_ERROR_INVALID_ID, ValidateInstructions(SPV_ENV_VULKAN_1_0));
+  EXPECT_THAT(getDiagnosticString(),
+              AnyVUID("VUID-StandaloneSpirv-None-10684"));
   EXPECT_THAT(
       getDiagnosticString(),
       HasSubstr("Invalid explicit layout decorations on type for operand"));
@@ -10901,6 +10909,8 @@
 
   CompileSuccessfully(spirv, SPV_ENV_VULKAN_1_3);
   EXPECT_EQ(SPV_ERROR_INVALID_ID, ValidateInstructions(SPV_ENV_VULKAN_1_3));
+  EXPECT_THAT(getDiagnosticString(),
+              AnyVUID("VUID-StandaloneSpirv-None-10684"));
   EXPECT_THAT(
       getDiagnosticString(),
       HasSubstr("Invalid explicit layout decorations on type for operand"));
@@ -10933,6 +10943,8 @@
 
   CompileSuccessfully(spirv, SPV_ENV_VULKAN_1_3);
   EXPECT_EQ(SPV_ERROR_INVALID_ID, ValidateInstructions(SPV_ENV_VULKAN_1_3));
+  EXPECT_THAT(getDiagnosticString(),
+              AnyVUID("VUID-StandaloneSpirv-None-10684"));
   EXPECT_THAT(
       getDiagnosticString(),
       HasSubstr("Invalid explicit layout decorations on type for operand"));
@@ -10959,6 +10971,8 @@
 
   CompileSuccessfully(spirv, SPV_ENV_VULKAN_1_0);
   EXPECT_EQ(SPV_ERROR_INVALID_ID, ValidateInstructions(SPV_ENV_VULKAN_1_0));
+  EXPECT_THAT(getDiagnosticString(),
+              AnyVUID("VUID-StandaloneSpirv-None-10684"));
   EXPECT_THAT(
       getDiagnosticString(),
       HasSubstr("Invalid explicit layout decorations on type for operand"));