commit 2dd816661e4c912164aaaa8d14c73e83f4053427
author Chris Forbes <chrisforbes@google.com> Tue Dec 18 19:23:46 2018 +0000
committer Chris Forbes <chrisforbes@google.com> Tue Dec 18 19:23:57 2018 +0000
tree e62814d0132c7c5afcfb47cc581a98ff9d7c1838
parent ff49994437efca402fb25b8acce981a6edae24b6

[RESTRICT AUTOMERGE] Revert "libEGL: When driver doesn't understand P3, map sRGB-encoded P3 to sRGB"

This reverts commit ff49994437efca402fb25b8acce981a6edae24b6.

Reason for revert: while correct vs spec, this change interacts badly with various other bugs in the framework. Will fix in Q instead.

Change-Id: Iea52555527e15e86891e50cd38d9f43499d3651c

opengl/libs/EGL/eglApi.cpp

diff --git a/opengl/libs/EGL/eglApi.cpp b/opengl/libs/EGL/eglApi.cpp
index 40adf8e..42049a4 100644
--- a/opengl/libs/EGL/eglApi.cpp
+++ b/opengl/libs/EGL/eglApi.cpp
@@ -562,15 +562,6 @@
                     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]);