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

Merge "Don't add clipped rects to layer regions. Bug #3350208" into honeycomb

Browse Source
This commit is contained in:
Romain Guy
2011-01-14 11:25:56 -08:00
committed by Android (Google) Code Review
parent 010719c2ff f5106847fc
commit fe5be1b042
1 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
libs/hwui/OpenGLRenderer.cpp
View File

@@ -697,14 +697,14 @@ void OpenGLRenderer::dirtyLayer(const float left, const float top,
if ((mSnapshot->flags & Snapshot::kFlagFboTarget) && mSnapshot->region) { if ((mSnapshot->flags & Snapshot::kFlagFboTarget) && mSnapshot->region) {
Rect bounds(left, top, right, bottom); Rect bounds(left, top, right, bottom);
transform.mapRect(bounds); transform.mapRect(bounds);
bounds.intersect(*mSnapshot->clipRect); if (bounds.intersect(*mSnapshot->clipRect)) {
bounds.snapToPixelBoundaries(); bounds.snapToPixelBoundaries();
android::Rect dirty(bounds.left, bounds.top, bounds.right, bounds.bottom); android::Rect dirty(bounds.left, bounds.top, bounds.right, bounds.bottom);
if (!dirty.isEmpty()) { if (!dirty.isEmpty()) {
mSnapshot->region->orSelf(dirty); mSnapshot->region->orSelf(dirty);
} }
} }
}
#endif #endif
} }
@@ -713,14 +713,14 @@ void OpenGLRenderer::dirtyLayer(const float left, const float top,
#if RENDER_LAYERS_AS_REGIONS #if RENDER_LAYERS_AS_REGIONS
if ((mSnapshot->flags & Snapshot::kFlagFboTarget) && mSnapshot->region) { if ((mSnapshot->flags & Snapshot::kFlagFboTarget) && mSnapshot->region) {
Rect bounds(left, top, right, bottom); Rect bounds(left, top, right, bottom);
bounds.intersect(*mSnapshot->clipRect); if (bounds.intersect(*mSnapshot->clipRect)) {
bounds.snapToPixelBoundaries(); bounds.snapToPixelBoundaries();
android::Rect dirty(bounds.left, bounds.top, bounds.right, bounds.bottom); android::Rect dirty(bounds.left, bounds.top, bounds.right, bounds.bottom);
if (!dirty.isEmpty()) { if (!dirty.isEmpty()) {
mSnapshot->region->orSelf(dirty); mSnapshot->region->orSelf(dirty);
} }
} }
}
#endif #endif
} }