commit 472cab0a611317cc2a8a50cb9897018cee8d79e3
author Yiwei Zhang <zzyiwei@google.com> Mon Aug 05 17:57:41 2019 -0700
committer Yiwei Zhang <zzyiwei@google.com> Mon Aug 05 17:57:41 2019 -0700
tree a443f1a9dd5b0b331a99fe191c849870129d542d
parent 6aef228be8bc97006334d5abaa4c8da914886b08

GpuStats: fix driver loading stats at driver unloading

Bug: 138963614
Test: opt-in to GameDriver or ANGLE and test
Change-Id: I1e74cf55dd00f6fd7cb65d278d4dbaf018c5f322

libs/graphicsenv/GraphicsEnv.cpp

diff --git a/libs/graphicsenv/GraphicsEnv.cpp b/libs/graphicsenv/GraphicsEnv.cpp
index 3e29e88..705a0a4 100644
--- a/libs/graphicsenv/GraphicsEnv.cpp
+++ b/libs/graphicsenv/GraphicsEnv.cpp
@@ -213,7 +213,8 @@
         case GpuStatsInfo::Driver::GL:
         case GpuStatsInfo::Driver::GL_UPDATED:
         case GpuStatsInfo::Driver::ANGLE: {
-            if (mGpuStats.glDriverToLoad == GpuStatsInfo::Driver::NONE) {
+            if (mGpuStats.glDriverToLoad == GpuStatsInfo::Driver::NONE ||
+                mGpuStats.glDriverToLoad == GpuStatsInfo::Driver::GL) {
                 mGpuStats.glDriverToLoad = driver;
                 break;
             }
@@ -225,7 +226,8 @@
         }
         case GpuStatsInfo::Driver::VULKAN:
         case GpuStatsInfo::Driver::VULKAN_UPDATED: {
-            if (mGpuStats.vkDriverToLoad == GpuStatsInfo::Driver::NONE) {
+            if (mGpuStats.vkDriverToLoad == GpuStatsInfo::Driver::NONE ||
+                mGpuStats.vkDriverToLoad == GpuStatsInfo::Driver::VULKAN) {
                 mGpuStats.vkDriverToLoad = driver;
                 break;
             }