Merge "Support for 64-bit integer type."

2 files changed, 9 insertions, 1 deletions

diff --git a/graphics/java/android/renderscript/Element.java b/graphics/java/android/renderscript/Element.java
index dd9fa155ffe2..91824e63faad 100644
--- a/graphics/java/android/renderscript/Element.java
+++ b/graphics/java/android/renderscript/Element.java
@@ -43,7 +43,7 @@ public class Element extends BaseObj {
         SIGNED_8 (4, 1),
         SIGNED_16 (5, 2),
         SIGNED_32 (6, 4),
-        //SIGNED_64 (7, 8),
+        SIGNED_64 (7, 8),
         UNSIGNED_8 (8, 1),
         UNSIGNED_16 (9, 2),
         UNSIGNED_32 (10, 4),
@@ -142,6 +142,13 @@ public class Element extends BaseObj {
         return rs.mElement_I32;
     }
 
+    public static Element I64(RenderScript rs) {
+        if(rs.mElement_I64 == null) {
+            rs.mElement_I64 = createUser(rs, DataType.SIGNED_64);
+        }
+        return rs.mElement_I64;
+    }
+
     public static Element F32(RenderScript rs) {
         if(rs.mElement_F32 == null) {
             rs.mElement_F32 = createUser(rs, DataType.FLOAT_32);
diff --git a/graphics/java/android/renderscript/RenderScript.java b/graphics/java/android/renderscript/RenderScript.java
index c952d79cae23..3c0b4e556f0e 100644
--- a/graphics/java/android/renderscript/RenderScript.java
+++ b/graphics/java/android/renderscript/RenderScript.java
@@ -501,6 +501,7 @@ public class RenderScript {
     Element mElement_I16;
     Element mElement_U32;
     Element mElement_I32;
+    Element mElement_I64;
     Element mElement_F32;
     Element mElement_F64;
     Element mElement_BOOLEAN;