From c449dd67f7be85dd3ff1dd8655eeb4603507ad48 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Mika=20Isoj=C3=A4rvi?= Date: Thu, 28 Jan 2016 10:39:41 -0800 Subject: [PATCH] Check also client extensions in eglGetProcAddress tests. Bug: 24172822 Change-Id: I9764bb09d1a6171fccba0ab3eb5fedda83db374b --- modules/egl/teglGetProcAddressTests.cpp | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/modules/egl/teglGetProcAddressTests.cpp b/modules/egl/teglGetProcAddressTests.cpp index 5b065d1..4c620ca 100644 --- a/modules/egl/teglGetProcAddressTests.cpp +++ b/modules/egl/teglGetProcAddressTests.cpp @@ -124,10 +124,25 @@ GetProcAddressCase::~GetProcAddressCase (void) void GetProcAddressCase::init (void) { + try + { + m_supported = eglu::getClientExtensions(m_eglTestCtx.getLibrary()); + } + catch (const eglu::Error& error) + { + // EGL_BAD_DISPLAY is generated if client extensions are not supported. + if (error.getError() != EGL_BAD_DISPLAY) + throw; + } + DE_ASSERT(m_display == EGL_NO_DISPLAY); - m_display = eglu::getAndInitDisplay(m_eglTestCtx.getNativeDisplay()); - m_supported = eglu::getDisplayExtensions(m_eglTestCtx.getLibrary(), m_display); + m_display = eglu::getAndInitDisplay(m_eglTestCtx.getNativeDisplay()); + + { + const std::vector displayExtensios = eglu::getDisplayExtensions(m_eglTestCtx.getLibrary(), m_display); + m_supported.insert(m_supported.end(), displayExtensios.begin(), displayExtensios.end()); + } m_testCtx.setTestResult(QP_TEST_RESULT_PASS, "Pass"); } -- 2.7.4