commit 843aca9b8183ec878fb2476664d9b1930c079510
author Jesse Hall <jessehall@google.com> Fri May 06 11:57:52 2016 -0700
committer The Android Automerger <android-build@google.com> Mon May 09 17:29:30 2016 -0700
tree a4fef8c41328f7fc462e28de4bcdb24cf7abfca9
parent 9131e762d04aa21b348c6d2bfd45ff5abfac390a

OpenGlEsVersionTest: change ==3.1 checks to >=3.1

If ES3.1 is required for something, ES3.x (x>1) is also acceptable.

Bug: 28631014
Change-Id: If19eeef4e34399d0c87251cc074d1c6538bd676d

tests/tests/graphics/src/android/opengl/cts/OpenGlEsVersionTest.java

diff --git a/tests/tests/graphics/src/android/opengl/cts/OpenGlEsVersionTest.java b/tests/tests/graphics/src/android/opengl/cts/OpenGlEsVersionTest.java
index dd3b787..8b99003 100644
--- a/tests/tests/graphics/src/android/opengl/cts/OpenGlEsVersionTest.java
+++ b/tests/tests/graphics/src/android/opengl/cts/OpenGlEsVersionTest.java
@@ -80,8 +80,8 @@
 
     public void testRequiredExtensions() throws InterruptedException {
         int reportedVersion = getVersionFromActivityManager(mActivity);
-        // We only have required extensions on ES3.1
-        if (getMajorVersion(reportedVersion) != 3 || getMinorVersion(reportedVersion) != 1)
+        // We only have required extensions on ES3.1+
+        if (getMajorVersion(reportedVersion) != 3 || getMinorVersion(reportedVersion) < 1)
             return;
 
         restartActivityWithClientVersion(3);
@@ -97,7 +97,7 @@
         };
 
         for (int i = 0; i < requiredList.length; ++i) {
-            assertTrue("OpenGL ES version 3.1 is missing extension " + requiredList[i],
+            assertTrue("OpenGL ES version 3.1+ is missing extension " + requiredList[i],
                     hasExtension(extensions, requiredList[i]));
         }
     }
@@ -105,19 +105,17 @@
     public void testExtensionPack() throws InterruptedException {
         // Requirements:
         // 1. If the device claims support for the system feature, the extension must be available.
-        // 2. If the extension is available, it must be correct:
-        //    - ES 3.1 must be supported
+        // 2. If the extension is available, the device must claim support for it.
+        // 3. If the extension is available, it must be correct:
+        //    - ES 3.1+ must be supported
         //    - All included extensions must be available
-        //
-        // Supporting the extension but not claiming support for the system feature is allowed,
-        // just like the ES context version can be higher than the ro.opengles.version property.
 
         int reportedVersion = getVersionFromActivityManager(mActivity);
         boolean hasAepFeature = mActivity.getPackageManager().hasSystemFeature(
                 PackageManager.FEATURE_OPENGLES_EXTENSION_PACK);
 
-        if (getMajorVersion(reportedVersion) != 3 || getMinorVersion(reportedVersion) != 1) {
-            assertFalse("FEATURE_OPENGLES_EXTENSION_PACK is available without OpenGL ES 3.1",
+        if (getMajorVersion(reportedVersion) != 3 || getMinorVersion(reportedVersion) < 1) {
+            assertFalse("FEATURE_OPENGLES_EXTENSION_PACK is available without OpenGL ES 3.1+",
                     hasAepFeature);
             return;
         }