summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMathias Agopian <mathias@google.com>2010-08-10 20:42:20 -0700
committerMathias Agopian <mathias@google.com>2010-08-11 16:05:06 -0700
commit8514b92bc4dfab58aa762d75322e4c285b6ada17 (patch)
tree3a76202641f0c159baf59bb77eeb708e09be62b8
parent1efba9a61716356014f4c452fd9e099c5ebe9bd0 (diff)
downloadframeworks_base-8514b92bc4dfab58aa762d75322e4c285b6ada17.zip
frameworks_base-8514b92bc4dfab58aa762d75322e4c285b6ada17.tar.gz
frameworks_base-8514b92bc4dfab58aa762d75322e4c285b6ada17.tar.bz2
don't handle the transparent region of a layer in draw()
this is already taken into consideration in computeVisibleRegion and therefore not needed at draw time. Change-Id: I3fc7336d22f1147dfcd3a20fd71bf79b946d971f
-rw-r--r--services/surfaceflinger/LayerBase.cpp16
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);