CopyTests: use a set of known good bytes for 16Float and RG11B10Ufloat
Use a set of known good bytes for *16Float and RG11B10Ufloat format
CopyTests to avoid the multiple encoding issues for some values and
NaN normalizing. This can provide some test coverage instead of fully
skipping the whole test.
Bug: dawn:1914
Change-Id: I4ab2b606340eac6d4cb72663d11caec7d496303d
Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/159661
Reviewed-by: Austin Eng <enga@chromium.org>
Reviewed-by: Brandon Jones <bajones@chromium.org>
Kokoro: Kokoro <noreply+kokoro@google.com>
Commit-Queue: Shrek Shao <shrekshao@google.com>
diff --git a/src/dawn/tests/end2end/CopyTests.cpp b/src/dawn/tests/end2end/CopyTests.cpp
index 596d43c..0f863b4 100644
--- a/src/dawn/tests/end2end/CopyTests.cpp
+++ b/src/dawn/tests/end2end/CopyTests.cpp
@@ -66,7 +66,24 @@
uint32_t rowsPerImage;
};
- static std::vector<uint8_t> GetExpectedTextureData(const utils::TextureDataCopyLayout& layout) {
+ static std::vector<uint8_t> GetExpectedTextureData(wgpu::TextureFormat format,
+ const utils::TextureDataCopyLayout& layout) {
+ switch (format) {
+ case wgpu::TextureFormat::R16Float:
+ case wgpu::TextureFormat::RG16Float:
+ case wgpu::TextureFormat::RGBA16Float:
+ return GetExpectedTextureData16Float(layout);
+ case wgpu::TextureFormat::RGB9E5Ufloat:
+ return GetExpectedTextureDataRGB9E5Ufloat(layout);
+ case wgpu::TextureFormat::RG11B10Ufloat:
+ return GetExpectedTextureDataRG11B10Ufloat(layout);
+ default:
+ return GetExpectedTextureDataGeneral(layout);
+ }
+ }
+
+ static std::vector<uint8_t> GetExpectedTextureDataGeneral(
+ const utils::TextureDataCopyLayout& layout) {
uint32_t bytesPerTexelBlock = layout.bytesPerRow / layout.texelBlocksPerRow;
std::vector<uint8_t> textureData(layout.byteLength);
for (uint32_t layer = 0; layer < layout.mipSize.depthOrArrayLayers; ++layer) {
@@ -90,16 +107,49 @@
return textureData;
}
+ // Special function to generate test data for *16Float to workaround nonunique encoding
+ // issue.
+ static std::vector<uint8_t> GetExpectedTextureData16Float(
+ const utils::TextureDataCopyLayout& layout) {
+ // These are some known 16 bit float values that always unpack and pack to the same bytes.
+ // Pick test data from these values to provide some level of test coverage for *16Float.
+ constexpr uint8_t goodBytes[] = {
+ 0x30, 0x00, 0x49, 0x00, 0x56, 0x40, 0x20, 0x00, 0x37, 0x4C, 0x42, 0x00, 0x3F, 0x6C,
+ };
+ constexpr uint32_t formatByteSize = 2;
+ constexpr uint32_t numGoodValues = sizeof(goodBytes) / sizeof(uint8_t) / formatByteSize;
+
+ uint32_t bytesPerTexelBlock = layout.bytesPerRow / layout.texelBlocksPerRow;
+ std::vector<uint8_t> textureData(layout.byteLength);
+ for (uint32_t layer = 0; layer < layout.mipSize.depthOrArrayLayers; ++layer) {
+ const uint32_t byteOffsetPerSlice = layout.bytesPerImage * layer;
+ for (uint32_t y = 0; y < layout.mipSize.height; ++y) {
+ for (uint32_t x = 0; x < layout.mipSize.width * bytesPerTexelBlock; ++x) {
+ uint32_t i = x + y * layout.bytesPerRow;
+
+ uint32_t pixelId = (x + 1 + (layer + 1) * y);
+ uint8_t v = goodBytes[pixelId % numGoodValues + pixelId % formatByteSize];
+
+ textureData[byteOffsetPerSlice + i] = v;
+ }
+ }
+ }
+ return textureData;
+ }
+
// Special function to generate test data for RGB9E5Ufloat to workaround nonunique encoding
// issue.
static std::vector<uint8_t> GetExpectedTextureDataRGB9E5Ufloat(
const utils::TextureDataCopyLayout& layout) {
- // These are some known RGB9E5Ufloat values that always unpack and pack to the same bytes.
- // Pick test data from these values to provide some level of test coverage for RGB9E5Ufloat.
+ // These are some known 4-byte RGB9E5Ufloat values that always unpack and pack to the same
+ // bytes. Pick test data from these values to provide some level of test coverage for
+ // RGB9E5Ufloat.
constexpr uint8_t goodBytes[] = {
0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0A, 0x0B, 0x0C, 0x0D, 0x0E,
0x0F, 0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17, 0x18, 0x19, 0x1A, 0x1B, 0x1C,
0x1D, 0x1E, 0x1F, 0x20, 0x21, 0x22, 0x23, 0x24, 0x25, 0x26, 0x27, 0x28};
+ constexpr uint32_t formatByteSize = 4;
+ constexpr uint32_t numGoodValues = sizeof(goodBytes) / sizeof(uint8_t) / formatByteSize;
uint32_t bytesPerTexelBlock = layout.bytesPerRow / layout.texelBlocksPerRow;
std::vector<uint8_t> textureData(layout.byteLength);
for (uint32_t layer = 0; layer < layout.mipSize.depthOrArrayLayers; ++layer) {
@@ -108,7 +158,7 @@
for (uint32_t x = 0; x < layout.mipSize.width; ++x) {
uint32_t o =
x * bytesPerTexelBlock + y * layout.bytesPerRow + byteOffsetPerSlice;
- uint32_t idx = 4 * ((x + 1 + (layer + 1) * y) % (sizeof(goodBytes) / 4));
+ uint32_t idx = formatByteSize * ((x + 1 + (layer + 1) * y) % numGoodValues);
textureData[o + 0] = goodBytes[idx + 0];
textureData[o + 1] = goodBytes[idx + 1];
textureData[o + 2] = goodBytes[idx + 2];
@@ -119,24 +169,35 @@
return textureData;
}
- // TODO(crbug.com/dawn/818): remove this function when all the tests in this file support
- // testing arbitrary formats.
- static std::vector<utils::RGBA8> GetExpectedTextureDataRGBA8(
+ // Special function to generate test data for RG11B10Ufloat to workaround nonunique encoding
+ // issue.
+ static std::vector<uint8_t> GetExpectedTextureDataRG11B10Ufloat(
const utils::TextureDataCopyLayout& layout) {
- std::vector<utils::RGBA8> textureData(layout.texelBlockCount);
+ // These are some known 4-byte RG11B10Ufloat values that always unpack and pack to the same
+ // bytes. Pick test data from these values to provide some level of test coverage for
+ // RG11B10Ufloat.
+ constexpr uint8_t goodBytes[] = {
+ 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0A, 0x0B, 0x0C, 0x0D, 0x0E,
+ 0x0F, 0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17, 0x18, 0x19, 0x1A, 0x1B, 0x1C,
+ 0x1D, 0x1E, 0x1F, 0x20, 0x21, 0x22, 0x23, 0x24, 0x25, 0x26, 0x27, 0x28};
+ constexpr uint32_t formatByteSize = 4;
+ constexpr uint32_t numGoodValues = sizeof(goodBytes) / sizeof(uint8_t) / formatByteSize;
+ uint32_t bytesPerTexelBlock = layout.bytesPerRow / layout.texelBlocksPerRow;
+ std::vector<uint8_t> textureData(layout.byteLength);
for (uint32_t layer = 0; layer < layout.mipSize.depthOrArrayLayers; ++layer) {
- const uint32_t texelIndexOffsetPerSlice = layout.texelBlocksPerImage * layer;
+ const uint32_t byteOffsetPerSlice = layout.bytesPerImage * layer;
for (uint32_t y = 0; y < layout.mipSize.height; ++y) {
for (uint32_t x = 0; x < layout.mipSize.width; ++x) {
- uint32_t i = x + y * layout.texelBlocksPerRow;
- textureData[texelIndexOffsetPerSlice + i] =
- utils::RGBA8(static_cast<uint8_t>((x + layer * x) % 256),
- static_cast<uint8_t>((y + layer * y) % 256),
- static_cast<uint8_t>(x / 256), static_cast<uint8_t>(y / 256));
+ uint32_t o =
+ x * bytesPerTexelBlock + y * layout.bytesPerRow + byteOffsetPerSlice;
+ uint32_t idx = formatByteSize * ((x + 1 + (layer + 1) * y) % numGoodValues);
+ textureData[o + 0] = goodBytes[idx + 0];
+ textureData[o + 1] = goodBytes[idx + 1];
+ textureData[o + 2] = goodBytes[idx + 2];
+ textureData[o + 3] = goodBytes[idx + 3];
}
}
}
-
return textureData;
}
@@ -220,14 +281,6 @@
GetParam().mTextureFormat == wgpu::TextureFormat::RG11B10Ufloat) &&
IsMacOS() && IsIntel() && IsMetal());
- // TODO(dawn:1914): Many 16 float formats tests failing for Vulkan backend on Android
- // Pixel 4.
- DAWN_SUPPRESS_TEST_IF((GetParam().mTextureFormat == wgpu::TextureFormat::R16Float ||
- GetParam().mTextureFormat == wgpu::TextureFormat::RG16Float ||
- GetParam().mTextureFormat == wgpu::TextureFormat::RGBA16Float ||
- GetParam().mTextureFormat == wgpu::TextureFormat::RG11B10Ufloat) &&
- IsAndroid() && IsVulkan());
-
// TODO(dawn:1935): Many 16 float formats tests failing for D3D11 and OpenGLES backends on
// Intel Gen12.
DAWN_SUPPRESS_TEST_IF((GetParam().mTextureFormat == wgpu::TextureFormat::R16Float ||
@@ -266,10 +319,8 @@
utils::GetTextureDataCopyLayoutForTextureAtLevel(
textureSpec.format, textureSpec.textureSize, textureSpec.copyLevel, dimension);
- std::vector<uint8_t> textureArrayData =
- (textureSpec.format == wgpu::TextureFormat::RGB9E5Ufloat)
- ? GetExpectedTextureDataRGB9E5Ufloat(copyLayout)
- : GetExpectedTextureData(copyLayout);
+ const std::vector<uint8_t> textureArrayData =
+ GetExpectedTextureData(textureSpec.format, copyLayout);
{
wgpu::ImageCopyTexture imageCopyTexture =
utils::CreateImageCopyTexture(texture, textureSpec.copyLevel, {0, 0, 0});
@@ -489,9 +540,7 @@
// Initialize the source texture
const std::vector<uint8_t> srcTextureCopyData =
- (format == wgpu::TextureFormat::RGB9E5Ufloat)
- ? GetExpectedTextureDataRGB9E5Ufloat(srcDataCopyLayout)
- : GetExpectedTextureData(srcDataCopyLayout);
+ GetExpectedTextureData(format, srcDataCopyLayout);
{
wgpu::ImageCopyTexture imageCopyTexture = utils::CreateImageCopyTexture(
srcTexture, srcSpec.copyLevel, {0, 0, srcSpec.copyOrigin.z});
