commit 3d985588c3ff362aa24fd155da0d3eaf16f1e240
author Yiwei Zhang <zzyiwei@google.com> Tue Aug 06 11:35:56 2019 -0700
committer android-build-merger <android-build-merger@google.com> Tue Aug 06 11:35:56 2019 -0700
tree e3172bcce967fdce4006973eec8cebc82cee64c6
parent 40175e097f756fd7b47df5fded648015955a3166
parent 6db8d55765ab44b3f0c2bd01417d4682a0e6e474

Merge "GpuStats: fix driver loading stats at driver unloading" into qt-r1-dev am: 2a7a3bfec7
am: 6db8d55765

Change-Id: Ie89f0152f8e88edf88c3155f03a36585019d381b

libs/graphicsenv/GraphicsEnv.cpp

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