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

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

Browse Source 
Merge commit '24d7050ca605804efd5fde03f0d0d8d1d052c247' into gingerbread-plus-aosp

* commit '24d7050ca605804efd5fde03f0d0d8d1d052c247':
  don't handle the transparent region of a layer in draw()
This commit is contained in:
Mathias Agopian
2010-08-11 16:26:05 -07:00
committed by Android Git Automerger
parent f7db3e21ef 24d7050ca6
commit 308e69896c
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
glEnable(GL_SCISSOR_TEST);