From 1f42ae9112118fda0e017b596f341586c672e9a5 Mon Sep 17 00:00:00 2001 From: Jean-Luc Brouillet Date: Fri, 12 Feb 2021 22:39:33 -0800 Subject: [PATCH] Fix bug in Blend that did not use options. For one of the many variants of Blend, a cut&paste error made that the options were not passed. This was not caught because no test exercised this. I've added the test (in a related CL) and fixed the bug. Bug: 178718752 Test: Ran the RS Java tests Change-Id: Ide2fef96137ffd89e4431cf15be5df398036d909 Merged-In: Ide2fef96137ffd89e4431cf15be5df398036d909 (cherry picked from commit a2c6eb2f1a1fedb24ab1d981525b2f3fab84e614) --- rs/java/android/renderscript/ScriptIntrinsicBlend.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/rs/java/android/renderscript/ScriptIntrinsicBlend.java b/rs/java/android/renderscript/ScriptIntrinsicBlend.java index a1c79ef938c4d..3109cd88bd7d7 100644 --- a/rs/java/android/renderscript/ScriptIntrinsicBlend.java +++ b/rs/java/android/renderscript/ScriptIntrinsicBlend.java @@ -104,7 +104,7 @@ public class ScriptIntrinsicBlend extends ScriptIntrinsic { * @param opt LaunchOptions for clipping */ public void forEachSrc(Allocation ain, Allocation aout, Script.LaunchOptions opt) { - blend(1, ain, aout, null); + blend(1, ain, aout, opt); } /** @@ -641,4 +641,3 @@ public class ScriptIntrinsicBlend extends ScriptIntrinsic { } */ } -