diff options
author | Mathias Agopian <mathias@google.com> | 2010-08-11 16:26:05 -0700 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2010-08-11 16:26:05 -0700 |
commit | 308e69896c2812953d74ea63fe964bebaa68eef4 (patch) | |
tree | 089d2fca340eac4cbe5d0637bd85ec64a770b719 | |
parent | f7db3e21ef713d4ff743f2a52837ea3d210bb84f (diff) | |
parent | 24d7050ca605804efd5fde03f0d0d8d1d052c247 (diff) | |
download | frameworks_base-308e69896c2812953d74ea63fe964bebaa68eef4.zip frameworks_base-308e69896c2812953d74ea63fe964bebaa68eef4.tar.gz frameworks_base-308e69896c2812953d74ea63fe964bebaa68eef4.tar.bz2 |
am 24d7050c: Merge "don\'t handle the transparent region of a layer in draw()" into gingerbread
Merge commit '24d7050ca605804efd5fde03f0d0d8d1d052c247' into gingerbread-plus-aosp
* commit '24d7050ca605804efd5fde03f0d0d8d1d052c247':
don't handle the transparent region of a layer in draw()
-rw-r--r-- | services/surfaceflinger/LayerBase.cpp | 16 |
1 files changed, 1 insertions, 15 deletions
diff --git a/services/surfaceflinger/LayerBase.cpp b/services/surfaceflinger/LayerBase.cpp index 75a9db5..91ac915 100644 --- a/services/surfaceflinger/LayerBase.cpp +++ b/services/surfaceflinger/LayerBase.cpp @@ -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); |