Skip to content

A
angle
Commit 0b5a4a49 by Corentin Wallez
Options

EGLContextCompatibilityTest: check for suppression only when a context is bound.

Otherwise glGetString(GL_RENDERER) returns "ANGLE" and doesn't provide information on the vendor. BUG=angleproject:892 Change-Id: I01899ca78656aaa8db860829c78bf3c61c355eae Reviewed-on: https://chromium-review.googlesource.com/284051Reviewed-by: 's avatarGeoff Lang <geofflang@chromium.org> Reviewed-by: 's avatarJamie Madill <jmadill@chromium.org> Tested-by: 's avatarCorentin Wallez <cwallez@chromium.org>
parent d3dfda2b
Showing with 9 additions and 36 deletions
src/tests/egl_tests/EGLContextCompatibilityTest.cpp
......@@ -175,6 +175,15 @@ class EGLContextCompatibilityTest : public ANGLETest
eglMakeCurrent(mDisplay, surface, surface, context);
ASSERT_EGL_SUCCESS();
#ifdef ANGLE_PLATFORM_LINUX
// TODO(cwallez): figure out why this is broken on Linux/AMD.
if (isAMD() && getPlatformRenderer() == EGL_PLATFORM_ANGLE_TYPE_OPENGL_ANGLE)
{
eglMakeCurrent(mDisplay, EGL_NO_SURFACE, EGL_NO_SURFACE, EGL_NO_CONTEXT);
return;
}
#endif
glViewport(0, 0, 500, 500);
glClearColor(0.0f, 0.0f, 1.0f, 1.0f);
glClear(GL_COLOR_BUFFER_BIT);
......@@ -200,15 +209,6 @@ class EGLContextCompatibilityTest : public ANGLETest
// same config can render.
TEST_P(EGLContextCompatibilityTest, WindowSameConfig)
{
// TODO(cwallez): figure out why this is broken on Linux/AMD.
#ifdef ANGLE_PLATFORM_LINUX
if (isAMD() && getPlatformRenderer() == EGL_PLATFORM_ANGLE_TYPE_OPENGL_ANGLE)
{
std::cout << "Test skipped on Linux AMD on OpenGL." << std::endl;
return;
}
#endif
for (size_t i = 0; i < mConfigs.size(); i++)
{
EGLConfig config = mConfigs[i];
......@@ -228,15 +228,6 @@ TEST_P(EGLContextCompatibilityTest, WindowSameConfig)
// same config can render.
TEST_P(EGLContextCompatibilityTest, PbufferSameConfig)
{
// TODO(cwallez): figure out why this is broken on Linux/AMD.
#ifdef ANGLE_PLATFORM_LINUX
if (isAMD() && getPlatformRenderer() == EGL_PLATFORM_ANGLE_TYPE_OPENGL_ANGLE)
{
std::cout << "Test skipped on Linux AMD on OpenGL." << std::endl;
return;
}
#endif
for (size_t i = 0; i < mConfigs.size(); i++)
{
EGLConfig config = mConfigs[i];
......@@ -256,15 +247,6 @@ TEST_P(EGLContextCompatibilityTest, PbufferSameConfig)
// config works or errors according to the EGL compatibility rules
TEST_P(EGLContextCompatibilityTest, WindowDifferentConfig)
{
// TODO(cwallez): figure out why this is broken on Linux/AMD.
#ifdef ANGLE_PLATFORM_LINUX
if (isAMD() && getPlatformRenderer() == EGL_PLATFORM_ANGLE_TYPE_OPENGL_ANGLE)
{
std::cout << "Test skipped on Linux AMD on OpenGL." << std::endl;
return;
}
#endif
for (size_t i = 0; i < mConfigs.size(); i++)
{
EGLConfig config1 = mConfigs[i];
......@@ -289,15 +271,6 @@ TEST_P(EGLContextCompatibilityTest, WindowDifferentConfig)
// config works or errors according to the EGL compatibility rules
TEST_P(EGLContextCompatibilityTest, PbufferDifferentConfig)
{
// TODO(cwallez): figure out why this is broken on Linux/AMD.
#ifdef ANGLE_PLATFORM_LINUX
if (isAMD() && getPlatformRenderer() == EGL_PLATFORM_ANGLE_TYPE_OPENGL_ANGLE)
{
std::cout << "Test skipped on Linux AMD on OpenGL." << std::endl;
return;
}
#endif
for (size_t i = 0; i < mConfigs.size(); i++)
{
EGLConfig config1 = mConfigs[i];
......
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