spirv-val: Collapse ZeroExtend error message

KhronosGroup · Nov 4, 2023 · 03698f1 · 03698f1
1 parent 7895cbf
commit 03698f1
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 13 deletions.
diff --git a/source/val/validate_image.cpp b/source/val/validate_image.cpp
@@ -759,15 +759,10 @@ spv_result_t ValidateImageOperands(ValidationState_t& _,
     // void, and the Format is Unknown.
     // In Vulkan, the texel type is only known in all cases by the pipeline
     // setup.
-    if (!_.IsIntScalarOrVectorType(result_type)) {
-      return _.diag(SPV_ERROR_INVALID_DATA, inst)
-             << _.VkErrorID(4965)
-             << "Using SignExtend, but result type is not a scalar or vector "
-                "integer type.";
-    } else if (!_.IsUnsignedIntScalarOrVectorType(result_type)) {
+    if (!_.IsUnsignedIntScalarOrVectorType(result_type)) {
       return _.diag(SPV_ERROR_INVALID_DATA, inst)
              << _.VkErrorID(4965)
-             << "Using SignExtend, but result type is a signed integer type.";
+             << "Using ZeroExtend, but result type is a signed integer type.";
     }
   }
 

diff --git a/test/val/val_image_test.cpp b/test/val/val_image_test.cpp
@@ -5965,7 +5965,7 @@ TEST_F(ValidateImage, ZeroExtendScalarSIntTexelV14) {
             ValidateInstructions(SPV_ENV_UNIVERSAL_1_4));
   EXPECT_THAT(
       getDiagnosticString(),
-      HasSubstr("Using SignExtend, but result type is a signed integer type."));
+      HasSubstr("Using ZeroExtend, but result type is a signed integer type."));
 }
 
 TEST_F(ValidateImage, ZeroExtendScalarVectorUIntTexelV14Good) {
@@ -5996,7 +5996,7 @@ TEST_F(ValidateImage, ZeroExtendVectorSIntTexelV14) {
             ValidateInstructions(SPV_ENV_UNIVERSAL_1_4));
   EXPECT_THAT(
       getDiagnosticString(),
-      HasSubstr("Using SignExtend, but result type is a signed integer type."));
+      HasSubstr("Using ZeroExtend, but result type is a signed integer type."));
 }
 
 TEST_F(ValidateImage, ReadLodAMDSuccess1) {
@@ -8249,7 +8249,7 @@ TEST_F(ValidateImage, TypeImageVulkanStorageZeroExtendSigned) {
               AnyVUID("VUID-StandaloneSpirv-Image-04965"));
   EXPECT_THAT(
       getDiagnosticString(),
-      HasSubstr("Using SignExtend, but result type is a signed integer type"));
+      HasSubstr("Using ZeroExtend, but result type is a signed integer type"));
 }
 
 TEST_F(ValidateImage, TypeImageVulkanStorageZeroExtendRedundant) {
@@ -8327,9 +8327,9 @@ TEST_F(ValidateImage, TypeImageVulkanStorageZeroExtendFloat) {
   ASSERT_EQ(SPV_ERROR_INVALID_DATA, ValidateInstructions(SPV_ENV_VULKAN_1_2));
   EXPECT_THAT(getDiagnosticString(),
               AnyVUID("VUID-StandaloneSpirv-Image-04965"));
-  EXPECT_THAT(getDiagnosticString(),
-              HasSubstr("Using SignExtend, but result type is not a scalar or "
-                        "vector integer type."));
+  EXPECT_THAT(
+      getDiagnosticString(),
+      HasSubstr("Using ZeroExtend, but result type is a signed integer type."));
 }
 
 }  // namespace