commit 074e8122d54614a9e10fa09611fea0d1c3e3b95a
author Lloyd Pique <lpique@google.com> Thu Jul 26 12:57:23 2018 -0700
committer Lloyd Pique <lpique@google.com> Thu Jul 26 13:34:50 2018 -0700
tree dba0089880cbfe6644822ece9bc018927e2871fd
parent b7d1230e46f1ed045ec2ed4c382f72cbb231b5f6

Revert "Revert "surfacefligner: revert recent BE/FE split changes""

This reverts commit 0756cdd4b9cef33107ed13763d7168bc3363fae9.

Reason for revert: b/111793219 Power regression, with urgent fix needed.

Test: run cts -m CtsDeqpTestCases, run cts -m CtsViewTestCases

Change-Id: I4f089100af6a788b5973961a214132c97597fa7e

services/surfaceflinger/LayerBE.h

diff --git a/services/surfaceflinger/LayerBE.h b/services/surfaceflinger/LayerBE.h
index 680fbd0..9aa43f7 100644
--- a/services/surfaceflinger/LayerBE.h
+++ b/services/surfaceflinger/LayerBE.h
@@ -19,9 +19,10 @@
 #include <stdint.h>
 #include <sys/types.h>
 
-#include <gui/HdrMetadata.h>
 #include <ui/Region.h>
 
+#include "SurfaceFlinger.h"
+
 #include "DisplayHardware/HWComposer.h"
 #include "DisplayHardware/HWComposerBufferCache.h"
 #include "RenderEngine/Mesh.h"
@@ -39,7 +40,6 @@
     LayerBE* layer = nullptr;
     struct {
         HWC2::Layer* hwcLayer;
-        bool skipGeometry = true;
         sp<Fence> fence;
         HWC2::BlendMode blendMode = HWC2::BlendMode::Invalid;
         Rect displayFrame;
@@ -54,8 +54,6 @@
         sp<NativeHandle> sidebandStream;
         ui::Dataspace dataspace;
         hwc_color_t color;
-        bool supportedPerFrameMetadata = false;
-        HdrMetadata hdrMetadata;
     } hwc;
     struct {
         Mesh* mesh;