Merge vk-gl-cts/vulkan-cts-1.3.3 into vk-gl-cts/main
authorMatthew Netsch <quic_mnetsch@quicinc.com>
Thu, 25 Aug 2022 21:01:33 +0000 (14:01 -0700)
committerMatthew Netsch <quic_mnetsch@quicinc.com>
Thu, 25 Aug 2022 21:01:33 +0000 (14:01 -0700)
Change-Id: Ie46b51dc959d6a3c5c73e61b9698dec7dc921f5d

1  2 
external/vulkancts/modules/vulkan/image/vktImageCompressionTranscodingSupport.cpp
external/vulkancts/modules/vulkan/spirv_assembly/vktSpvAsmCrossStageInterfaceTests.cpp
external/vulkancts/modules/vulkan/spirv_assembly/vktSpvAsmInstructionTests.cpp
external/vulkancts/modules/vulkan/synchronization/vktSynchronizationBasicSemaphoreTests.cpp

@@@ -649,14 -644,14 +649,14 @@@ TestStatus BasicComputeTestInstance::it
                                const UVec3             size            = UVec3(imageData[resultImageNdx].getImageInfo(imageNdx).extent.width,
                                                                                                        imageData[resultImageNdx].getImageInfo(imageNdx).extent.height,
                                                                                                        imageData[resultImageNdx].getImageInfo(imageNdx).extent.depth);
 -                              if (!copyResultAndCompare(*cmdBuffer, imageData[resultImageNdx].getImage(imageNdx), offset, size))
 +                              if (!copyResultAndCompare(*cmdPool, *cmdBuffer, imageData[resultImageNdx].getImage(imageNdx), offset, size))
-                                       return TestStatus::fail("Fail");
+                                       return TestStatus::fail("Uncompressed output mismatch at offset " + de::toString(offset) + " even before executing decompression");
                                offset += getCompressedImageSizeInBytes(m_parameters.formatCompressed, mipMapSizes[mipNdx]);
                        }
                }
        }
 -      if (!decompressImage(*cmdBuffer, imageData, mipMapSizes))
 +      if (!decompressImage(*cmdPool, *cmdBuffer, imageData, mipMapSizes))
-                       return TestStatus::fail("Fail");
+                       return TestStatus::fail("Decompression failed");
  
        if (m_bASTCErrorColourMismatch)
        {