spirv-val: Update VUIDs for 308 header (#5990)
diff --git a/source/val/validate_decorations.cpp b/source/val/validate_decorations.cpp index 256bf0f..fdbc151 100644 --- a/source/val/validate_decorations.cpp +++ b/source/val/validate_decorations.cpp
@@ -1916,7 +1916,7 @@ if (!vstate.IsIntScalarOrVectorType(type_id) && !vstate.IsFloatScalarOrVectorType(type_id)) { return vstate.diag(SPV_ERROR_INVALID_ID, &inst) - << vstate.VkErrorID(4924) + << vstate.VkErrorID(10583) << "Component decoration specified for type " << vstate.getIdName(type_id) << " that is not a scalar or vector"; }
diff --git a/source/val/validation_state.cpp b/source/val/validation_state.cpp index 4604d6d..e7b077b 100644 --- a/source/val/validation_state.cpp +++ b/source/val/validation_state.cpp
@@ -2415,8 +2415,6 @@ return VUID_WRAP(VUID-StandaloneSpirv-Component-04922); case 4923: return VUID_WRAP(VUID-StandaloneSpirv-Component-04923); - case 4924: - return VUID_WRAP(VUID-StandaloneSpirv-Component-04924); case 6201: return VUID_WRAP(VUID-StandaloneSpirv-Flat-06201); case 6202: @@ -2534,6 +2532,8 @@ case 10213: // This use to be a standalone, but maintenance8 will set allow_offset_texture_operand now return VUID_WRAP(VUID-RuntimeSpirv-Offset-10213); + case 10583: + return VUID_WRAP(VUID-StandaloneSpirv-Component-10583); default: return ""; // unknown id }
diff --git a/test/val/val_decoration_test.cpp b/test/val/val_decoration_test.cpp index a15558b..84e9021 100644 --- a/test/val/val_decoration_test.cpp +++ b/test/val/val_decoration_test.cpp
@@ -7076,7 +7076,7 @@ CompileSuccessfully(spirv, env); EXPECT_EQ(SPV_ERROR_INVALID_ID, ValidateAndRetrieveValidationState(env)); EXPECT_THAT(getDiagnosticString(), - AnyVUID("VUID-StandaloneSpirv-Component-04924")); + AnyVUID("VUID-StandaloneSpirv-Component-10583")); EXPECT_THAT(getDiagnosticString(), HasSubstr("Component decoration specified for type")); EXPECT_THAT(getDiagnosticString(), HasSubstr("is not a scalar or vector"));