Skip to content

A
angle
Commit babe59ff by Yuly Novikov Committed by Commit Bot
Options

Temporarily disable SwiftShader everywhere.

Times out not only on Windows 7 but also Win10 Debug. Bug: angleproject:3876, chromium:1008100 Change-Id: I3c82d430fae09067a8247e3c4b03ff9c9b685c06 Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/1825538 Commit-Queue: Yuly Novikov <ynovikov@chromium.org> Commit-Queue: Jamie Madill <jmadill@chromium.org> Reviewed-by: 's avatarJamie Madill <jmadill@chromium.org>
parent 8007ca02
Showing with 2 additions and 2 deletions
src/tests/test_utils/angle_test_instantiate.cpp
...@@ -272,12 +272,12 @@ bool IsConfigWhitelisted(const SystemInfo &systemInfo, const PlatformParameters ...@@ -272,12 +272,12 @@ bool IsConfigWhitelisted(const SystemInfo &systemInfo, const PlatformParameters
case EGL_PLATFORM_ANGLE_TYPE_D3D11_ANGLE: case EGL_PLATFORM_ANGLE_TYPE_D3D11_ANGLE:
case EGL_PLATFORM_ANGLE_TYPE_OPENGL_ANGLE: case EGL_PLATFORM_ANGLE_TYPE_OPENGL_ANGLE:
case EGL_PLATFORM_ANGLE_TYPE_VULKAN_ANGLE: case EGL_PLATFORM_ANGLE_TYPE_VULKAN_ANGLE:
// SwiftShader temporarily disabled on Win7. // SwiftShader temporarily disabled.
// TODO(jmadill): Re-enable. http://anglebug.com/3876 // TODO(jmadill): Re-enable. http://anglebug.com/3876
if (param.eglParameters.deviceType == if (param.eglParameters.deviceType ==
EGL_PLATFORM_ANGLE_DEVICE_TYPE_SWIFTSHADER_ANGLE) EGL_PLATFORM_ANGLE_DEVICE_TYPE_SWIFTSHADER_ANGLE)
{ {
return !IsWindows7(); return false;
} }
return true; return true;
case EGL_PLATFORM_ANGLE_TYPE_OPENGLES_ANGLE: case EGL_PLATFORM_ANGLE_TYPE_OPENGLES_ANGLE:
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment