summaryrefslogtreecommitdiffstats
path: root/rs
diff options
context:
space:
mode:
authorJason Sams <jsams@google.com>2015-05-14 20:15:39 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2015-05-14 20:15:40 +0000
commitf06165320281ef1cb5e7ebbeef42a93a77cbd553 (patch)
treefe15851feaab6b5eb13041c7edd8cae0f04c9c36 /rs
parentfed0196b9500b9f1e58071b177fb02245d8e4e91 (diff)
parent6faa4d20c50c2f233cc3f4ba9e32f2678db8ba16 (diff)
downloadframeworks_base-f06165320281ef1cb5e7ebbeef42a93a77cbd553.zip
frameworks_base-f06165320281ef1cb5e7ebbeef42a93a77cbd553.tar.gz
frameworks_base-f06165320281ef1cb5e7ebbeef42a93a77cbd553.tar.bz2
Merge "Fix issues found during CTS testing of FP16" into mnc-dev
Diffstat (limited to 'rs')
-rw-r--r--rs/java/android/renderscript/Element.java5
1 files changed, 3 insertions, 2 deletions
diff --git a/rs/java/android/renderscript/Element.java b/rs/java/android/renderscript/Element.java
index 4b3e30f..6efb6d6 100644
--- a/rs/java/android/renderscript/Element.java
+++ b/rs/java/android/renderscript/Element.java
@@ -536,8 +536,8 @@ public class Element extends BaseObj {
}
public static Element F16_3(RenderScript rs) {
- if(rs.mElement_FLOAT_3 == null) {
- rs.mElement_FLOAT_3 = createVector(rs, DataType.FLOAT_16, 3);
+ if(rs.mElement_HALF_3 == null) {
+ rs.mElement_HALF_3 = createVector(rs, DataType.FLOAT_16, 3);
}
return rs.mElement_HALF_3;
}
@@ -911,6 +911,7 @@ public class Element extends BaseObj {
switch (dt) {
// Support only primitive integer/float/boolean types as vectors.
+ case FLOAT_16:
case FLOAT_32:
case FLOAT_64:
case SIGNED_8: