commit be0488db81f6e156c25899cd1001e4d50a513df3
author Romain Guy <romainguy@google.com> Thu Sep 30 16:59:29 2010 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Thu Sep 30 16:59:29 2010 -0700
tree 744ea6c3fcaa4909d21dbb64b35904cd52e5b36f
parent 02f41705199336f808ece50d81585450e7f8f61f
parent d79991277043d6bdbd90bb63fd8aff73ef9e06a5

Merge "Make simple paths made of lines work."

graphics/java/android/renderscript/Element.java

diff --git a/graphics/java/android/renderscript/Element.java b/graphics/java/android/renderscript/Element.java
index 05b2d60..dd9fa15 100644
--- a/graphics/java/android/renderscript/Element.java
+++ b/graphics/java/android/renderscript/Element.java
@@ -39,7 +39,7 @@
     public enum DataType {
         //FLOAT_16 (1, 2),
         FLOAT_32 (2, 4),
-        //FLOAT_64 (3, 8),
+        FLOAT_64 (3, 8),
         SIGNED_8 (4, 1),
         SIGNED_16 (5, 2),
         SIGNED_32 (6, 4),
@@ -149,6 +149,13 @@
         return rs.mElement_F32;
     }
 
+    public static Element F64(RenderScript rs) {
+        if(rs.mElement_F64 == null) {
+            rs.mElement_F64 = createUser(rs, DataType.FLOAT_64);
+        }
+        return rs.mElement_F64;
+    }
+
     public static Element ELEMENT(RenderScript rs) {
         if(rs.mElement_ELEMENT == null) {
             rs.mElement_ELEMENT = createUser(rs, DataType.RS_ELEMENT);

graphics/java/android/renderscript/FieldPacker.java

diff --git a/graphics/java/android/renderscript/FieldPacker.java b/graphics/java/android/renderscript/FieldPacker.java
index b6f88be..ff3e22b 100644
--- a/graphics/java/android/renderscript/FieldPacker.java
+++ b/graphics/java/android/renderscript/FieldPacker.java
@@ -124,7 +124,7 @@
         addI32(Float.floatToRawIntBits(v));
     }
 
-    public void addF64(float v) {
+    public void addF64(double v) {
         addI64(Double.doubleToRawLongBits(v));
     }
 

graphics/java/android/renderscript/RenderScript.java

diff --git a/graphics/java/android/renderscript/RenderScript.java b/graphics/java/android/renderscript/RenderScript.java
index 1df416d..c952d79 100644
--- a/graphics/java/android/renderscript/RenderScript.java
+++ b/graphics/java/android/renderscript/RenderScript.java
@@ -502,6 +502,7 @@
     Element mElement_U32;
     Element mElement_I32;
     Element mElement_F32;
+    Element mElement_F64;
     Element mElement_BOOLEAN;
 
     Element mElement_ELEMENT;