diff options
| author | 2019-10-25 10:27:59 -0700 | |
|---|---|---|
| committer | 2019-10-25 10:27:59 -0700 | |
| commit | 0205f87a0121f1e6057055752365a01b390c60ec (patch) | |
| tree | 772ee24019cd8355996cb68c5130535361af39ac /libs/graphicsenv/GraphicsEnv.cpp | |
| parent | e8d0bd6337634e9b5a1922ae3e663c15cd255d97 (diff) | |
| parent | 091d81511b92b0f38eb7068dbff3fa55b4645c63 (diff) | |
Merge Coral/Flame into AOSP master
Bug: 141248619
Change-Id: I1899c8278a37d181c50fb8d2f288b1bf76546b77
Merged-In: I96a71b7a888dac84188d7e546b0bfb9082711da8
Diffstat (limited to 'libs/graphicsenv/GraphicsEnv.cpp')
| -rw-r--r-- | libs/graphicsenv/GraphicsEnv.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/libs/graphicsenv/GraphicsEnv.cpp b/libs/graphicsenv/GraphicsEnv.cpp index 24b6c2d6de..4a39069a0e 100644 --- a/libs/graphicsenv/GraphicsEnv.cpp +++ b/libs/graphicsenv/GraphicsEnv.cpp @@ -213,7 +213,8 @@ void GraphicsEnv::setDriverToLoad(GraphicsEnv::Driver driver) { 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 @@ void GraphicsEnv::setDriverToLoad(GraphicsEnv::Driver driver) { } 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; } |