commit | e59f1b0bbe1c2927232b69c23f4146ebf995bb92 | [log] [tgz] |
---|---|---|
author | neo.he <neo.he@mstarsemi.com> | Tue Mar 28 18:38:27 2017 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Tue Mar 28 18:38:27 2017 +0000 |
tree | a168ed2797422680c51704200f90db39ca822ce9 | |
parent | 829f3c6d8519e17d8a3e339855940f8450786ffa [diff] | |
parent | 47609db70942c8de5e435beba634127642f7344d [diff] |
Merge changes If756ad2a,I19aeb7ac am: 15feba03ae am: 47609db709 Change-Id: I5a7ceb58874d4432d51342d275610dc46a539a61
diff --git a/services/surfaceflinger/Layer.cpp b/services/surfaceflinger/Layer.cpp old mode 100644 new mode 100755 index 1b90678..0a795aa --- a/services/surfaceflinger/Layer.cpp +++ b/services/surfaceflinger/Layer.cpp
@@ -1271,9 +1271,9 @@ bool Layer::isOpaque(const Layer::State& s) const { - // if we don't have a buffer yet, we're translucent regardless of the + // if we don't have a buffer or sidebandStream yet, we're translucent regardless of the // layer's opaque flag. - if (mActiveBuffer == 0) { + if ((mSidebandStream == nullptr) && (mActiveBuffer == nullptr)) { return false; }
diff --git a/services/surfaceflinger/RenderEngine/RenderEngine.cpp b/services/surfaceflinger/RenderEngine/RenderEngine.cpp index 2aec9e9..3af8a34 100644 --- a/services/surfaceflinger/RenderEngine/RenderEngine.cpp +++ b/services/surfaceflinger/RenderEngine/RenderEngine.cpp
@@ -380,6 +380,7 @@ attribs[EGL_RED_SIZE] = 8; attribs[EGL_GREEN_SIZE] = 8; attribs[EGL_BLUE_SIZE] = 8; + attribs[EGL_ALPHA_SIZE] = 8; wantedAttribute = EGL_NONE; wantedAttributeValue = EGL_NONE; } else {