From 0d4e616c35fd3cbad82eb3c1f0a604dbbc6c8662 Mon Sep 17 00:00:00 2001 From: Courtney Goeltzenleuchter Date: Mon, 11 Sep 2017 13:06:48 -0600 Subject: [PATCH] Fix handling of EGL_NONE as color space Color space of EGL_NONE was getting passed down and driver threw EGL_BAD_ATTRIBUTE in response. Issue was caused when changing the colorspace from nullptr to EGL_NONE, missed a couple of places that needed to test against EGL_NONE instead of nullptr. 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: If8812725be9d3858bf610c647ba53ff38944dd50 --- modules/egl/teglWideColorTests.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/egl/teglWideColorTests.cpp b/modules/egl/teglWideColorTests.cpp index d6a8549..b565fec 100644 --- a/modules/egl/teglWideColorTests.cpp +++ b/modules/egl/teglWideColorTests.cpp @@ -1125,7 +1125,7 @@ void WideColorSurfaceTest::executeTest (void) attribs.push_back(128); attribs.push_back(EGL_HEIGHT); attribs.push_back(128); - if (m_colorSpace) + if (m_colorSpace != EGL_NONE) { attribs.push_back(EGL_GL_COLORSPACE_KHR); attribs.push_back(m_colorSpace); @@ -1153,7 +1153,7 @@ void WideColorSurfaceTest::executeTest (void) de::UniquePtr window (windowFactory.createWindow(&nativeDisplay, m_eglDisplay, m_eglConfig, DE_NULL, eglu::WindowParams(128, 128, eglu::parseWindowVisibility(m_testCtx.getCommandLine())))); std::vector attribs; - if (m_colorSpace) + if (m_colorSpace != EGL_NONE) { attribs.push_back(EGL_GL_COLORSPACE_KHR); attribs.push_back(m_colorSpace); -- 2.7.4