From af09f74913e80eda6117e18511e9d673a706bcef Mon Sep 17 00:00:00 2001 From: Corentin Wallez Date: Thu, 16 Jul 2020 15:09:55 +0000 Subject: [PATCH] Roll third_party/swiftshader/ ad65826a2..e8dd233c7 (10 commits) Also removes suppressions for tests that pass after https://swiftshader-review.googlesource.com/c/SwiftShader/+/46509 https://swiftshader.googlesource.com/SwiftShader/+log/ad65826a2ab1..e8dd233c7a85 $ git log ad65826a2..e8dd233c7 --date=short --no-merges --format='%ad %ae %s' 2020-07-16 cwallez Fix B<->T copies of multiple array layers and unpacked rowpitch 2020-07-15 bclayton Regres: Collate and add new documentation for Regres 2020-04-08 natsu Support Gralloc3 in SwiftShader 2020-07-14 swiftshader.regress Regres: Update test lists @ cd0af645 2020-07-13 capn Undefine Bool after the headers that define them 2020-07-11 capn Remove dead ASTC code for GLES 2020-07-09 capn Rename command classes to match API calls 2020-06-04 srisser Add decoder for BC6h 2020-06-15 sugoi Image dirtiness 2020-07-09 amaiorano Android: build against llvm-10 instead of llvm-7 Created with: roll-dep third_party/swiftshader Bug: None Change-Id: Ife6dcf9f832e4aaab40de3bdb62d4b1eb258d2f8 Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/25042 Commit-Queue: Corentin Wallez Reviewed-by: Corentin Wallez --- DEPS | 2 +- src/tests/end2end/CopyTests.cpp | 28 ----------------------- src/tests/end2end/QueueTests.cpp | 2 +- src/tests/end2end/StorageTextureTests.cpp | 8 ------- 4 files changed, 2 insertions(+), 38 deletions(-) diff --git a/DEPS b/DEPS index f83144a1cb..4d03f8bc66 100644 --- a/DEPS +++ b/DEPS @@ -122,7 +122,7 @@ deps = { }, 'third_party/swiftshader': { - 'url': '{swiftshader_git}/SwiftShader@ad65826a2ab181592473fb54ab78025771f4caf6', + 'url': '{swiftshader_git}/SwiftShader@e8dd233c7a85f3c689caf06c226a7f8405a480d3', 'condition': 'dawn_standalone', }, diff --git a/src/tests/end2end/CopyTests.cpp b/src/tests/end2end/CopyTests.cpp index 78ebf83f3e..28728bdfaa 100644 --- a/src/tests/end2end/CopyTests.cpp +++ b/src/tests/end2end/CopyTests.cpp @@ -700,10 +700,6 @@ TEST_P(CopyTests_T2B, Texture2DArraySubRegion) { // Test that copying texture 2D array mips with 256-byte aligned sizes works TEST_P(CopyTests_T2B, Texture2DArrayMip) { - // TODO(jiawei.shao@intel.com): investigate why copies with multiple texture array layers fail - // with swiftshader. - DAWN_SKIP_TEST_IF(IsSwiftshader()); - constexpr uint32_t kWidth = 256; constexpr uint32_t kHeight = 128; constexpr uint32_t kLayers = 6u; @@ -724,10 +720,6 @@ TEST_P(CopyTests_T2B, Texture2DArrayMip) { // Test that copying from a range of texture 2D array layers in one texture-to-buffer-copy when // RowsPerImage is not equal to the height of the texture works. TEST_P(CopyTests_T2B, Texture2DArrayRegionNonzeroRowsPerImage) { - // TODO(jiawei.shao@intel.com): investigate why copies with multiple texture array layers fail - // with swiftshader. - DAWN_SKIP_TEST_IF(IsSwiftshader()); - constexpr uint32_t kWidth = 256; constexpr uint32_t kHeight = 128; constexpr uint32_t kLayers = 6u; @@ -749,10 +741,6 @@ TEST_P(CopyTests_T2B, Texture2DArrayRegionNonzeroRowsPerImage) { // Test a special code path in the D3D12 backends when (BytesPerRow * RowsPerImage) is not a // multiple of 512. TEST_P(CopyTests_T2B, Texture2DArrayRegionWithOffsetOddRowsPerImage) { - // TODO(jiawei.shao@intel.com): investigate why copies with multiple texture array layers fail - // with swiftshader. - DAWN_SKIP_TEST_IF(IsSwiftshader()); - constexpr uint32_t kWidth = 64; constexpr uint32_t kHeight = 128; constexpr uint32_t kLayers = 8u; @@ -776,10 +764,6 @@ TEST_P(CopyTests_T2B, Texture2DArrayRegionWithOffsetOddRowsPerImage) { // Test a special code path in the D3D12 backends when (BytesPerRow * RowsPerImage) is a multiple // of 512. TEST_P(CopyTests_T2B, Texture2DArrayRegionWithOffsetEvenRowsPerImage) { - // TODO(jiawei.shao@intel.com): investigate why copies with multiple texture array layers fail - // with swiftshader. - DAWN_SKIP_TEST_IF(IsSwiftshader()); - constexpr uint32_t kWidth = 64; constexpr uint32_t kHeight = 128; constexpr uint32_t kLayers = 8u; @@ -1126,10 +1110,6 @@ TEST_P(CopyTests_B2T, Texture2DArraySubRegion) { // Test that copying into a range of texture 2D array layers in one texture-to-buffer-copy when // RowsPerImage is not equal to the height of the texture works. TEST_P(CopyTests_B2T, Texture2DArrayRegionNonzeroRowsPerImage) { - // TODO(jiawei.shao@intel.com): investigate why copies with multiple texture array layers fail - // with swiftshader. - DAWN_SKIP_TEST_IF(IsSwiftshader()); - constexpr uint32_t kWidth = 256; constexpr uint32_t kHeight = 128; constexpr uint32_t kLayers = 6u; @@ -1151,10 +1131,6 @@ TEST_P(CopyTests_B2T, Texture2DArrayRegionNonzeroRowsPerImage) { // Test a special code path in the D3D12 backends when (BytesPerRow * RowsPerImage) is not a // multiple of 512. TEST_P(CopyTests_B2T, Texture2DArrayRegionWithOffsetOddRowsPerImage) { - // TODO(jiawei.shao@intel.com): investigate why copies with multiple texture array layers fail - // with swiftshader. - DAWN_SKIP_TEST_IF(IsSwiftshader()); - constexpr uint32_t kWidth = 64; constexpr uint32_t kHeight = 128; constexpr uint32_t kLayers = 8u; @@ -1178,10 +1154,6 @@ TEST_P(CopyTests_B2T, Texture2DArrayRegionWithOffsetOddRowsPerImage) { // Test a special code path in the D3D12 backends when (BytesPerRow * RowsPerImage) is a multiple // of 512. TEST_P(CopyTests_B2T, Texture2DArrayRegionWithOffsetEvenRowsPerImage) { - // TODO(jiawei.shao@intel.com): investigate why copies with multiple texture array layers fail - // with swiftshader. - DAWN_SKIP_TEST_IF(IsSwiftshader()); - constexpr uint32_t kWidth = 64; constexpr uint32_t kHeight = 128; constexpr uint32_t kLayers = 8u; diff --git a/src/tests/end2end/QueueTests.cpp b/src/tests/end2end/QueueTests.cpp index b725a01741..4e5febdc0b 100644 --- a/src/tests/end2end/QueueTests.cpp +++ b/src/tests/end2end/QueueTests.cpp @@ -492,4 +492,4 @@ TEST_P(QueueWriteTextureTests, VaryingArrayBytesPerRow) { } } -DAWN_INSTANTIATE_TEST(QueueWriteTextureTests, MetalBackend(), VulkanBackend()); \ No newline at end of file +DAWN_INSTANTIATE_TEST(QueueWriteTextureTests, MetalBackend(), VulkanBackend()); diff --git a/src/tests/end2end/StorageTextureTests.cpp b/src/tests/end2end/StorageTextureTests.cpp index d02973c76c..b09f648f3c 100644 --- a/src/tests/end2end/StorageTextureTests.cpp +++ b/src/tests/end2end/StorageTextureTests.cpp @@ -937,10 +937,6 @@ TEST_P(StorageTextureTests, Readonly2DArrayStorageTexture) { // bug in spvc parser is fixed. DAWN_SKIP_TEST_IF(IsSpvcParserBeingUsed()); - // TODO(jiawei.shao@intel.com): investigate why copies with multiple texture array layer fail - // with swiftshader. - DAWN_SKIP_TEST_IF(IsSwiftshader()); - constexpr uint32_t kArrayLayerCount = 3u; constexpr wgpu::TextureFormat kTextureFormat = wgpu::TextureFormat::R32Uint; @@ -979,10 +975,6 @@ TEST_P(StorageTextureTests, Writeonly2DArrayStorageTexture) { // bug in spvc parser is fixed. DAWN_SKIP_TEST_IF(IsD3D12() && IsSpvcParserBeingUsed()); - // TODO(jiawei.shao@intel.com): investigate why copies with multiple texture array layer fail - // with swiftshader. - DAWN_SKIP_TEST_IF(IsSwiftshader()); - constexpr uint32_t kArrayLayerCount = 3u; constexpr wgpu::TextureFormat kTextureFormat = wgpu::TextureFormat::R32Uint;