From 27bf51dc50b36e3c8c6f73b205e21a2f65205273 Mon Sep 17 00:00:00 2001 From: Mike Reed Date: Mon, 1 Feb 2021 17:14:55 -0500 Subject: [PATCH] Pass sampling or nothing to surface.draw Test: make Bug: 178700363 Change-Id: I144c0a1bc2376259640d1a6920d9df4edd652849 --- libs/hwui/RecordingCanvas.cpp | 2 +- libs/hwui/pipeline/skia/GLFunctorDrawable.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/libs/hwui/RecordingCanvas.cpp b/libs/hwui/RecordingCanvas.cpp index 96118aaec29b7..64b8b711f0a80 100644 --- a/libs/hwui/RecordingCanvas.cpp +++ b/libs/hwui/RecordingCanvas.cpp @@ -561,7 +561,7 @@ public: return; } c->concat(invertedMatrix); - mLayerSurface->draw(c, deviceBounds.fLeft, deviceBounds.fTop, nullptr); + mLayerSurface->draw(c, deviceBounds.fLeft, deviceBounds.fTop); } else { c->drawDrawable(drawable.get()); } diff --git a/libs/hwui/pipeline/skia/GLFunctorDrawable.cpp b/libs/hwui/pipeline/skia/GLFunctorDrawable.cpp index c6c9e9dc869aa..71f533c3fc4ff 100644 --- a/libs/hwui/pipeline/skia/GLFunctorDrawable.cpp +++ b/libs/hwui/pipeline/skia/GLFunctorDrawable.cpp @@ -194,7 +194,7 @@ void GLFunctorDrawable::onDraw(SkCanvas* canvas) { canvas->concat(invertedMatrix); const SkIRect deviceBounds = canvas->getDeviceClipBounds(); - tmpSurface->draw(canvas, deviceBounds.fLeft, deviceBounds.fTop, nullptr); + tmpSurface->draw(canvas, deviceBounds.fLeft, deviceBounds.fTop); } }