summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Jean-Luc Brouillet <jeanluc@google.com> 2021-02-12 22:39:33 -0800
committer Jean-Luc Brouillet <jeanluc@google.com> 2021-02-12 22:39:33 -0800
commita2c6eb2f1a1fedb24ab1d981525b2f3fab84e614 (patch)
treeff9563c401506327ff5c94547c73af95498be181
parentedcc760f9699c416a21ffb7fd5b574d7f085cfd0 (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
-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 fdcd61b04eca..54c8907387cf 100644
--- a/rs/java/android/renderscript/ScriptIntrinsicBlend.java
+++ b/rs/java/android/renderscript/ScriptIntrinsicBlend.java
@@ -99,7 +99,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);
}
/**
@@ -636,4 +636,3 @@ public class ScriptIntrinsicBlend extends ScriptIntrinsic {
}
*/
}
-