From d197db8da5eb7044275610b81b7fefad13f89329 Mon Sep 17 00:00:00 2001 From: Courtney Goeltzenleuchter Date: Tue, 5 Sep 2017 17:48:27 -0600 Subject: [PATCH] Check for EGL_KHR_gl_colorspace before using it Bug: 65376495 Test: adb -d shell am start \ -n com.drawelements.deqp/android.app.NativeActivity \ -e cmdLine '"deqp --deqp-case=dEQP-EGL.functional.wide_color.* \ --deqp-log-filename=/sdcard/dEQP-Log.qpa"' Change-Id: Ief654c998e93d72899225120b0ca1ab2fa3ca624 (cherry picked from commit 2cf32ffa6ee9daf7f58e34c1b874f4005e4b888f) --- modules/egl/teglWideColorTests.cpp | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/modules/egl/teglWideColorTests.cpp b/modules/egl/teglWideColorTests.cpp index 9b57abd..d6a8549 100644 --- a/modules/egl/teglWideColorTests.cpp +++ b/modules/egl/teglWideColorTests.cpp @@ -100,6 +100,7 @@ public: void init (void); void deinit (void); void checkPixelFloatSupport (void); + void checkColorSpaceSupport (void); void checkDisplayP3Support (void); void checkDisplayP3LinearSupport (void); void check1010102Support (void); @@ -291,6 +292,14 @@ void WideColorTest::checkPixelFloatSupport (void) TCU_THROW(NotSupportedError, "EGL_EXT_pixel_format_float is not supported"); } +void WideColorTest::checkColorSpaceSupport (void) +{ + const Library& egl = m_eglTestCtx.getLibrary(); + + if (!eglu::hasExtension(egl, m_eglDisplay, "EGL_KHR_gl_colorspace")) + TCU_THROW(NotSupportedError, "EGL_KHR_gl_colorspace is not supported"); +} + void WideColorTest::checkDisplayP3Support (void) { const Library& egl = m_eglTestCtx.getLibrary(); @@ -609,6 +618,9 @@ void WideColorSurfaceTest::init (void) TCU_THROW(NotSupportedError, "EGL_KHR_gl_colorspace is not supported"); switch (m_colorSpace) { + case EGL_GL_COLORSPACE_SRGB_KHR: + checkColorSpaceSupport(); + break; case EGL_GL_COLORSPACE_DISPLAY_P3_EXT: checkDisplayP3Support(); break; -- 2.7.4