Merge "Don't add clipped rects to layer regions. Bug #3350208" into honeycomb (fe5be1b0) · Commits · e / os / android_frameworks_base

libs/hwui/OpenGLRenderer.cpp

+12 −12

Original line number	Diff line number	Diff line
		@@ -697,14 +697,14 @@ void OpenGLRenderer::dirtyLayer(const float left, const float top,
		if ((mSnapshot->flags & Snapshot::kFlagFboTarget) && mSnapshot->region) {
		Rect bounds(left, top, right, bottom);
		transform.mapRect(bounds);
		bounds.intersect(*mSnapshot->clipRect);
		if (bounds.intersect(*mSnapshot->clipRect)) {
		bounds.snapToPixelBoundaries();

		android::Rect dirty(bounds.left, bounds.top, bounds.right, bounds.bottom);
		if (!dirty.isEmpty()) {
		mSnapshot->region->orSelf(dirty);
		}
		}
		}
		#endif
		}

		@@ -713,14 +713,14 @@ void OpenGLRenderer::dirtyLayer(const float left, const float top,
		#if RENDER_LAYERS_AS_REGIONS
		if ((mSnapshot->flags & Snapshot::kFlagFboTarget) && mSnapshot->region) {
		Rect bounds(left, top, right, bottom);
		bounds.intersect(*mSnapshot->clipRect);
		if (bounds.intersect(*mSnapshot->clipRect)) {
		bounds.snapToPixelBoundaries();

		android::Rect dirty(bounds.left, bounds.top, bounds.right, bounds.bottom);
		if (!dirty.isEmpty()) {
		mSnapshot->region->orSelf(dirty);
		}
		}
		}
		#endif
		}