commit 5ee5815354142a0afbc54042e059dbf4ab03d575
author Rachel Lee <rnlee@google.com> Mon Jun 07 18:39:27 2021 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Jun 07 18:39:27 2021 +0000
tree 4bcce822f871608d3bcadaecd633591fdfa6b158
parent bba52f423ae347459a18c40dbc93887fcf4bb855
parent 84ff7b2ad9c20d50a45d2e34fa159650ba537e79

Merge "eglSurfaceAttrib EGL_TIMESTAMPS_ANDROID non-window surface fix." into sc-dev

opengl/libs/EGL/egl_platform_entries.cpp

diff --git a/opengl/libs/EGL/egl_platform_entries.cpp b/opengl/libs/EGL/egl_platform_entries.cpp
index f576660..de36a7a 100644
--- a/opengl/libs/EGL/egl_platform_entries.cpp
+++ b/opengl/libs/EGL/egl_platform_entries.cpp
@@ -1453,7 +1453,9 @@
 
     if (attribute == EGL_TIMESTAMPS_ANDROID) {
         if (!s->getNativeWindow()) {
-            return setError(EGL_BAD_SURFACE, (EGLBoolean)EGL_FALSE);
+            // According to the spec, "if surface is not a window surface this has no
+            // effect."
+            return EGL_TRUE;
         }
         int err = native_window_enable_frame_timestamps(s->getNativeWindow(), value != 0);
         return (err == 0) ? EGL_TRUE : setError(EGL_BAD_SURFACE, (EGLBoolean)EGL_FALSE);