commit 0756cdd4b9cef33107ed13763d7168bc3363fae9
author David Sodman <dsodman@google.com> Fri Apr 13 11:26:33 2018 -0700
committer David Sodman <dsodman@google.com> Fri Jul 13 10:07:54 2018 -0700
tree cfeec005b49f7b2aa3bf8db0a184fb13c1a6620e
parent 852aff0ad80664e7ee87950c4dbd06240f74253e

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

This reverts commit 30505fb0e0f71b88eeed618200c35f9518144060.

Test: Manual and cts -m ViewTestCases

Change-Id: I8fb39243827b61baeba9bc30f9b70cf782dcb4b2

services/surfaceflinger/LayerBE.h

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