From 8406244e27c142ea56c7a934b09e0b1cdace6afd Mon Sep 17 00:00:00 2001 From: Yong He Date: Wed, 20 Oct 2021 07:18:03 -0700 Subject: Re-enable swiftshader. (#1984) Ignore some gfx unit tests when using swiftshader. Co-authored-by: Yong He --- tools/gfx-unit-test/get-buffer-resource-handle-test.cpp | 6 ++++++ tools/gfx-unit-test/get-cmd-buffer-handle-test.cpp | 7 ++++++- tools/gfx-unit-test/get-cmd-queue-handle-test.cpp | 7 ++++++- tools/gfx-unit-test/get-texture-resource-handle-test.cpp | 8 +++++++- 4 files changed, 25 insertions(+), 3 deletions(-) (limited to 'tools/gfx-unit-test') diff --git a/tools/gfx-unit-test/get-buffer-resource-handle-test.cpp b/tools/gfx-unit-test/get-buffer-resource-handle-test.cpp index 35ad167f2..1b7aaa439 100644 --- a/tools/gfx-unit-test/get-buffer-resource-handle-test.cpp +++ b/tools/gfx-unit-test/get-buffer-resource-handle-test.cpp @@ -85,6 +85,12 @@ namespace gfx_test { SLANG_IGNORE_TEST; } + // Ignore this test on swiftshader. Swiftshader seems to have a bug that causes the test + // to crash. + if (Slang::String(device->getDeviceInfo().adapterName).toLower().contains("swiftshader")) + { + SLANG_IGNORE_TEST; + } getBufferResourceHandleTestImpl(device, context); } diff --git a/tools/gfx-unit-test/get-cmd-buffer-handle-test.cpp b/tools/gfx-unit-test/get-cmd-buffer-handle-test.cpp index 62a00c3c2..97cb9a808 100644 --- a/tools/gfx-unit-test/get-cmd-buffer-handle-test.cpp +++ b/tools/gfx-unit-test/get-cmd-buffer-handle-test.cpp @@ -81,7 +81,12 @@ namespace gfx_test { SLANG_IGNORE_TEST; } - + // Ignore this test on swiftshader. Swiftshader seems to have a bug that causes the test + // to crash. + if (Slang::String(device->getDeviceInfo().adapterName).toLower().contains("swiftshader")) + { + SLANG_IGNORE_TEST; + } getBufferHandleTestImpl(device, context); } diff --git a/tools/gfx-unit-test/get-cmd-queue-handle-test.cpp b/tools/gfx-unit-test/get-cmd-queue-handle-test.cpp index 5e530e3f2..ad439e946 100644 --- a/tools/gfx-unit-test/get-cmd-queue-handle-test.cpp +++ b/tools/gfx-unit-test/get-cmd-queue-handle-test.cpp @@ -67,7 +67,12 @@ namespace gfx_test { SLANG_IGNORE_TEST; } - + // Ignore this test on swiftshader. Swiftshader seems to have a bug that causes the test + // to crash. + if (Slang::String(device->getDeviceInfo().adapterName).toLower().contains("swiftshader")) + { + SLANG_IGNORE_TEST; + } getQueueHandleTestImpl(device, context); } diff --git a/tools/gfx-unit-test/get-texture-resource-handle-test.cpp b/tools/gfx-unit-test/get-texture-resource-handle-test.cpp index 4883a28bd..4677bd97b 100644 --- a/tools/gfx-unit-test/get-texture-resource-handle-test.cpp +++ b/tools/gfx-unit-test/get-texture-resource-handle-test.cpp @@ -33,6 +33,7 @@ namespace gfx_test { SLANG_CHECK(handle != NULL); } + #if SLANG_WINDOWS_FAMILY else { @@ -77,7 +78,12 @@ namespace gfx_test { SLANG_IGNORE_TEST; } - + // Ignore this test on swiftshader. Swiftshader seems to have a bug that causes the test + // to crash. + if (Slang::String(device->getDeviceInfo().adapterName).toLower().contains("swiftshader")) + { + SLANG_IGNORE_TEST; + } getTextureResourceHandleTestImpl(device, context); } -- cgit v1.2.3