Commit f98f18f6 by Yuly Novikov Committed by Commit Bot

Remove Nexus 6P expectations

Bot decommissioned in crrev.com/c/2541579 Bug: chromium:1148989, angleproject:5280, angleproject:3726 Bug: angleproject:2641, angleproject:3264, angleproject:2114 Bug: angleproject:3464, angleproject:4991, angleproject:1415 Bug: angleproject:2407, angleproject:1427, angleproject:4215 Bug: angleproject:1429, angleproject:5069, chromium:998503 Change-Id: I1b268fdbcf6465aef447e90e470c1a011c7b3747 Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/2545892Reviewed-by: 's avatarJamie Madill <jmadill@chromium.org> Commit-Queue: Yuly Novikov <ynovikov@chromium.org>
parent 61a117fa
...@@ -1198,7 +1198,7 @@ TEST_P(EGLSurfaceTest, RobustResourceInitAndEmulatedAlpha) ...@@ -1198,7 +1198,7 @@ TEST_P(EGLSurfaceTest, RobustResourceInitAndEmulatedAlpha)
ANGLE_SKIP_TEST_IF(IsNVIDIA() && isGLRenderer() && IsLinux()); ANGLE_SKIP_TEST_IF(IsNVIDIA() && isGLRenderer() && IsLinux());
// http://anglebug.com/5280 // http://anglebug.com/5280
ANGLE_SKIP_TEST_IF(IsAndroid() && (IsNexus5X() || IsNexus6P()) && isGLESRenderer()); ANGLE_SKIP_TEST_IF(IsAndroid() && IsNexus5X() && isGLESRenderer());
initializeDisplay(); initializeDisplay();
ASSERT_NE(mDisplay, EGL_NO_DISPLAY); ASSERT_NE(mDisplay, EGL_NO_DISPLAY);
......
...@@ -193,9 +193,6 @@ TEST_P(AtomicCounterBufferTest31, AtomicCounterBufferRangeRead) ...@@ -193,9 +193,6 @@ TEST_P(AtomicCounterBufferTest31, AtomicCounterBufferRangeRead)
// http://anglebug.com/3726 // http://anglebug.com/3726
ANGLE_SKIP_TEST_IF(IsNexus5X()); ANGLE_SKIP_TEST_IF(IsNexus5X());
// http://anglebug.com/3726
ANGLE_SKIP_TEST_IF(IsNexus6P());
// Skipping due to a bug on the Qualcomm Vulkan Android driver. // Skipping due to a bug on the Qualcomm Vulkan Android driver.
// http://anglebug.com/3726 // http://anglebug.com/3726
ANGLE_SKIP_TEST_IF(IsAndroid() && IsVulkan()); ANGLE_SKIP_TEST_IF(IsAndroid() && IsVulkan());
......
...@@ -419,7 +419,7 @@ void AttributeLayoutTest::GetTestCases(void) ...@@ -419,7 +419,7 @@ void AttributeLayoutTest::GetTestCases(void)
{ {
mTestCases.push_back({SInt(M0, 0, 40, mCoord), UInt(M0, 16, 40, mColor)}); mTestCases.push_back({SInt(M0, 0, 40, mCoord), UInt(M0, 16, 40, mColor)});
// Fails on Nexus devices (anglebug.com/2641) // Fails on Nexus devices (anglebug.com/2641)
if (!IsNexus5X() && !IsNexus6P()) if (!IsNexus5X())
mTestCases.push_back({NormSInt(M0, 0, 40, mCoord), NormUInt(M0, 16, 40, mColor)}); mTestCases.push_back({NormSInt(M0, 0, 40, mCoord), NormUInt(M0, 16, 40, mColor)});
} }
} }
......
...@@ -886,7 +886,7 @@ TEST_P(GLSLTest_ES3, GLVertexIDOffsetFiveDrawArray) ...@@ -886,7 +886,7 @@ TEST_P(GLSLTest_ES3, GLVertexIDOffsetFiveDrawArray)
// http://anglebug.com/4092 // http://anglebug.com/4092
ANGLE_SKIP_TEST_IF(isSwiftshader()); ANGLE_SKIP_TEST_IF(isSwiftshader());
// Bug in Nexus drivers, offset does not work. (anglebug.com/3264) // Bug in Nexus drivers, offset does not work. (anglebug.com/3264)
ANGLE_SKIP_TEST_IF((IsNexus5X() || IsNexus6P()) && IsOpenGLES()); ANGLE_SKIP_TEST_IF(IsNexus5X() && IsOpenGLES());
constexpr int kStartIndex = 5; constexpr int kStartIndex = 5;
constexpr int kArrayLength = 5; constexpr int kArrayLength = 5;
...@@ -5219,7 +5219,7 @@ TEST_P(GLSLTest_ES3, VaryingMatrices) ...@@ -5219,7 +5219,7 @@ TEST_P(GLSLTest_ES3, VaryingMatrices)
TEST_P(GLSLTest, StructsWithSamplersAsFunctionArg) TEST_P(GLSLTest, StructsWithSamplersAsFunctionArg)
{ {
// Shader failed to compile on Nexus devices. http://anglebug.com/2114 // Shader failed to compile on Nexus devices. http://anglebug.com/2114
ANGLE_SKIP_TEST_IF((IsNexus5X() || IsNexus6P()) && IsAdreno() && IsOpenGLES()); ANGLE_SKIP_TEST_IF(IsNexus5X() && IsAdreno() && IsOpenGLES());
const char kFragmentShader[] = R"(precision mediump float; const char kFragmentShader[] = R"(precision mediump float;
struct S { sampler2D samplerMember; }; struct S { sampler2D samplerMember; };
...@@ -5311,7 +5311,7 @@ void main() ...@@ -5311,7 +5311,7 @@ void main()
TEST_P(GLSLTest, ArrayOfStructsWithSamplersAsFunctionArg) TEST_P(GLSLTest, ArrayOfStructsWithSamplersAsFunctionArg)
{ {
// Shader failed to compile on Nexus devices. http://anglebug.com/2114 // Shader failed to compile on Nexus devices. http://anglebug.com/2114
ANGLE_SKIP_TEST_IF((IsNexus5X() || IsNexus6P()) && IsAdreno() && IsOpenGLES()); ANGLE_SKIP_TEST_IF(IsNexus5X() && IsAdreno() && IsOpenGLES());
constexpr char kFS[] = constexpr char kFS[] =
"precision mediump float;\n" "precision mediump float;\n"
...@@ -5362,7 +5362,7 @@ TEST_P(GLSLTest, ArrayOfStructsWithSamplersAsFunctionArg) ...@@ -5362,7 +5362,7 @@ TEST_P(GLSLTest, ArrayOfStructsWithSamplersAsFunctionArg)
TEST_P(GLSLTest, StructWithSamplerArrayAsFunctionArg) TEST_P(GLSLTest, StructWithSamplerArrayAsFunctionArg)
{ {
// Shader failed to compile on Nexus devices. http://anglebug.com/2114 // Shader failed to compile on Nexus devices. http://anglebug.com/2114
ANGLE_SKIP_TEST_IF((IsNexus5X() || IsNexus6P()) && IsAdreno() && IsOpenGLES()); ANGLE_SKIP_TEST_IF(IsNexus5X() && IsAdreno() && IsOpenGLES());
// TODO(jmadill): Fix on Android/vulkan if possible. http://anglebug.com/2703 // TODO(jmadill): Fix on Android/vulkan if possible. http://anglebug.com/2703
ANGLE_SKIP_TEST_IF(IsAndroid() && IsVulkan()); ANGLE_SKIP_TEST_IF(IsAndroid() && IsVulkan());
...@@ -5416,7 +5416,7 @@ TEST_P(GLSLTest, StructWithSamplerArrayAsFunctionArg) ...@@ -5416,7 +5416,7 @@ TEST_P(GLSLTest, StructWithSamplerArrayAsFunctionArg)
TEST_P(GLSLTest, NestedStructsWithSamplersAsFunctionArg) TEST_P(GLSLTest, NestedStructsWithSamplersAsFunctionArg)
{ {
// Shader failed to compile on Nexus devices. http://anglebug.com/2114 // Shader failed to compile on Nexus devices. http://anglebug.com/2114
ANGLE_SKIP_TEST_IF((IsNexus5X() || IsNexus6P()) && IsAdreno() && IsOpenGLES()); ANGLE_SKIP_TEST_IF(IsNexus5X() && IsAdreno() && IsOpenGLES());
// TODO(anglebug.com/5360): Failing on ARM-based Apple DTKs. // TODO(anglebug.com/5360): Failing on ARM-based Apple DTKs.
ANGLE_SKIP_TEST_IF(IsOSX() && IsARM64() && IsDesktopOpenGL()); ANGLE_SKIP_TEST_IF(IsOSX() && IsARM64() && IsDesktopOpenGL());
...@@ -5470,7 +5470,7 @@ void main() ...@@ -5470,7 +5470,7 @@ void main()
TEST_P(GLSLTest, CompoundStructsWithSamplersAsFunctionArg) TEST_P(GLSLTest, CompoundStructsWithSamplersAsFunctionArg)
{ {
// Shader failed to compile on Nexus devices. http://anglebug.com/2114 // Shader failed to compile on Nexus devices. http://anglebug.com/2114
ANGLE_SKIP_TEST_IF((IsNexus5X() || IsNexus6P()) && IsAdreno() && IsOpenGLES()); ANGLE_SKIP_TEST_IF(IsNexus5X() && IsAdreno() && IsOpenGLES());
const char kFragmentShader[] = R"(precision mediump float; const char kFragmentShader[] = R"(precision mediump float;
struct S { sampler2D samplerMember; bool b; }; struct S { sampler2D samplerMember; bool b; };
...@@ -5522,7 +5522,7 @@ void main() ...@@ -5522,7 +5522,7 @@ void main()
TEST_P(GLSLTest, NestedCompoundStructsWithSamplersAsFunctionArg) TEST_P(GLSLTest, NestedCompoundStructsWithSamplersAsFunctionArg)
{ {
// Shader failed to compile on Nexus devices. http://anglebug.com/2114 // Shader failed to compile on Nexus devices. http://anglebug.com/2114
ANGLE_SKIP_TEST_IF((IsNexus5X() || IsNexus6P()) && IsAdreno() && IsOpenGLES()); ANGLE_SKIP_TEST_IF(IsNexus5X() && IsAdreno() && IsOpenGLES());
// TODO(anglebug.com/5360): Failing on ARM-based Apple DTKs. // TODO(anglebug.com/5360): Failing on ARM-based Apple DTKs.
ANGLE_SKIP_TEST_IF(IsOSX() && IsARM64() && IsDesktopOpenGL()); ANGLE_SKIP_TEST_IF(IsOSX() && IsARM64() && IsDesktopOpenGL());
...@@ -5590,7 +5590,7 @@ void main() ...@@ -5590,7 +5590,7 @@ void main()
TEST_P(GLSLTest, MoreNestedCompoundStructsWithSamplersAsFunctionArg) TEST_P(GLSLTest, MoreNestedCompoundStructsWithSamplersAsFunctionArg)
{ {
// Shader failed to compile on Nexus devices. http://anglebug.com/2114 // Shader failed to compile on Nexus devices. http://anglebug.com/2114
ANGLE_SKIP_TEST_IF((IsNexus5X() || IsNexus6P()) && IsAdreno() && IsOpenGLES()); ANGLE_SKIP_TEST_IF(IsNexus5X() && IsAdreno() && IsOpenGLES());
// TODO(anglebug.com/5360): Failing on ARM-based Apple DTKs. // TODO(anglebug.com/5360): Failing on ARM-based Apple DTKs.
ANGLE_SKIP_TEST_IF(IsOSX() && IsARM64() && IsDesktopOpenGL()); ANGLE_SKIP_TEST_IF(IsOSX() && IsARM64() && IsDesktopOpenGL());
......
...@@ -55,7 +55,7 @@ class MultisampleTest : public ANGLETestWithParam<MultisampleTestParams> ...@@ -55,7 +55,7 @@ class MultisampleTest : public ANGLETestWithParam<MultisampleTestParams>
// Nexus 5X and 6P fail to eglMakeCurrent with a config they advertise they support. // Nexus 5X and 6P fail to eglMakeCurrent with a config they advertise they support.
// http://anglebug.com/3464 // http://anglebug.com/3464
ANGLE_SKIP_TEST_IF(IsNexus5X() || IsNexus6P()); ANGLE_SKIP_TEST_IF(IsNexus5X());
// Find a config that uses RGBA8 and allows 4x multisampling. // Find a config that uses RGBA8 and allows 4x multisampling.
const EGLint configAttributes[] = {EGL_SURFACE_TYPE, const EGLint configAttributes[] = {EGL_SURFACE_TYPE,
......
...@@ -758,7 +758,7 @@ TEST_P(ProgramBinaryTest, SRGBDecodeWithSamplerAndTexelFetchTest) ...@@ -758,7 +758,7 @@ TEST_P(ProgramBinaryTest, SRGBDecodeWithSamplerAndTexelFetchTest)
ANGLE_SKIP_TEST_IF(IsOpenGL() && IsIntel() && IsWindows()); ANGLE_SKIP_TEST_IF(IsOpenGL() && IsIntel() && IsWindows());
ANGLE_SKIP_TEST_IF(IsOpenGL() && IsAMD() && IsWindows()); ANGLE_SKIP_TEST_IF(IsOpenGL() && IsAMD() && IsWindows());
ANGLE_SKIP_TEST_IF(IsOpenGL() && (IsNVIDIA() || IsARM64()) && IsOSX()); ANGLE_SKIP_TEST_IF(IsOpenGL() && (IsNVIDIA() || IsARM64()) && IsOSX());
ANGLE_SKIP_TEST_IF(IsOpenGLES() && (IsNexus5X() || IsNexus6P())); ANGLE_SKIP_TEST_IF(IsOpenGLES() && IsNexus5X());
constexpr char kVS[] = constexpr char kVS[] =
"#version 300 es\n" "#version 300 es\n"
......
...@@ -424,7 +424,7 @@ TEST_P(ReadPixelsPBOTest, SubDataPreservesContents) ...@@ -424,7 +424,7 @@ TEST_P(ReadPixelsPBOTest, SubDataPreservesContents)
TEST_P(ReadPixelsPBOTest, SubDataOffsetPreservesContents) TEST_P(ReadPixelsPBOTest, SubDataOffsetPreservesContents)
{ {
// anglebug.com/1415 // anglebug.com/1415
ANGLE_SKIP_TEST_IF((IsNexus5X() || IsNexus6P()) && IsAdreno() && IsOpenGLES()); ANGLE_SKIP_TEST_IF(IsNexus5X() && IsAdreno() && IsOpenGLES());
// anglebug.com/2185 // anglebug.com/2185
ANGLE_SKIP_TEST_IF(IsOSX() && IsNVIDIA() && IsDesktopOpenGL()); ANGLE_SKIP_TEST_IF(IsOSX() && IsNVIDIA() && IsDesktopOpenGL());
......
...@@ -597,7 +597,7 @@ TEST_P(RobustResourceInitTest, TexImageThenSubImage) ...@@ -597,7 +597,7 @@ TEST_P(RobustResourceInitTest, TexImageThenSubImage)
ANGLE_SKIP_TEST_IF(!hasGLExtension()); ANGLE_SKIP_TEST_IF(!hasGLExtension());
// http://anglebug.com/2407, but only fails on Nexus devices // http://anglebug.com/2407, but only fails on Nexus devices
ANGLE_SKIP_TEST_IF((IsNexus5X() || IsNexus6P()) && IsOpenGLES()); ANGLE_SKIP_TEST_IF(IsNexus5X() && IsOpenGLES());
// Put some data into the texture // Put some data into the texture
GLTexture tex; GLTexture tex;
...@@ -811,7 +811,7 @@ TEST_P(RobustResourceInitTest, ReadingPartiallyInitializedTexture) ...@@ -811,7 +811,7 @@ TEST_P(RobustResourceInitTest, ReadingPartiallyInitializedTexture)
ANGLE_SKIP_TEST_IF(!hasGLExtension()); ANGLE_SKIP_TEST_IF(!hasGLExtension());
// http://anglebug.com/2407, but only fails on Nexus devices // http://anglebug.com/2407, but only fails on Nexus devices
ANGLE_SKIP_TEST_IF((IsNexus5X() || IsNexus6P()) && IsOpenGLES()); ANGLE_SKIP_TEST_IF(IsNexus5X() && IsOpenGLES());
GLTexture tex; GLTexture tex;
setupTexture(&tex); setupTexture(&tex);
...@@ -1551,7 +1551,7 @@ TEST_P(RobustResourceInitTest, MaskedStencilClear) ...@@ -1551,7 +1551,7 @@ TEST_P(RobustResourceInitTest, MaskedStencilClear)
ANGLE_SKIP_TEST_IF(IsD3D11_FL93()); ANGLE_SKIP_TEST_IF(IsD3D11_FL93());
// http://anglebug.com/2407, but only fails on Nexus devices // http://anglebug.com/2407, but only fails on Nexus devices
ANGLE_SKIP_TEST_IF((IsNexus5X() || IsNexus6P()) && IsOpenGLES()); ANGLE_SKIP_TEST_IF(IsNexus5X() && IsOpenGLES());
auto clearFunc = [](GLint clearValue) { auto clearFunc = [](GLint clearValue) {
glClearColor(0.0f, 0.0f, 0.0f, 1.0f); glClearColor(0.0f, 0.0f, 0.0f, 1.0f);
...@@ -1573,7 +1573,7 @@ TEST_P(RobustResourceInitTestES3, MaskedStencilClearBuffer) ...@@ -1573,7 +1573,7 @@ TEST_P(RobustResourceInitTestES3, MaskedStencilClearBuffer)
ANGLE_SKIP_TEST_IF(IsLinux() && IsOpenGL()); ANGLE_SKIP_TEST_IF(IsLinux() && IsOpenGL());
// http://anglebug.com/2407, but only fails on Nexus devices // http://anglebug.com/2407, but only fails on Nexus devices
ANGLE_SKIP_TEST_IF((IsNexus5X() || IsNexus6P()) && IsOpenGLES()); ANGLE_SKIP_TEST_IF(IsNexus5X() && IsOpenGLES());
auto clearFunc = [](GLint clearValue) { auto clearFunc = [](GLint clearValue) {
glClearColor(0.0f, 0.0f, 0.0f, 1.0f); glClearColor(0.0f, 0.0f, 0.0f, 1.0f);
......
...@@ -5213,7 +5213,7 @@ TEST_P(SamplerInStructTest, SamplerInStruct) ...@@ -5213,7 +5213,7 @@ TEST_P(SamplerInStructTest, SamplerInStruct)
TEST_P(SamplerInStructAsFunctionParameterTest, SamplerInStructAsFunctionParameter) TEST_P(SamplerInStructAsFunctionParameterTest, SamplerInStructAsFunctionParameter)
{ {
// Fails on Nexus 5X due to a driver bug. http://anglebug.com/1427 // Fails on Nexus 5X due to a driver bug. http://anglebug.com/1427
ANGLE_SKIP_TEST_IF((IsNexus5X() || IsNexus6P()) && IsOpenGLES()); ANGLE_SKIP_TEST_IF(IsNexus5X() && IsOpenGLES());
runSamplerInStructTest(); runSamplerInStructTest();
} }
...@@ -5223,7 +5223,7 @@ TEST_P(SamplerInStructAsFunctionParameterTest, SamplerInStructAsFunctionParamete ...@@ -5223,7 +5223,7 @@ TEST_P(SamplerInStructAsFunctionParameterTest, SamplerInStructAsFunctionParamete
TEST_P(SamplerInStructArrayAsFunctionParameterTest, SamplerInStructArrayAsFunctionParameter) TEST_P(SamplerInStructArrayAsFunctionParameterTest, SamplerInStructArrayAsFunctionParameter)
{ {
// Fails on Nexus 5X due to a driver bug. http://anglebug.com/1427 // Fails on Nexus 5X due to a driver bug. http://anglebug.com/1427
ANGLE_SKIP_TEST_IF((IsNexus5X() || IsNexus6P()) && IsOpenGLES()); ANGLE_SKIP_TEST_IF(IsNexus5X() && IsOpenGLES());
runSamplerInStructTest(); runSamplerInStructTest();
} }
...@@ -5233,7 +5233,7 @@ TEST_P(SamplerInStructArrayAsFunctionParameterTest, SamplerInStructArrayAsFuncti ...@@ -5233,7 +5233,7 @@ TEST_P(SamplerInStructArrayAsFunctionParameterTest, SamplerInStructArrayAsFuncti
TEST_P(SamplerInNestedStructAsFunctionParameterTest, SamplerInNestedStructAsFunctionParameter) TEST_P(SamplerInNestedStructAsFunctionParameterTest, SamplerInNestedStructAsFunctionParameter)
{ {
// Fails on Nexus 5X due to a driver bug. http://anglebug.com/1427 // Fails on Nexus 5X due to a driver bug. http://anglebug.com/1427
ANGLE_SKIP_TEST_IF((IsNexus5X() || IsNexus6P()) && IsOpenGLES()); ANGLE_SKIP_TEST_IF(IsNexus5X() && IsOpenGLES());
runSamplerInStructTest(); runSamplerInStructTest();
} }
...@@ -6357,7 +6357,7 @@ TEST_P(Texture2DNorm16TestES3, TextureNorm16RG16SNORMTextureTest) ...@@ -6357,7 +6357,7 @@ TEST_P(Texture2DNorm16TestES3, TextureNorm16RG16SNORMTextureTest)
TEST_P(Texture2DNorm16TestES3, TextureNorm16RGB16TextureTest) TEST_P(Texture2DNorm16TestES3, TextureNorm16RGB16TextureTest)
{ {
// (http://anglebug.com/4215) Driver bug on some Qualcomm Adreno gpu // (http://anglebug.com/4215) Driver bug on some Qualcomm Adreno gpu
ANGLE_SKIP_TEST_IF((IsNexus5X() || IsNexus6P()) && IsOpenGLES()); ANGLE_SKIP_TEST_IF(IsNexus5X() && IsOpenGLES());
testNorm16Texture(GL_RGB16_EXT, GL_RGB, GL_UNSIGNED_SHORT); testNorm16Texture(GL_RGB16_EXT, GL_RGB, GL_UNSIGNED_SHORT);
} }
...@@ -6365,7 +6365,7 @@ TEST_P(Texture2DNorm16TestES3, TextureNorm16RGB16TextureTest) ...@@ -6365,7 +6365,7 @@ TEST_P(Texture2DNorm16TestES3, TextureNorm16RGB16TextureTest)
TEST_P(Texture2DNorm16TestES3, TextureNorm16RGB16SNORMTextureTest) TEST_P(Texture2DNorm16TestES3, TextureNorm16RGB16SNORMTextureTest)
{ {
// (http://anglebug.com/4215) Driver bug on some Qualcomm Adreno gpu // (http://anglebug.com/4215) Driver bug on some Qualcomm Adreno gpu
ANGLE_SKIP_TEST_IF((IsNexus5X() || IsNexus6P()) && IsOpenGLES()); ANGLE_SKIP_TEST_IF(IsNexus5X() && IsOpenGLES());
testNorm16Texture(GL_RGB16_SNORM_EXT, GL_RGB, GL_SHORT); testNorm16Texture(GL_RGB16_SNORM_EXT, GL_RGB, GL_SHORT);
} }
...@@ -7023,7 +7023,7 @@ TEST_P(Texture2DFloatTestES2, TextureFloatRenderTest) ...@@ -7023,7 +7023,7 @@ TEST_P(Texture2DFloatTestES2, TextureFloatRenderTest)
TEST_P(Texture2DTestES3, UnpackSkipImages2D) TEST_P(Texture2DTestES3, UnpackSkipImages2D)
{ {
// Crashes on Nexus 5X due to a driver bug. http://anglebug.com/1429 // Crashes on Nexus 5X due to a driver bug. http://anglebug.com/1429
ANGLE_SKIP_TEST_IF((IsNexus5X() || IsNexus6P()) && IsOpenGLES()); ANGLE_SKIP_TEST_IF(IsNexus5X() && IsOpenGLES());
glBindTexture(GL_TEXTURE_2D, mTexture2D); glBindTexture(GL_TEXTURE_2D, mTexture2D);
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR); glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
......
...@@ -949,7 +949,7 @@ TEST_P(TransformFeedbackTest, OffsetResetOnBeginTransformFeedback) ...@@ -949,7 +949,7 @@ TEST_P(TransformFeedbackTest, OffsetResetOnBeginTransformFeedback)
ANGLE_SKIP_TEST_IF(IsOpenGL() && IsOSX() && IsAMD()); ANGLE_SKIP_TEST_IF(IsOpenGL() && IsOSX() && IsAMD());
// http://anglebug.com/5069 // http://anglebug.com/5069
ANGLE_SKIP_TEST_IF((IsNexus5X() || IsNexus6P()) && IsOpenGLES()); ANGLE_SKIP_TEST_IF(IsNexus5X() && IsOpenGLES());
// TODO(anglebug.com/4533) This fails after the upgrade to the 26.20.100.7870 driver. // TODO(anglebug.com/4533) This fails after the upgrade to the 26.20.100.7870 driver.
ANGLE_SKIP_TEST_IF(IsWindows() && IsIntel() && IsVulkan()); ANGLE_SKIP_TEST_IF(IsWindows() && IsIntel() && IsVulkan());
......
...@@ -518,14 +518,6 @@ void ANGLETestBase::ANGLETestSetUp() ...@@ -518,14 +518,6 @@ void ANGLETestBase::ANGLETestSetUp()
gPlatformContext.warningsAsErrors = false; gPlatformContext.warningsAsErrors = false;
gPlatformContext.currentTest = this; gPlatformContext.currentTest = this;
// TODO(geofflang): Nexus6P generates GL errors during initialization. Suppress error messages
// temporarily until enough logging is in place to figure out exactly which calls generate
// errors. http://crbug.com/998503
if (IsNexus6P())
{
gPlatformContext.ignoreMessages = true;
}
if (IsWindows()) if (IsWindows())
{ {
const auto &info = testing::UnitTest::GetInstance()->current_test_info(); const auto &info = testing::UnitTest::GetInstance()->current_test_info();
......
...@@ -288,11 +288,6 @@ bool IsNexus5X() ...@@ -288,11 +288,6 @@ bool IsNexus5X()
return IsAndroidDevice("Nexus 5X"); return IsAndroidDevice("Nexus 5X");
} }
bool IsNexus6P()
{
return IsAndroidDevice("Nexus 6P");
}
bool IsNexus9() bool IsNexus9()
{ {
return IsAndroidDevice("Nexus 9"); return IsAndroidDevice("Nexus 9");
...@@ -531,7 +526,7 @@ bool IsConfigAllowlisted(const SystemInfo &systemInfo, const PlatformParameters ...@@ -531,7 +526,7 @@ bool IsConfigAllowlisted(const SystemInfo &systemInfo, const PlatformParameters
// Nexus Android devices don't support backing 3.2 contexts // Nexus Android devices don't support backing 3.2 contexts
if (param.eglParameters.majorVersion == 3 && param.eglParameters.minorVersion == 2) if (param.eglParameters.majorVersion == 3 && param.eglParameters.minorVersion == 2)
{ {
if (IsNexus5X() || IsNexus6P()) if (IsNexus5X())
{ {
return false; return false;
} }
......
...@@ -33,7 +33,6 @@ bool IsARM64(); ...@@ -33,7 +33,6 @@ bool IsARM64();
// Android devices // Android devices
bool IsNexus5X(); bool IsNexus5X();
bool IsNexus6P();
bool IsNexus9(); bool IsNexus9();
bool IsPixelXL(); bool IsPixelXL();
bool IsPixel2(); bool IsPixel2();
......
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