commit 0587464f761d06512181f44b47bd950033a907ae
author Alec Mouri <alecmouri@google.com> Wed Nov 14 22:34:02 2018 +0000
committer Alec Mouri <alecmouri@google.com> Thu Nov 15 00:01:23 2018 +0000
tree e25720f18637eb7529c007c2be3d2a6b74827186
parent f1d19c710e1e410a2307503c504bdf150f013ccd

Revert "Remove gl surfaces from DisplayDevice."

This reverts commit ce0ad96d3c23b6b7bc4d6a540141ea1111b4430e.

Reason for revert: breaks screenrecord (b/119534075)

Change-Id: I45af7b49a490601fcc68ca55c79f590bb0db1b01

services/surfaceflinger/SurfaceFlinger.cpp

diff --git a/services/surfaceflinger/SurfaceFlinger.cpp b/services/surfaceflinger/SurfaceFlinger.cpp
index 7696758..2858b7b 100644
--- a/services/surfaceflinger/SurfaceFlinger.cpp
+++ b/services/surfaceflinger/SurfaceFlinger.cpp
@@ -2330,6 +2330,14 @@
     auto nativeWindow = nativeWindowSurface->getNativeWindow();
     creationArgs.nativeWindow = nativeWindow;
 
+    /*
+     * Create our display's surface
+     */
+    std::unique_ptr<renderengine::Surface> renderSurface = getRenderEngine().createSurface();
+    renderSurface->setCritical(isInternalDisplay);
+    renderSurface->setAsync(state.isVirtual());
+    creationArgs.renderSurface = std::move(renderSurface);
+
     // Make sure that composition can never be stalled by a virtual display
     // consumer that isn't processing buffers fast enough. We have to do this
     // here, in case the display is composed entirely by HWC.