Fix egl config filtering of config_id am: 4bed9578e1
am: 5a6ee650a2
Change-Id: I1c1fb1b0ef52d4eb628b31a0e75353f97e87d09d
diff --git a/modules/egl/teglGetFrameTimestampsTests.cpp b/modules/egl/teglGetFrameTimestampsTests.cpp
index bbf27cc..09deb06 100644
--- a/modules/egl/teglGetFrameTimestampsTests.cpp
+++ b/modules/egl/teglGetFrameTimestampsTests.cpp
@@ -194,7 +194,8 @@
bool timestampValid (EGLnsecsANDROID timestamp)
{
- return (timestamp >= 0) || (timestamp == EGL_TIMESTAMP_PENDING_ANDROID);
+ // \todo [2017-10-19 brianderson] Don't consider 0 invalid once kernel fix is in.
+ return (timestamp > 0) || (timestamp == EGL_TIMESTAMP_PENDING_ANDROID);
}
bool timestampPending (EGLnsecsANDROID timestamp)
@@ -241,7 +242,7 @@
// be sure that the readsDone time must be after the renderingComplete time.
// It may also be equal to the renderingComplete time if no reads were
// peformed.
- if (verifyReadsDone)
+ if (verifyReadsDone && timestampValid(frameTimes.readsDone))
check_le(result, frameTimes.renderingComplete, frameTimes.readsDone, "Buffer rendering completed after reads completed.");
// Verify CPU/GPU dependencies