diff options
| author | 2019-09-08 22:07:47 -0700 | |
|---|---|---|
| committer | 2019-09-08 22:07:47 -0700 | |
| commit | 76cc73e91c8be1be49ca7264d21178b0c60ccec8 (patch) | |
| tree | 0a7fa5c19d5d29d40aab5181e0ee02e4f73f0362 /libs/graphicsenv/GraphicsEnv.cpp | |
| parent | b9a4f9efdd42eaaf495b9433db2fc5db3a813b94 (diff) | |
| parent | 5d5329644df97df2718a63c29345fdc17a75b9b5 (diff) | |
Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-master
Bug: 135460123
Change-Id: I02a643052e3023ac029cdec76ee24dfa99d82b29
Merged-In: Ied9a812f235e2a5146381b0ac8c602db1c6035f5
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; } |