commit b498b2d2739fd807f364bb473bdfb08b45359cb1
author Jason Sams <jsams@google.com> Thu May 14 00:53:16 2015 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu May 14 00:53:17 2015 +0000
tree 7a8bf1c4e7d085e0b63d5887f24d358c9a2f25c8
parent 463a5db1d2740146d85bc0086cdea83507b6af88
parent 54371b4b095f3b15f0eceb7660eb320bbf34453f

Merge "Fix issues found during CTS testing of FP16"

rs/java/android/renderscript/Element.java

diff --git a/rs/java/android/renderscript/Element.java b/rs/java/android/renderscript/Element.java
index 60ff996..669eb45 100644
--- a/rs/java/android/renderscript/Element.java
+++ b/rs/java/android/renderscript/Element.java
@@ -548,8 +548,8 @@
      *     @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 @@
 
         switch (dt) {
         // Support only primitive integer/float/boolean types as vectors.
+        case FLOAT_16:
         case FLOAT_32:
         case FLOAT_64:
         case SIGNED_8: