Commit a5a08b5e by Le Hoang Quyen Committed by Commit Bot

Metal: Enable end2end tests on Intel.

Bug: angleproject:4133 Bug: angleproject:2634 Change-Id: I3eff5ff81e908eec2990eb036728aa9878c8f802 Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/2329090 Commit-Queue: Jonah Ryan-Davis <jonahr@google.com> Reviewed-by: 's avatarJonah Ryan-Davis <jonahr@google.com> Reviewed-by: 's avatarJamie Madill <jmadill@chromium.org>
parent 4f7f4387
...@@ -873,6 +873,9 @@ TEST_P(DepthStencilFormatsTest, VerifyDepthStencilUploadData) ...@@ -873,6 +873,9 @@ TEST_P(DepthStencilFormatsTest, VerifyDepthStencilUploadData)
// http://anglebug.com/3689 // http://anglebug.com/3689
ANGLE_SKIP_TEST_IF(IsWindows() && IsVulkan() && IsAMD()); ANGLE_SKIP_TEST_IF(IsWindows() && IsVulkan() && IsAMD());
// http://anglebug.com/4908
ANGLE_SKIP_TEST_IF(IsIntel() && IsMetal());
bool shouldHaveTextureSupport = (IsGLExtensionEnabled("GL_OES_packed_depth_stencil") && bool shouldHaveTextureSupport = (IsGLExtensionEnabled("GL_OES_packed_depth_stencil") &&
IsGLExtensionEnabled("GL_OES_depth_texture")) || IsGLExtensionEnabled("GL_OES_depth_texture")) ||
(getClientMajorVersion() >= 3); (getClientMajorVersion() >= 3);
......
...@@ -6299,6 +6299,9 @@ TEST_P(Texture2DDepthTest, DepthTextureES2Compatibility) ...@@ -6299,6 +6299,9 @@ TEST_P(Texture2DDepthTest, DepthTextureES2Compatibility)
ANGLE_SKIP_TEST_IF(IsOpenGL() || IsOpenGLES()); ANGLE_SKIP_TEST_IF(IsOpenGL() || IsOpenGLES());
ANGLE_SKIP_TEST_IF(IsARM64() && IsWindows() && IsD3D()); ANGLE_SKIP_TEST_IF(IsARM64() && IsWindows() && IsD3D());
// http://anglebug.com/4908
ANGLE_SKIP_TEST_IF(IsIntel() && IsMetal());
// When the depth texture is specified with unsized internalformat implementations follow // When the depth texture is specified with unsized internalformat implementations follow
// OES_depth_texture behavior. Otherwise they follow GLES 3.0 behavior. // OES_depth_texture behavior. Otherwise they follow GLES 3.0 behavior.
testBehavior(false); testBehavior(false);
......
...@@ -409,10 +409,8 @@ bool IsConfigWhitelisted(const SystemInfo &systemInfo, const PlatformParameters ...@@ -409,10 +409,8 @@ bool IsConfigWhitelisted(const SystemInfo &systemInfo, const PlatformParameters
} }
return true; return true;
case EGL_PLATFORM_ANGLE_TYPE_METAL_ANGLE: case EGL_PLATFORM_ANGLE_TYPE_METAL_ANGLE:
if (!IsMetalRendererAvailable() || IsIntel(vendorID)) if (!IsMetalRendererAvailable())
{ {
// TODO(hqle): Intel metal tests seem to have problems. Disable for now.
// http://anglebug.com/4133
return false; return false;
} }
return true; return true;
......
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