commit 4180a16877120c3821f32b743901c9377603a93a
author Santos Cordon <santoscordon@google.com> Fri Mar 31 17:02:53 2017 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Mar 31 17:02:54 2017 +0000
tree 6eee6cb32aff3ecc0ef11eec89ceb9f2590609d1
parent d468bb72e3648fc10ee42db2aaa9cc9824951d3f
parent d38ec4e294eadd4f655476fc90b675c78c1c8740

Merge "Allow VirtualDisplay's to use hardware composer when in VR mode even if physical composer does not support them."

services/surfaceflinger/SurfaceFlinger.cpp

diff --git a/services/surfaceflinger/SurfaceFlinger.cpp b/services/surfaceflinger/SurfaceFlinger.cpp
index f82b363..04358dc 100644
--- a/services/surfaceflinger/SurfaceFlinger.cpp
+++ b/services/surfaceflinger/SurfaceFlinger.cpp
@@ -1903,7 +1903,8 @@
                         // etc.) but no internal state (i.e. a DisplayDevice).
                         if (state.surface != NULL) {
 
-                            if (mUseHwcVirtualDisplays) {
+                            // Allow VR composer to use virtual displays.
+                            if (mUseHwcVirtualDisplays || mHwc == mVrHwc) {
                                 int width = 0;
                                 int status = state.surface->query(
                                         NATIVE_WINDOW_WIDTH, &width);