Commit ecd3ebe9 by Jamie Madill Committed by Commit Bot

Temporarily disable SwiftShader on Windows 7.

A necesssary change in SwiftShader introduced a bug that was causing test timeouts. Disable SwiftShader so they can revert the change without breaking ANGLE. Bug: angleproject:3876 Change-Id: I4b841a4a28fa13947c24b72d856db38c9e0135cb Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/1815908Reviewed-by: 's avatarYuly Novikov <ynovikov@chromium.org> Commit-Queue: Jamie Madill <jmadill@chromium.org>
parent ee891ce3
...@@ -21,6 +21,7 @@ ...@@ -21,6 +21,7 @@
#include "util/system_utils.h" #include "util/system_utils.h"
#if defined(ANGLE_PLATFORM_WINDOWS) #if defined(ANGLE_PLATFORM_WINDOWS)
# include <VersionHelpers.h>
# include "util/windows/WGLWindow.h" # include "util/windows/WGLWindow.h"
#endif // defined(ANGLE_PLATFORM_WINDOWS) #endif // defined(ANGLE_PLATFORM_WINDOWS)
...@@ -177,6 +178,15 @@ bool IsWindows() ...@@ -177,6 +178,15 @@ bool IsWindows()
#endif #endif
} }
bool IsWindows7()
{
#if defined(ANGLE_PLATFORM_WINDOWS)
return ::IsWindows7OrGreater() && !::IsWindows8OrGreater();
#else
return false;
#endif
}
bool IsFuchsia() bool IsFuchsia()
{ {
#if defined(ANGLE_PLATFORM_FUCHSIA) #if defined(ANGLE_PLATFORM_FUCHSIA)
...@@ -262,6 +272,13 @@ bool IsConfigWhitelisted(const SystemInfo &systemInfo, const PlatformParameters ...@@ -262,6 +272,13 @@ 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.
// TODO(jmadill): Re-enable. http://anglebug.com/3876
if (param.eglParameters.deviceType ==
EGL_PLATFORM_ANGLE_DEVICE_TYPE_SWIFTSHADER_ANGLE)
{
return !IsWindows7();
}
return true; return true;
case EGL_PLATFORM_ANGLE_TYPE_OPENGLES_ANGLE: case EGL_PLATFORM_ANGLE_TYPE_OPENGLES_ANGLE:
// ES 3.1+ back-end is not supported properly. // ES 3.1+ back-end is not supported properly.
......
...@@ -23,6 +23,7 @@ bool IsLinux(); ...@@ -23,6 +23,7 @@ bool IsLinux();
bool IsOSX(); bool IsOSX();
bool IsOzone(); bool IsOzone();
bool IsWindows(); bool IsWindows();
bool IsWindows7();
bool IsFuchsia(); bool IsFuchsia();
// Android devices // Android devices
......
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