Remove VulkanImageWrappingTests suppression on Intel
The Intel bot upgrade (crbug.com/966500) is finished. Bug: chromium:976495 Change-Id: I2d48f07d2e6951f77f76c870e3d23b5a62db1dd1 Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/13360 Commit-Queue: Corentin Wallez <cwallez@chromium.org> Reviewed-by: Corentin Wallez <cwallez@chromium.org>
This commit is contained in:
Jiajie Hu
Commit Bot service account
parent
600a26d50a
commit
3c086a0c2e
|
|
@ -25,14 +25,12 @@
|
|||
#include "utils/SystemUtils.h"
|
||||
#include "utils/WGPUHelpers.h"
|
||||
|
||||
// TODO(crbug.com/966500): Intel is disabled until upgrade is finished
|
||||
|
||||
namespace {
|
||||
|
||||
class VulkanImageWrappingTestBase : public DawnTest {
|
||||
public:
|
||||
void TestSetUp() override {
|
||||
if (UsesWire() || IsIntel()) {
|
||||
if (UsesWire()) {
|
||||
return;
|
||||
}
|
||||
|
||||
|
|
@ -200,7 +198,7 @@ class VulkanImageWrappingValidationTests : public VulkanImageWrappingTestBase {
|
|||
public:
|
||||
void TestSetUp() override {
|
||||
VulkanImageWrappingTestBase::TestSetUp();
|
||||
if (UsesWire() || IsIntel()) {
|
||||
if (UsesWire()) {
|
||||
return;
|
||||
}
|
||||
|
||||
|
|
@ -218,7 +216,7 @@ class VulkanImageWrappingValidationTests : public VulkanImageWrappingTestBase {
|
|||
}
|
||||
|
||||
void TearDown() override {
|
||||
if (UsesWire() || IsIntel()) {
|
||||
if (UsesWire()) {
|
||||
VulkanImageWrappingTestBase::TearDown();
|
||||
return;
|
||||
}
|
||||
|
|
@ -239,7 +237,7 @@ class VulkanImageWrappingValidationTests : public VulkanImageWrappingTestBase {
|
|||
|
||||
// Test no error occurs if the import is valid
|
||||
TEST_P(VulkanImageWrappingValidationTests, SuccessfulImport) {
|
||||
DAWN_SKIP_TEST_IF(UsesWire() || IsIntel());
|
||||
DAWN_SKIP_TEST_IF(UsesWire());
|
||||
wgpu::Texture texture =
|
||||
WrapVulkanImage(device, &defaultDescriptor, defaultFd, defaultAllocationSize,
|
||||
defaultMemoryTypeIndex, {}, true, true);
|
||||
|
|
@ -249,7 +247,7 @@ TEST_P(VulkanImageWrappingValidationTests, SuccessfulImport) {
|
|||
|
||||
// Test an error occurs if the texture descriptor is missing
|
||||
TEST_P(VulkanImageWrappingValidationTests, MissingTextureDescriptor) {
|
||||
DAWN_SKIP_TEST_IF(UsesWire() || IsIntel());
|
||||
DAWN_SKIP_TEST_IF(UsesWire());
|
||||
ASSERT_DEVICE_ERROR(wgpu::Texture texture =
|
||||
WrapVulkanImage(device, nullptr, defaultFd, defaultAllocationSize,
|
||||
defaultMemoryTypeIndex, {}, true, false));
|
||||
|
|
@ -258,7 +256,7 @@ TEST_P(VulkanImageWrappingValidationTests, MissingTextureDescriptor) {
|
|||
|
||||
// Test an error occurs if the texture descriptor is invalid
|
||||
TEST_P(VulkanImageWrappingValidationTests, InvalidTextureDescriptor) {
|
||||
DAWN_SKIP_TEST_IF(UsesWire() || IsIntel());
|
||||
DAWN_SKIP_TEST_IF(UsesWire());
|
||||
defaultDescriptor.nextInChain = this;
|
||||
|
||||
ASSERT_DEVICE_ERROR(wgpu::Texture texture = WrapVulkanImage(
|
||||
|
|
@ -269,7 +267,7 @@ TEST_P(VulkanImageWrappingValidationTests, InvalidTextureDescriptor) {
|
|||
|
||||
// Test an error occurs if the descriptor dimension isn't 2D
|
||||
TEST_P(VulkanImageWrappingValidationTests, InvalidTextureDimension) {
|
||||
DAWN_SKIP_TEST_IF(UsesWire() || IsIntel());
|
||||
DAWN_SKIP_TEST_IF(UsesWire());
|
||||
defaultDescriptor.dimension = wgpu::TextureDimension::e1D;
|
||||
|
||||
ASSERT_DEVICE_ERROR(wgpu::Texture texture = WrapVulkanImage(
|
||||
|
|
@ -280,7 +278,7 @@ TEST_P(VulkanImageWrappingValidationTests, InvalidTextureDimension) {
|
|||
|
||||
// Test an error occurs if the descriptor mip level count isn't 1
|
||||
TEST_P(VulkanImageWrappingValidationTests, InvalidMipLevelCount) {
|
||||
DAWN_SKIP_TEST_IF(UsesWire() || IsIntel());
|
||||
DAWN_SKIP_TEST_IF(UsesWire());
|
||||
defaultDescriptor.mipLevelCount = 2;
|
||||
|
||||
ASSERT_DEVICE_ERROR(wgpu::Texture texture = WrapVulkanImage(
|
||||
|
|
@ -291,7 +289,7 @@ TEST_P(VulkanImageWrappingValidationTests, InvalidMipLevelCount) {
|
|||
|
||||
// Test an error occurs if the descriptor array layer count isn't 1
|
||||
TEST_P(VulkanImageWrappingValidationTests, InvalidArrayLayerCount) {
|
||||
DAWN_SKIP_TEST_IF(UsesWire() || IsIntel());
|
||||
DAWN_SKIP_TEST_IF(UsesWire());
|
||||
defaultDescriptor.arrayLayerCount = 2;
|
||||
|
||||
ASSERT_DEVICE_ERROR(wgpu::Texture texture = WrapVulkanImage(
|
||||
|
|
@ -302,7 +300,7 @@ TEST_P(VulkanImageWrappingValidationTests, InvalidArrayLayerCount) {
|
|||
|
||||
// Test an error occurs if the descriptor sample count isn't 1
|
||||
TEST_P(VulkanImageWrappingValidationTests, InvalidSampleCount) {
|
||||
DAWN_SKIP_TEST_IF(UsesWire() || IsIntel());
|
||||
DAWN_SKIP_TEST_IF(UsesWire());
|
||||
defaultDescriptor.sampleCount = 4;
|
||||
|
||||
ASSERT_DEVICE_ERROR(wgpu::Texture texture = WrapVulkanImage(
|
||||
|
|
@ -313,7 +311,7 @@ TEST_P(VulkanImageWrappingValidationTests, InvalidSampleCount) {
|
|||
|
||||
// Test an error occurs if we try to export the signal semaphore twice
|
||||
TEST_P(VulkanImageWrappingValidationTests, DoubleSignalSemaphoreExport) {
|
||||
DAWN_SKIP_TEST_IF(UsesWire() || IsIntel());
|
||||
DAWN_SKIP_TEST_IF(UsesWire());
|
||||
wgpu::Texture texture =
|
||||
WrapVulkanImage(device, &defaultDescriptor, defaultFd, defaultAllocationSize,
|
||||
defaultMemoryTypeIndex, {}, true, true);
|
||||
|
|
@ -326,7 +324,7 @@ TEST_P(VulkanImageWrappingValidationTests, DoubleSignalSemaphoreExport) {
|
|||
|
||||
// Test an error occurs if we try to export the signal semaphore from a normal texture
|
||||
TEST_P(VulkanImageWrappingValidationTests, NormalTextureSignalSemaphoreExport) {
|
||||
DAWN_SKIP_TEST_IF(UsesWire() || IsIntel());
|
||||
DAWN_SKIP_TEST_IF(UsesWire());
|
||||
wgpu::Texture texture = device.CreateTexture(&defaultDescriptor);
|
||||
ASSERT_NE(texture.Get(), nullptr);
|
||||
ASSERT_DEVICE_ERROR(
|
||||
|
|
@ -336,7 +334,7 @@ TEST_P(VulkanImageWrappingValidationTests, NormalTextureSignalSemaphoreExport) {
|
|||
|
||||
// Test an error occurs if we try to export the signal semaphore from a destroyed texture
|
||||
TEST_P(VulkanImageWrappingValidationTests, DestroyedTextureSignalSemaphoreExport) {
|
||||
DAWN_SKIP_TEST_IF(UsesWire() || IsIntel());
|
||||
DAWN_SKIP_TEST_IF(UsesWire());
|
||||
wgpu::Texture texture = device.CreateTexture(&defaultDescriptor);
|
||||
ASSERT_NE(texture.Get(), nullptr);
|
||||
texture.Destroy();
|
||||
|
|
@ -351,7 +349,7 @@ class VulkanImageWrappingUsageTests : public VulkanImageWrappingTestBase {
|
|||
public:
|
||||
void TestSetUp() override {
|
||||
VulkanImageWrappingTestBase::TestSetUp();
|
||||
if (UsesWire() || IsIntel()) {
|
||||
if (UsesWire()) {
|
||||
return;
|
||||
}
|
||||
|
||||
|
|
@ -378,7 +376,7 @@ class VulkanImageWrappingUsageTests : public VulkanImageWrappingTestBase {
|
|||
}
|
||||
|
||||
void TearDown() override {
|
||||
if (UsesWire() || IsIntel()) {
|
||||
if (UsesWire()) {
|
||||
VulkanImageWrappingTestBase::TearDown();
|
||||
return;
|
||||
}
|
||||
|
|
@ -450,7 +448,7 @@ class VulkanImageWrappingUsageTests : public VulkanImageWrappingTestBase {
|
|||
// Clear an image in |secondDevice|
|
||||
// Verify clear color is visible in |device|
|
||||
TEST_P(VulkanImageWrappingUsageTests, ClearImageAcrossDevices) {
|
||||
DAWN_SKIP_TEST_IF(UsesWire() || IsIntel());
|
||||
DAWN_SKIP_TEST_IF(UsesWire());
|
||||
|
||||
// Import the image on |secondDevice|
|
||||
wgpu::Texture wrappedTexture =
|
||||
|
|
@ -481,7 +479,7 @@ TEST_P(VulkanImageWrappingUsageTests, ClearImageAcrossDevices) {
|
|||
// Verify the very first import into |device| also sees the change, since it should
|
||||
// alias the same memory
|
||||
TEST_P(VulkanImageWrappingUsageTests, ClearImageAcrossDevicesAliased) {
|
||||
DAWN_SKIP_TEST_IF(UsesWire() || IsIntel());
|
||||
DAWN_SKIP_TEST_IF(UsesWire());
|
||||
// Import the image on |device
|
||||
wgpu::Texture wrappedTextureAlias = WrapVulkanImage(
|
||||
device, &defaultDescriptor, defaultFd, defaultAllocationSize, defaultMemoryTypeIndex, {});
|
||||
|
|
@ -518,7 +516,7 @@ TEST_P(VulkanImageWrappingUsageTests, ClearImageAcrossDevicesAliased) {
|
|||
// Clear an image in |secondDevice|
|
||||
// Verify clear color is not visible in |device| if we import the texture as not cleared
|
||||
TEST_P(VulkanImageWrappingUsageTests, UnclearedTextureIsCleared) {
|
||||
DAWN_SKIP_TEST_IF(UsesWire() || IsIntel());
|
||||
DAWN_SKIP_TEST_IF(UsesWire());
|
||||
|
||||
// Import the image on |secondDevice|
|
||||
wgpu::Texture wrappedTexture =
|
||||
|
|
@ -547,7 +545,7 @@ TEST_P(VulkanImageWrappingUsageTests, UnclearedTextureIsCleared) {
|
|||
// Issue a copy of the imported texture inside |device| to |copyDstTexture|
|
||||
// Verify the clear color from |secondDevice| is visible in |copyDstTexture|
|
||||
TEST_P(VulkanImageWrappingUsageTests, CopyTextureToTextureSrcSync) {
|
||||
DAWN_SKIP_TEST_IF(UsesWire() || IsIntel());
|
||||
DAWN_SKIP_TEST_IF(UsesWire());
|
||||
|
||||
// Import the image on |secondDevice|
|
||||
wgpu::Texture wrappedTexture =
|
||||
|
|
@ -587,7 +585,7 @@ TEST_P(VulkanImageWrappingUsageTests, CopyTextureToTextureSrcSync) {
|
|||
// If texture destination isn't synchronized, |secondDevice| could copy color B
|
||||
// into the texture first, then |device| writes color A
|
||||
TEST_P(VulkanImageWrappingUsageTests, CopyTextureToTextureDstSync) {
|
||||
DAWN_SKIP_TEST_IF(UsesWire() || IsIntel());
|
||||
DAWN_SKIP_TEST_IF(UsesWire());
|
||||
|
||||
// Import the image on |device|
|
||||
wgpu::Texture wrappedTexture = WrapVulkanImage(
|
||||
|
|
@ -633,7 +631,7 @@ TEST_P(VulkanImageWrappingUsageTests, CopyTextureToTextureDstSync) {
|
|||
// Issue a copy of the imported texture inside |device| to |copyDstBuffer|
|
||||
// Verify the clear color from |secondDevice| is visible in |copyDstBuffer|
|
||||
TEST_P(VulkanImageWrappingUsageTests, CopyTextureToBufferSrcSync) {
|
||||
DAWN_SKIP_TEST_IF(UsesWire() || IsIntel());
|
||||
DAWN_SKIP_TEST_IF(UsesWire());
|
||||
|
||||
// Import the image on |secondDevice|
|
||||
wgpu::Texture wrappedTexture =
|
||||
|
|
@ -694,7 +692,7 @@ TEST_P(VulkanImageWrappingUsageTests, CopyTextureToBufferSrcSync) {
|
|||
// If texture destination isn't synchronized, |secondDevice| could copy color B
|
||||
// into the texture first, then |device| writes color A
|
||||
TEST_P(VulkanImageWrappingUsageTests, CopyBufferToTextureDstSync) {
|
||||
DAWN_SKIP_TEST_IF(UsesWire() || IsIntel());
|
||||
DAWN_SKIP_TEST_IF(UsesWire());
|
||||
|
||||
// Import the image on |device|
|
||||
wgpu::Texture wrappedTexture = WrapVulkanImage(
|
||||
|
|
@ -759,7 +757,7 @@ TEST_P(VulkanImageWrappingUsageTests, CopyBufferToTextureDstSync) {
|
|||
// Issue second copy to |secondCopyDstTexture|
|
||||
// Verify the clear color from |secondDevice| is visible in both copies
|
||||
TEST_P(VulkanImageWrappingUsageTests, DoubleTextureUsage) {
|
||||
DAWN_SKIP_TEST_IF(UsesWire() || IsIntel());
|
||||
DAWN_SKIP_TEST_IF(UsesWire());
|
||||
|
||||
// Import the image on |secondDevice|
|
||||
wgpu::Texture wrappedTexture =
|
||||
|
|
@ -808,7 +806,7 @@ TEST_P(VulkanImageWrappingUsageTests, DoubleTextureUsage) {
|
|||
// Copy C->D on device 1 (wait on C from previous op)
|
||||
// Verify D has same color as A
|
||||
TEST_P(VulkanImageWrappingUsageTests, ChainTextureCopy) {
|
||||
DAWN_SKIP_TEST_IF(UsesWire() || IsIntel());
|
||||
DAWN_SKIP_TEST_IF(UsesWire());
|
||||
|
||||
// Close |defaultFd| since this test doesn't import it anywhere
|
||||
close(defaultFd);
|
||||
|
|
@ -912,7 +910,7 @@ TEST_P(VulkanImageWrappingUsageTests, ChainTextureCopy) {
|
|||
// Tests a larger image is preserved when importing
|
||||
// TODO(http://crbug.com/dawn/206): This fails on AMD
|
||||
TEST_P(VulkanImageWrappingUsageTests, LargerImage) {
|
||||
DAWN_SKIP_TEST_IF(UsesWire() || IsIntel() || IsAMD());
|
||||
DAWN_SKIP_TEST_IF(UsesWire() || IsAMD());
|
||||
|
||||
close(defaultFd);
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue