Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix blending behavior with first draw op" into oc-mr1-dev

Browse Source 
am: da910e805b

Change-Id: I167213959eac6ba72a1e8ca32fcd4e536e56aeee
This commit is contained in:
Chris Craik
2017-09-01 04:11:02 +00:00
committed by android-build-merger
parent 95ac139511 da910e805b
commit 02f3efdeff
1 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
libs/hwui/BakedOpRenderer.cpp
View File

@@ -216,10 +216,7 @@ void BakedOpRenderer::drawRects(const float* rects, int count, const SkPaint* pa
.setTransform(Matrix4::identity(), TransformFlags::None) .setTransform(Matrix4::identity(), TransformFlags::None)
.setModelViewIdentityEmptyBounds() .setModelViewIdentityEmptyBounds()
.build(); .build();
// Disable blending if this is the first draw to the main framebuffer, in case app has defined mRenderState.render(glop, mRenderTarget.orthoMatrix, false);
// transparency where it doesn't make sense - as first draw in opaque window.
bool overrideDisableBlending = !mHasDrawn && mOpaque && !mRenderTarget.frameBufferId;
mRenderState.render(glop, mRenderTarget.orthoMatrix, overrideDisableBlending);
mHasDrawn = true; mHasDrawn = true;
} }
@@ -350,8 +347,14 @@ void BakedOpRenderer::renderGlopImpl(const Rect* dirtyBounds, const ClipBase* cl
const Glop& glop) { const Glop& glop) {
prepareRender(dirtyBounds, clip); prepareRender(dirtyBounds, clip);
// Disable blending if this is the first draw to the main framebuffer, in case app has defined // Disable blending if this is the first draw to the main framebuffer, in case app has defined
// transparency where it doesn't make sense - as first draw in opaque window. // transparency where it doesn't make sense - as first draw in opaque window. Note that we only
bool overrideDisableBlending = !mHasDrawn && mOpaque && !mRenderTarget.frameBufferId; // apply this improvement when the blend mode is SRC_OVER - other modes (e.g. CLEAR) can be
// valid draws that affect other content (e.g. draw CLEAR, then draw DST_OVER)
bool overrideDisableBlending = !mHasDrawn
&& mOpaque
&& !mRenderTarget.frameBufferId
&& glop.blend.src == GL_ONE
&& glop.blend.dst == GL_ONE_MINUS_SRC_ALPHA;
mRenderState.render(glop, mRenderTarget.orthoMatrix, overrideDisableBlending); mRenderState.render(glop, mRenderTarget.orthoMatrix, overrideDisableBlending);
if (!mRenderTarget.frameBufferId) mHasDrawn = true; if (!mRenderTarget.frameBufferId) mHasDrawn = true;
} }