commit a50cfb0e8194d3858f30e85801402dae3c38450d
author Courtney Goeltzenleuchter <courtneygo@google.com> Tue May 09 00:21:38 2017 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue May 09 00:21:41 2017 +0000
tree 1a417a3ac3da7bba7b07b6cb3f9b3c110b3e12cd
parent 2d13196c869f8b77bbd57161cb5e0fc1c6213b3b
parent 1d4f7a281c8380c05c3e86998f8ff653e7e5470c

Merge "Default dataspace must be UNKNOWN for compatibility"

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;
 }