commit 1d4f7a281c8380c05c3e86998f8ff653e7e5470c
author Courtney Goeltzenleuchter <courtneygo@google.com> Fri May 05 13:30:25 2017 -0600
committer Courtney Goeltzenleuchter <courtneygo@google.com> Mon May 08 11:20:17 2017 -0600
tree d3ecee230499c3f39880b57a7f7a674d1b9f0b6c
parent bd32a5d7d27158cc31016fc1de39adf7ee2cd06f

Default dataspace must be UNKNOWN for compatibility

The first iteration of getColorSpaceAttribute would
cause the dataSpace to become HAL_DATASPACE_SRGB_LINEAR.
While technically correct, that's not what applications
are expecting. This change makes sure that we only
change the default if the application specifically asked
for the change. That keeps us backward compatible
behavior-wise.
Test: logcat and verify that we do not see SRGB_LINEAR
Bug: 37946330

Change-Id: I3265f53d2ff431405e7cf40e04e8422a63afeb62

opengl/libs/EGL/eglApi.cpp

diff --git a/opengl/libs/EGL/eglApi.cpp b/opengl/libs/EGL/eglApi.cpp
index 7c4bdf9..27a45e0 100644
--- a/opengl/libs/EGL/eglApi.cpp
+++ b/opengl/libs/EGL/eglApi.cpp
@@ -505,9 +505,11 @@
                 if (!found) {
                     return false;
                 }
+                // Only change the dataSpace from default if the application
+                // has explicitly set the color space with a EGL_GL_COLORSPACE_KHR attribute.
+                dataSpace = modifyBufferDataspace(dataSpace, colorSpace);
             }
         }
-        dataSpace = modifyBufferDataspace(dataSpace, colorSpace);
     }
     return true;
 }