commit a3d67a2677ab24d9e37251253c7e56e01f70d8c0
author Cody Northrop <cnorthrop@google.com> Mon Oct 29 11:22:11 2018 -0600
committer Cody Northrop <cnorthrop@google.com> Wed Nov 07 07:33:10 2018 -0700
tree 77595cc35008b1302b2da6020867d4670f87f452
parent fc94a58531260a63733434e9b07690ff47e7d41d

Remove interface version 0 from ANGLE logic

No need to check for older interface versions once
a newer version is available in master.

Bug: 80239516
Test: Manual build, ensure rules are followed
Test: cts-tradefed run singleCommand cts -m CtsAngleIntegrationHostTestCases
Change-Id: Idd7a9ac9e14805a91d1b0b6f11c23e0c1c9604ef

opengl/libs/EGL/Loader.cpp

diff --git a/opengl/libs/EGL/Loader.cpp b/opengl/libs/EGL/Loader.cpp
index 2cb42b4..ba1ff3e 100644
--- a/opengl/libs/EGL/Loader.cpp
+++ b/opengl/libs/EGL/Loader.cpp
@@ -42,18 +42,6 @@
   android_namespace_t* android_get_exported_namespace(const char*);
 
   // TODO(ianelliott@): Get this from an ANGLE header:
-  typedef enum ANGLEPreference {
-      ANGLE_NO_PREFERENCE = 0,
-      ANGLE_PREFER_NATIVE = 1,
-      ANGLE_PREFER_ANGLE = 2,
-  } ANGLEPreference;
-
-  // TODO(ianelliott@): Get this from an ANGLE header:
-  typedef bool (*fpANGLEUseForApplication)(const char* appName, const char* deviceMfr,
-                                           const char* deviceModel, ANGLEPreference developerOption,
-                                           ANGLEPreference appPreference);
-
-  // TODO(ianelliott@): Get this from an ANGLE header:
   typedef bool (*fpANGLEGetUtilityAPI)(unsigned int* versionToUse);
 
   // TODO(ianelliott@): Get this from an ANGLE header:
@@ -535,7 +523,6 @@
     property_get("ro.product.manufacturer", manufacturer, "UNSET");
     property_get("ro.product.model", model, "UNSET");
 
-    bool use_version0_API = false;
     bool use_version1_API = false;
     fpANGLEGetUtilityAPI ANGLEGetUtilityAPI =
             (fpANGLEGetUtilityAPI)dlsym(so, "ANGLEGetUtilityAPI");
@@ -545,11 +532,10 @@
             if (versionToUse == 1) {
                 use_version1_API = true;
             } else {
-                use_version0_API = true;
+                ALOGW("Could not find supported ANGLEGetUtilityAPI version, found %u", versionToUse);
             }
         }
     } else {
-        use_version0_API = true;
         ALOGV("Cannot find ANGLEGetUtilityAPI in library");
     }
     if (use_version1_API) {
@@ -564,18 +550,6 @@
         } else {
             ALOGW("Cannot find AndroidUseANGLEForApplication in library");
         }
-    } else if (use_version0_API) {
-        // Use the old version 0 API to determine if the
-        // application should use the ANGLE or the native driver.
-        fpANGLEUseForApplication ANGLEUseForApplication =
-                (fpANGLEUseForApplication)dlsym(so, "ANGLEUseForApplication");
-        if (ANGLEUseForApplication) {
-            use_angle = (ANGLEUseForApplication)(app_name_str.c_str(), manufacturer, model,
-                                                 ANGLE_NO_PREFERENCE, ANGLE_NO_PREFERENCE);
-            ALOGV("Result of opt-in/out logic is %s", use_angle ? "true" : "false");
-        } else {
-            ALOGW("Cannot find ANGLEUseForApplication in library");
-        }
     }
     ALOGV("Close temporarily-loaded ANGLE opt-in/out logic");
     return use_angle;