commit 42ca268c6ac7f710a438436ae487579bf2403c2c
author Stephen Hines <srhines@google.com> Fri Oct 01 17:46:37 2010 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Fri Oct 01 17:46:37 2010 -0700
tree adf683de831c57a027f4fd8bb35298e49974bdad
parent 8f8fd3525b68a5d860d30cb630fd1890347593ca
parent ef1dac28d3bf98bd61cd9874fb3ccab42105e9b6

Merge "Support for 64-bit integer type."

graphics/java/android/renderscript/Element.java

diff --git a/graphics/java/android/renderscript/Element.java b/graphics/java/android/renderscript/Element.java
index dd9fa15..91824e6 100644
--- a/graphics/java/android/renderscript/Element.java
+++ b/graphics/java/android/renderscript/Element.java
@@ -43,7 +43,7 @@
         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 @@
         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);

graphics/java/android/renderscript/RenderScript.java

diff --git a/graphics/java/android/renderscript/RenderScript.java b/graphics/java/android/renderscript/RenderScript.java
index c952d79..3c0b4e5 100644
--- a/graphics/java/android/renderscript/RenderScript.java
+++ b/graphics/java/android/renderscript/RenderScript.java
@@ -501,6 +501,7 @@
     Element mElement_I16;
     Element mElement_U32;
     Element mElement_I32;
+    Element mElement_I64;
     Element mElement_F32;
     Element mElement_F64;
     Element mElement_BOOLEAN;