ADHOC/replicant-frameworks_native
3
0
Fork 0
Code Issues 9 Pull Requests Releases Wiki Activity

am 308e6989: am 24d7050c: Merge "don\'t handle the transparent region of a layer in draw()" into gingerbread

Browse Source 
Merge commit '308e69896c2812953d74ea63fe964bebaa68eef4'

* commit '308e69896c2812953d74ea63fe964bebaa68eef4':
  don't handle the transparent region of a layer in draw()
This commit is contained in:
Mathias Agopian 2010-08-11 16:30:09 -07:00 committed by Android Git Automerger
commit f44baa2e36
1 changed files with 1 additions and 15 deletions
Show Stats 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
glEnable(GL_SCISSOR_TEST);