commit 371af85743e37a356614c3de88cd426625472fea
author Solti <solti@google.com> Thu Aug 22 21:22:19 2024 +0000
committer Solti <solti@google.com> Mon Aug 26 23:26:29 2024 +0000
tree cc38f33b73948e4d67a007f07c1fc02a44f2e8cf
parent 2f16d7e76533ba9b895ee1e771c03df0f7f02632

Deprecate glDriverFallback logging

Based on the discussion in
https://googleplex-android-review.git.corp.google.com/c/platform/frameworks/native/+/28925365/comment/148a6605_aa13457e/
"glDriverFallback" is no longer needed.  Hence the CL removes it.

previously it's okay to fallback so the logging was recording the cases when an intent to load GL_UPDATED or ANGLE is somehow overwritten, ex) loading failure and fallback to something else.

The current behavior now is to fail loudly if loading ANGLE or GL_UPDATED fails, no more fallback. Therefore, no need to log the fallback cases.

Test: $abtd test --test_location=remote  --tag=test_loading_metric_fix --reference_build_id=12276316 --v2_test_name=angle_CtsAngleIntegrationHostTestCases_git_main th:cl:28948939:husky-trunk_staging-userdebug:git_main "$PROD_CONFIG", [result](https://android-build.corp.google.com/builds/abtd/run/L34800030006075559)
Test: $abtd test --test_location=remote  --tag=test_loading_metric_fix --reference_build_id=12276316 --v2_test_name=angle_CtsAngleIntegrationHostTestCases_git_main_gles th:cl:28948939:husky_angle-next-userdebug:git_main "$PROD_CONFIG", [result](https://android-build.corp.google.com/builds/abtd/run/L88800030006075562)
Test: $abtd test --test_location=remote  --tag=test_loading_metric_fix --reference_build_id=12276316 --v2_test_name=angle_CtsAngleIntegrationHostTestCases_git_main_gles th:cl:28948939:husky-next-userdebug:git_main "$PROD_CONFIG", [result](https://android-build.corp.google.com/builds/abtd/run/L48800030006011636)

Flag: EXEMPT bugfix
Test: default presubmit
Bug: b/359337792
Change-Id: If35ec31c2b34d3cd1c4bc8681f00404961a5eeed

libs/graphicsenv/GraphicsEnv.cpp

diff --git a/libs/graphicsenv/GraphicsEnv.cpp b/libs/graphicsenv/GraphicsEnv.cpp
index 4c3f4a6..d1a5663 100644
--- a/libs/graphicsenv/GraphicsEnv.cpp
+++ b/libs/graphicsenv/GraphicsEnv.cpp
@@ -401,18 +401,10 @@
     switch (driver) {
         case GpuStatsInfo::Driver::GL:
         case GpuStatsInfo::Driver::GL_UPDATED:
-        case GpuStatsInfo::Driver::ANGLE: {
-            if (mGpuStats.glDriverToLoad == GpuStatsInfo::Driver::NONE ||
-                mGpuStats.glDriverToLoad == GpuStatsInfo::Driver::GL) {
-                mGpuStats.glDriverToLoad = driver;
-                break;
-            }
-
-            if (mGpuStats.glDriverFallback == GpuStatsInfo::Driver::NONE) {
-                mGpuStats.glDriverFallback = driver;
-            }
+        case GpuStatsInfo::Driver::ANGLE:
+            mGpuStats.glDriverToLoad = driver;
             break;
-        }
+
         case GpuStatsInfo::Driver::VULKAN:
         case GpuStatsInfo::Driver::VULKAN_UPDATED: {
             if (mGpuStats.vkDriverToLoad == GpuStatsInfo::Driver::NONE ||
@@ -561,8 +553,7 @@
     bool isIntendedDriverLoaded = false;
     if (api == GpuStatsInfo::Api::API_GL) {
         driver = mGpuStats.glDriverToLoad;
-        isIntendedDriverLoaded =
-                isDriverLoaded && (mGpuStats.glDriverFallback == GpuStatsInfo::Driver::NONE);
+        isIntendedDriverLoaded = isDriverLoaded;
     } else {
         driver = mGpuStats.vkDriverToLoad;
         isIntendedDriverLoaded =