summaryrefslogtreecommitdiff
path: root/rs
diff options
context:
space:
mode:
author Jean-Luc Brouillet <jeanluc@google.com> 2021-02-12 22:39:33 -0800
committer Xusong Wang <xusongw@google.com> 2022-05-16 13:44:32 -0700
commit1f42ae9112118fda0e017b596f341586c672e9a5 (patch)
tree323862a410b099dbe0c9e11acfd14c1295cafac0 /rs
parent2775f8a1d163091b6e525cf6b9cd96efe60add64 (diff)
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)
Diffstat (limited to 'rs')
-rw-r--r--rs/java/android/renderscript/ScriptIntrinsicBlend.java3
1 files changed, 1 insertions, 2 deletions
diff --git a/rs/java/android/renderscript/ScriptIntrinsicBlend.java b/rs/java/android/renderscript/ScriptIntrinsicBlend.java
index a1c79ef938c4..3109cd88bd7d 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 {
}
*/
}
-