Take the ceil() of the width and height of the new render target.
This was removed in ag/31004652 by mistake and might be causing the null pointer exception in 387410516.
Also re-enable setting blur algorithm to KAWASE for testing.
Bug: 387410516
Test: atest BlurTests
Flag: com.android.graphics.surfaceflinger.flags.window_blur_kawase2
Change-Id: I08e53b1eac4f649a76afc21881609fe6abd2337b
diff --git a/libs/renderengine/skia/filters/KawaseBlurDualFilter.cpp b/libs/renderengine/skia/filters/KawaseBlurDualFilter.cpp
index 750e08f..ef57c30 100644
--- a/libs/renderengine/skia/filters/KawaseBlurDualFilter.cpp
+++ b/libs/renderengine/skia/filters/KawaseBlurDualFilter.cpp
@@ -118,9 +118,12 @@
const int filterPasses = std::min(kMaxSurfaces - 1, static_cast<int>(ceil(filterDepth)));
auto makeSurface = [&](float scale) -> sk_sp<SkSurface> {
- const auto newW = static_cast<float>(blurRect.width() / scale);
- const auto newH = static_cast<float>(blurRect.height() / scale);
- return context->createRenderTarget(input->imageInfo().makeWH(newW, newH));
+ const auto newW = ceil(static_cast<float>(blurRect.width() / scale));
+ const auto newH = ceil(static_cast<float>(blurRect.height() / scale));
+ sk_sp<SkSurface> surface =
+ context->createRenderTarget(input->imageInfo().makeWH(newW, newH));
+ LOG_ALWAYS_FATAL_IF(!surface, "%s: Failed to create surface for blurring!", __func__);
+ return surface;
};
// Render into surfaces downscaled by 1x, 2x, and 4x from the initial downscale.
diff --git a/services/surfaceflinger/SurfaceFlinger.cpp b/services/surfaceflinger/SurfaceFlinger.cpp
index dd1119a..3f64b85 100644
--- a/services/surfaceflinger/SurfaceFlinger.cpp
+++ b/services/surfaceflinger/SurfaceFlinger.cpp
@@ -879,6 +879,8 @@
return renderengine::RenderEngine::BlurAlgorithm::GAUSSIAN;
} else if (algorithm == "kawase2") {
return renderengine::RenderEngine::BlurAlgorithm::KAWASE_DUAL_FILTER;
+ } else if (algorithm == "kawase") {
+ return renderengine::RenderEngine::BlurAlgorithm::KAWASE;
} else {
if (FlagManager::getInstance().window_blur_kawase2()) {
return renderengine::RenderEngine::BlurAlgorithm::KAWASE_DUAL_FILTER;