encounter/dawn-cmake
1
0
Fork 0
mirror of https://github.com/encounter/dawn-cmake.git synced 2025-07-04 12:16:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove VulkanImageWrappingTests suppression on Intel

Browse Source 
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 2019-11-11 08:59:07 +00:00 committed by Commit Bot service account
parent 600a26d50a
commit 3c086a0c2e
1 changed files with 25 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
src/tests/white_box/VulkanImageWrappingTests.cpp
View File

@ -25,14 +25,12 @@
#include "utils/SystemUtils.h" #include "utils/SystemUtils.h"
#include "utils/WGPUHelpers.h" #include "utils/WGPUHelpers.h"
// TODO(crbug.com/966500): Intel is disabled until upgrade is finished
namespace { namespace {
class VulkanImageWrappingTestBase : public DawnTest { class VulkanImageWrappingTestBase : public DawnTest {
public: public:
void TestSetUp() override { void TestSetUp() override {
if (UsesWire() || IsIntel()) { if (UsesWire()) {
return; return;
} }
@ -200,7 +198,7 @@ class VulkanImageWrappingValidationTests : public VulkanImageWrappingTestBase {
public: public:
void TestSetUp() override { void TestSetUp() override {
VulkanImageWrappingTestBase::TestSetUp(); VulkanImageWrappingTestBase::TestSetUp();
if (UsesWire() || IsIntel()) { if (UsesWire()) {
return; return;
} }
@ -218,7 +216,7 @@ class VulkanImageWrappingValidationTests : public VulkanImageWrappingTestBase {
} }
void TearDown() override { void TearDown() override {
if (UsesWire() || IsIntel()) { if (UsesWire()) {
VulkanImageWrappingTestBase::TearDown(); VulkanImageWrappingTestBase::TearDown();
return; return;
} }
@ -239,7 +237,7 @@ class VulkanImageWrappingValidationTests : public VulkanImageWrappingTestBase {
// Test no error occurs if the import is valid // Test no error occurs if the import is valid
TEST_P(VulkanImageWrappingValidationTests, SuccessfulImport) { TEST_P(VulkanImageWrappingValidationTests, SuccessfulImport) {
DAWN_SKIP_TEST_IF(UsesWire() || IsIntel()); DAWN_SKIP_TEST_IF(UsesWire());
wgpu::Texture texture = wgpu::Texture texture =
WrapVulkanImage(device, &defaultDescriptor, defaultFd, defaultAllocationSize, WrapVulkanImage(device, &defaultDescriptor, defaultFd, defaultAllocationSize,
defaultMemoryTypeIndex, {}, true, true); defaultMemoryTypeIndex, {}, true, true);
@ -249,7 +247,7 @@ TEST_P(VulkanImageWrappingValidationTests, SuccessfulImport) {
// Test an error occurs if the texture descriptor is missing // Test an error occurs if the texture descriptor is missing
TEST_P(VulkanImageWrappingValidationTests, MissingTextureDescriptor) { TEST_P(VulkanImageWrappingValidationTests, MissingTextureDescriptor) {
DAWN_SKIP_TEST_IF(UsesWire() || IsIntel()); DAWN_SKIP_TEST_IF(UsesWire());
ASSERT_DEVICE_ERROR(wgpu::Texture texture = ASSERT_DEVICE_ERROR(wgpu::Texture texture =
WrapVulkanImage(device, nullptr, defaultFd, defaultAllocationSize, WrapVulkanImage(device, nullptr, defaultFd, defaultAllocationSize,
defaultMemoryTypeIndex, {}, true, false)); defaultMemoryTypeIndex, {}, true, false));
@ -258,7 +256,7 @@ TEST_P(VulkanImageWrappingValidationTests, MissingTextureDescriptor) {
// Test an error occurs if the texture descriptor is invalid // Test an error occurs if the texture descriptor is invalid
TEST_P(VulkanImageWrappingValidationTests, InvalidTextureDescriptor) { TEST_P(VulkanImageWrappingValidationTests, InvalidTextureDescriptor) {
DAWN_SKIP_TEST_IF(UsesWire() || IsIntel()); DAWN_SKIP_TEST_IF(UsesWire());
defaultDescriptor.nextInChain = this; defaultDescriptor.nextInChain = this;
ASSERT_DEVICE_ERROR(wgpu::Texture texture = WrapVulkanImage( 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 an error occurs if the descriptor dimension isn't 2D
TEST_P(VulkanImageWrappingValidationTests, InvalidTextureDimension) { TEST_P(VulkanImageWrappingValidationTests, InvalidTextureDimension) {
DAWN_SKIP_TEST_IF(UsesWire() || IsIntel()); DAWN_SKIP_TEST_IF(UsesWire());
defaultDescriptor.dimension = wgpu::TextureDimension::e1D; defaultDescriptor.dimension = wgpu::TextureDimension::e1D;
ASSERT_DEVICE_ERROR(wgpu::Texture texture = WrapVulkanImage( 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 an error occurs if the descriptor mip level count isn't 1
TEST_P(VulkanImageWrappingValidationTests, InvalidMipLevelCount) { TEST_P(VulkanImageWrappingValidationTests, InvalidMipLevelCount) {
DAWN_SKIP_TEST_IF(UsesWire() || IsIntel()); DAWN_SKIP_TEST_IF(UsesWire());
defaultDescriptor.mipLevelCount = 2; defaultDescriptor.mipLevelCount = 2;
ASSERT_DEVICE_ERROR(wgpu::Texture texture = WrapVulkanImage( 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 an error occurs if the descriptor array layer count isn't 1
TEST_P(VulkanImageWrappingValidationTests, InvalidArrayLayerCount) { TEST_P(VulkanImageWrappingValidationTests, InvalidArrayLayerCount) {
DAWN_SKIP_TEST_IF(UsesWire() || IsIntel()); DAWN_SKIP_TEST_IF(UsesWire());
defaultDescriptor.arrayLayerCount = 2; defaultDescriptor.arrayLayerCount = 2;
ASSERT_DEVICE_ERROR(wgpu::Texture texture = WrapVulkanImage( 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 an error occurs if the descriptor sample count isn't 1
TEST_P(VulkanImageWrappingValidationTests, InvalidSampleCount) { TEST_P(VulkanImageWrappingValidationTests, InvalidSampleCount) {
DAWN_SKIP_TEST_IF(UsesWire() || IsIntel()); DAWN_SKIP_TEST_IF(UsesWire());
defaultDescriptor.sampleCount = 4; defaultDescriptor.sampleCount = 4;
ASSERT_DEVICE_ERROR(wgpu::Texture texture = WrapVulkanImage( 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 an error occurs if we try to export the signal semaphore twice
TEST_P(VulkanImageWrappingValidationTests, DoubleSignalSemaphoreExport) { TEST_P(VulkanImageWrappingValidationTests, DoubleSignalSemaphoreExport) {
DAWN_SKIP_TEST_IF(UsesWire() || IsIntel()); DAWN_SKIP_TEST_IF(UsesWire());
wgpu::Texture texture = wgpu::Texture texture =
WrapVulkanImage(device, &defaultDescriptor, defaultFd, defaultAllocationSize, WrapVulkanImage(device, &defaultDescriptor, defaultFd, defaultAllocationSize,
defaultMemoryTypeIndex, {}, true, true); 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 an error occurs if we try to export the signal semaphore from a normal texture
TEST_P(VulkanImageWrappingValidationTests, NormalTextureSignalSemaphoreExport) { TEST_P(VulkanImageWrappingValidationTests, NormalTextureSignalSemaphoreExport) {
DAWN_SKIP_TEST_IF(UsesWire() || IsIntel()); DAWN_SKIP_TEST_IF(UsesWire());
wgpu::Texture texture = device.CreateTexture(&defaultDescriptor); wgpu::Texture texture = device.CreateTexture(&defaultDescriptor);
ASSERT_NE(texture.Get(), nullptr); ASSERT_NE(texture.Get(), nullptr);
ASSERT_DEVICE_ERROR( 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 an error occurs if we try to export the signal semaphore from a destroyed texture
TEST_P(VulkanImageWrappingValidationTests, DestroyedTextureSignalSemaphoreExport) { TEST_P(VulkanImageWrappingValidationTests, DestroyedTextureSignalSemaphoreExport) {
DAWN_SKIP_TEST_IF(UsesWire() || IsIntel()); DAWN_SKIP_TEST_IF(UsesWire());
wgpu::Texture texture = device.CreateTexture(&defaultDescriptor); wgpu::Texture texture = device.CreateTexture(&defaultDescriptor);
ASSERT_NE(texture.Get(), nullptr); ASSERT_NE(texture.Get(), nullptr);
texture.Destroy(); texture.Destroy();
@ -351,7 +349,7 @@ class VulkanImageWrappingUsageTests : public VulkanImageWrappingTestBase {
public: public:
void TestSetUp() override { void TestSetUp() override {
VulkanImageWrappingTestBase::TestSetUp(); VulkanImageWrappingTestBase::TestSetUp();
if (UsesWire() || IsIntel()) { if (UsesWire()) {
return; return;
} }
@ -378,7 +376,7 @@ class VulkanImageWrappingUsageTests : public VulkanImageWrappingTestBase {
} }
void TearDown() override { void TearDown() override {
if (UsesWire() || IsIntel()) { if (UsesWire()) {
VulkanImageWrappingTestBase::TearDown(); VulkanImageWrappingTestBase::TearDown();
return; return;
} }
@ -450,7 +448,7 @@ class VulkanImageWrappingUsageTests : public VulkanImageWrappingTestBase {
// Clear an image in |secondDevice| // Clear an image in |secondDevice|
// Verify clear color is visible in |device| // Verify clear color is visible in |device|
TEST_P(VulkanImageWrappingUsageTests, ClearImageAcrossDevices) { TEST_P(VulkanImageWrappingUsageTests, ClearImageAcrossDevices) {
DAWN_SKIP_TEST_IF(UsesWire() || IsIntel()); DAWN_SKIP_TEST_IF(UsesWire());
// Import the image on |secondDevice| // Import the image on |secondDevice|
wgpu::Texture wrappedTexture = 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 // Verify the very first import into |device| also sees the change, since it should
// alias the same memory // alias the same memory
TEST_P(VulkanImageWrappingUsageTests, ClearImageAcrossDevicesAliased) { TEST_P(VulkanImageWrappingUsageTests, ClearImageAcrossDevicesAliased) {
DAWN_SKIP_TEST_IF(UsesWire() || IsIntel()); DAWN_SKIP_TEST_IF(UsesWire());
// Import the image on |device // Import the image on |device
wgpu::Texture wrappedTextureAlias = WrapVulkanImage( wgpu::Texture wrappedTextureAlias = WrapVulkanImage(
device, &defaultDescriptor, defaultFd, defaultAllocationSize, defaultMemoryTypeIndex, {}); device, &defaultDescriptor, defaultFd, defaultAllocationSize, defaultMemoryTypeIndex, {});
@ -518,7 +516,7 @@ TEST_P(VulkanImageWrappingUsageTests, ClearImageAcrossDevicesAliased) {
// Clear an image in |secondDevice| // Clear an image in |secondDevice|
// Verify clear color is not visible in |device| if we import the texture as not cleared // Verify clear color is not visible in |device| if we import the texture as not cleared
TEST_P(VulkanImageWrappingUsageTests, UnclearedTextureIsCleared) { TEST_P(VulkanImageWrappingUsageTests, UnclearedTextureIsCleared) {
DAWN_SKIP_TEST_IF(UsesWire() || IsIntel()); DAWN_SKIP_TEST_IF(UsesWire());
// Import the image on |secondDevice| // Import the image on |secondDevice|
wgpu::Texture wrappedTexture = wgpu::Texture wrappedTexture =
@ -547,7 +545,7 @@ TEST_P(VulkanImageWrappingUsageTests, UnclearedTextureIsCleared) {
// Issue a copy of the imported texture inside |device| to |copyDstTexture| // Issue a copy of the imported texture inside |device| to |copyDstTexture|
// Verify the clear color from |secondDevice| is visible in |copyDstTexture| // Verify the clear color from |secondDevice| is visible in |copyDstTexture|
TEST_P(VulkanImageWrappingUsageTests, CopyTextureToTextureSrcSync) { TEST_P(VulkanImageWrappingUsageTests, CopyTextureToTextureSrcSync) {
DAWN_SKIP_TEST_IF(UsesWire() || IsIntel()); DAWN_SKIP_TEST_IF(UsesWire());
// Import the image on |secondDevice| // Import the image on |secondDevice|
wgpu::Texture wrappedTexture = wgpu::Texture wrappedTexture =
@ -587,7 +585,7 @@ TEST_P(VulkanImageWrappingUsageTests, CopyTextureToTextureSrcSync) {
// If texture destination isn't synchronized, |secondDevice| could copy color B // If texture destination isn't synchronized, |secondDevice| could copy color B
// into the texture first, then |device| writes color A // into the texture first, then |device| writes color A
TEST_P(VulkanImageWrappingUsageTests, CopyTextureToTextureDstSync) { TEST_P(VulkanImageWrappingUsageTests, CopyTextureToTextureDstSync) {
DAWN_SKIP_TEST_IF(UsesWire() || IsIntel()); DAWN_SKIP_TEST_IF(UsesWire());
// Import the image on |device| // Import the image on |device|
wgpu::Texture wrappedTexture = WrapVulkanImage( wgpu::Texture wrappedTexture = WrapVulkanImage(
@ -633,7 +631,7 @@ TEST_P(VulkanImageWrappingUsageTests, CopyTextureToTextureDstSync) {
// Issue a copy of the imported texture inside |device| to |copyDstBuffer| // Issue a copy of the imported texture inside |device| to |copyDstBuffer|
// Verify the clear color from |secondDevice| is visible in |copyDstBuffer| // Verify the clear color from |secondDevice| is visible in |copyDstBuffer|
TEST_P(VulkanImageWrappingUsageTests, CopyTextureToBufferSrcSync) { TEST_P(VulkanImageWrappingUsageTests, CopyTextureToBufferSrcSync) {
DAWN_SKIP_TEST_IF(UsesWire() || IsIntel()); DAWN_SKIP_TEST_IF(UsesWire());
// Import the image on |secondDevice| // Import the image on |secondDevice|
wgpu::Texture wrappedTexture = wgpu::Texture wrappedTexture =
@ -694,7 +692,7 @@ TEST_P(VulkanImageWrappingUsageTests, CopyTextureToBufferSrcSync) {
// If texture destination isn't synchronized, |secondDevice| could copy color B // If texture destination isn't synchronized, |secondDevice| could copy color B
// into the texture first, then |device| writes color A // into the texture first, then |device| writes color A
TEST_P(VulkanImageWrappingUsageTests, CopyBufferToTextureDstSync) { TEST_P(VulkanImageWrappingUsageTests, CopyBufferToTextureDstSync) {
DAWN_SKIP_TEST_IF(UsesWire() || IsIntel()); DAWN_SKIP_TEST_IF(UsesWire());
// Import the image on |device| // Import the image on |device|
wgpu::Texture wrappedTexture = WrapVulkanImage( wgpu::Texture wrappedTexture = WrapVulkanImage(
@ -759,7 +757,7 @@ TEST_P(VulkanImageWrappingUsageTests, CopyBufferToTextureDstSync) {
// Issue second copy to |secondCopyDstTexture| // Issue second copy to |secondCopyDstTexture|
// Verify the clear color from |secondDevice| is visible in both copies // Verify the clear color from |secondDevice| is visible in both copies
TEST_P(VulkanImageWrappingUsageTests, DoubleTextureUsage) { TEST_P(VulkanImageWrappingUsageTests, DoubleTextureUsage) {
DAWN_SKIP_TEST_IF(UsesWire() || IsIntel()); DAWN_SKIP_TEST_IF(UsesWire());
// Import the image on |secondDevice| // Import the image on |secondDevice|
wgpu::Texture wrappedTexture = wgpu::Texture wrappedTexture =
@ -808,7 +806,7 @@ TEST_P(VulkanImageWrappingUsageTests, DoubleTextureUsage) {
// Copy C->D on device 1 (wait on C from previous op) // Copy C->D on device 1 (wait on C from previous op)
// Verify D has same color as A // Verify D has same color as A
TEST_P(VulkanImageWrappingUsageTests, ChainTextureCopy) { 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| since this test doesn't import it anywhere
close(defaultFd); close(defaultFd);
@ -912,7 +910,7 @@ TEST_P(VulkanImageWrappingUsageTests, ChainTextureCopy) {
// Tests a larger image is preserved when importing // Tests a larger image is preserved when importing
// TODO(http://crbug.com/dawn/206): This fails on AMD // TODO(http://crbug.com/dawn/206): This fails on AMD
TEST_P(VulkanImageWrappingUsageTests, LargerImage) { TEST_P(VulkanImageWrappingUsageTests, LargerImage) {
DAWN_SKIP_TEST_IF(UsesWire() || IsIntel() || IsAMD()); DAWN_SKIP_TEST_IF(UsesWire() || IsAMD());
close(defaultFd); close(defaultFd);