commit 48320ee9d2ae27ce7429330908e17051f23445fe
author Chris Forbes <chrisforbes@google.com> Mon Oct 22 15:47:31 2018 -0700
committer android-build-merger <android-build-merger@google.com> Mon Oct 22 15:47:31 2018 -0700
tree b791eced4874304037b8c799c4ff94190fd0f42e
parent 4b66bd3b53d35a3b8197d1f0991e3ac5a280a822
parent c03273439973d285321864636b601dd269ad5b61

Merge "libEGL: When driver doesn't understand P3, map sRGB-encoded P3 to sRGB"
am: c032734399

Change-Id: I962acc74f06fd6642a0c39b72fbb19ead0299385

opengl/libs/EGL/eglApi.cpp

diff --git a/opengl/libs/EGL/eglApi.cpp b/opengl/libs/EGL/eglApi.cpp
index 42049a4..40adf8e 100644
--- a/opengl/libs/EGL/eglApi.cpp
+++ b/opengl/libs/EGL/eglApi.cpp
@@ -562,6 +562,15 @@
                     break;
                 }
             }
+
+            // If the driver doesn't understand it, we should map sRGB-encoded P3 to
+            // sRGB rather than just dropping the colorspace on the floor.
+            // For this format, the driver is expected to apply the sRGB
+            // transfer function during framebuffer operations.
+            if (!copyAttribute && attr[1] == EGL_GL_COLORSPACE_DISPLAY_P3_EXT) {
+                strippedAttribList->push_back(attr[0]);
+                strippedAttribList->push_back(EGL_GL_COLORSPACE_SRGB_KHR);
+            }
         }
         if (copyAttribute) {
             strippedAttribList->push_back(attr[0]);