summaryrefslogtreecommitdiff
path: root/rs/java/android/renderscript/Element.java
diff options
context:
space:
mode:
authorJason Sams <jsams@google.com>2015-05-13 13:21:30 -0700
committerJason Sams <jsams@google.com>2015-05-13 17:02:36 -0700
commit54371b4b095f3b15f0eceb7660eb320bbf34453f (patch)
tree05e3de92eb686a8201ea16fcd4a670b782a2ce4d /rs/java/android/renderscript/Element.java
parent0ecc6c27998b3681eafaf82f41a4856bd3bcfd4f (diff)
Fix issues found during CTS testing of FP16
bug 20822382 This corrects a copy&paste error placing F16 into F32. Fixes an error disallowing vectors of fp16 types. Change-Id: I34be1aa9a323d61a7121581ab9599d2c2d32dd42
Diffstat (limited to 'rs/java/android/renderscript/Element.java')
-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 60ff996d0505..669eb45af060 100644
--- a/rs/java/android/renderscript/Element.java
+++ b/rs/java/android/renderscript/Element.java
@@ -548,8 +548,8 @@ public class Element extends BaseObj {
* @hide
*/
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;
}
@@ -926,6 +926,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: