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

Merge "don't handle the transparent region of a layer in draw()" into gingerbread

Browse Source
This commit is contained in:
Mathias Agopian
2010-08-11 16:21:01 -07:00
committed by Android (Google) Code Review
parent 8e7515d9c9 8514b92bc4
commit 24d7050ca6
1 changed files with 1 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
services/surfaceflinger/LayerBase.cpp
View File

@@ -307,22 +307,8 @@ void LayerBase::drawRegion(const Region& reg) const
} }
} }
void LayerBase::draw(const Region& inClip) const void LayerBase::draw(const Region& clip) const
{ {
// invalidate the region we'll update
Region clip(inClip); // copy-on-write, so no-op most of the time
// Remove the transparent area from the clipping region
const State& s = drawingState();
if (LIKELY(!s.transparentRegion.isEmpty())) {
clip.subtract(transparentRegionScreen);
if (clip.isEmpty()) {
// usually this won't happen because this should be taken care of
// by SurfaceFlinger::computeVisibleRegions()
return;
}
}
// reset GL state // reset GL state
glEnable(GL_SCISSOR_TEST); glEnable(GL_SCISSOR_TEST);