diff options
5 files changed, 26 insertions, 6 deletions
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); } diff --git a/tools/gfx/vulkan/render-vk.cpp b/tools/gfx/vulkan/render-vk.cpp index e7ebf8040..03f193ca6 100644 --- a/tools/gfx/vulkan/render-vk.cpp +++ b/tools/gfx/vulkan/render-vk.cpp @@ -5854,9 +5854,7 @@ SlangResult VKDevice::initialize(const Desc& desc) SLANG_RETURN_ON_FAIL(RendererBase::initialize(desc)); SlangResult initDeviceResult = SLANG_OK; - // TODO(JS): HACK! Disable swiftshader for now - //for (int forceSoftware = 0; forceSoftware <= 1; forceSoftware++) - for (int forceSoftware = 0; forceSoftware <= 0; forceSoftware++) + for (int forceSoftware = 0; forceSoftware <= 1; forceSoftware++) { initDeviceResult = m_module.init(forceSoftware != 0); if (initDeviceResult != SLANG_OK) |