commit a041adcb85838ed5dedd811524a1831f964f0fac
author Alex Sakhartchouk <alexst@google.com> Tue Dec 27 09:04:40 2011 -0800
committer Android (Google) Code Review <android-gerrit@google.com> Tue Dec 27 09:04:40 2011 -0800
tree 17bbbe92fe01e4318d8f48a52109088fb12c2782
parent 60deb2d9ba186a89d5d74e45f0e928ebaac6a074
parent fd79e02e0fec8620da7affaadcf275cf0518241a

Merge "Missing getter and additional tests." into graphics-dev

graphics/java/android/renderscript/Element.java

diff --git a/graphics/java/android/renderscript/Element.java b/graphics/java/android/renderscript/Element.java
index 11566c7..f6a0281 100644
--- a/graphics/java/android/renderscript/Element.java
+++ b/graphics/java/android/renderscript/Element.java
@@ -90,6 +90,12 @@
     */
     public int getSizeBytes() {return mSize;}
 
+    /**
+    * @hide
+    * @return element vector size
+    */
+    public int getVectorSize() {return mVectorSize;}
+
 
     /**
      * DataType represents the basic type information for a basic element.  The
@@ -729,6 +735,7 @@
     Element(int id, RenderScript rs, Element[] e, String[] n, int[] as) {
         super(id, rs);
         mSize = 0;
+        mVectorSize = 1;
         mElements = e;
         mElementNames = n;
         mArraySizes = as;

libs/rs/scriptc/rs_allocation.rsh

diff --git a/libs/rs/scriptc/rs_allocation.rsh b/libs/rs/scriptc/rs_allocation.rsh
index e890021..661d3e3 100644
--- a/libs/rs/scriptc/rs_allocation.rsh
+++ b/libs/rs/scriptc/rs_allocation.rsh
@@ -290,5 +290,13 @@
 extern rs_data_kind __attribute__((overloadable))
     rsElementGetDataKind(rs_element e);
 
+/**
+ * @param e element to get data from
+ * @return length of the element vector (for float2, float3,
+ *         etc.)
+ */
+extern uint32_t __attribute__((overloadable))
+    rsElementGetVectorSize(rs_element e);
+
 #endif
 

tests/RenderScriptTests/tests/src/com/android/rs/test/element.rs

diff --git a/tests/RenderScriptTests/tests/src/com/android/rs/test/element.rs b/tests/RenderScriptTests/tests/src/com/android/rs/test/element.rs
index c0bd36e..0c42d84 100644
--- a/tests/RenderScriptTests/tests/src/com/android/rs/test/element.rs
+++ b/tests/RenderScriptTests/tests/src/com/android/rs/test/element.rs
@@ -94,11 +94,13 @@
     _RS_ASSERT(subElemCount == 0);
     _RS_ASSERT(rsElementGetDataKind(simpleElem) == RS_KIND_USER);
     _RS_ASSERT(rsElementGetDataType(simpleElem) == RS_TYPE_FLOAT_32);
+    _RS_ASSERT(rsElementGetVectorSize(simpleElem) == 3);
 
     subElemCount = rsElementGetSubElementCount(complexElem);
     _RS_ASSERT(subElemCount == 10);
     _RS_ASSERT(rsElementGetDataKind(complexElem) == RS_KIND_USER);
     _RS_ASSERT(rsElementGetDataType(complexElem) == RS_TYPE_NONE);
+    _RS_ASSERT(rsElementGetVectorSize(complexElem) == 1);
     _RS_ASSERT(rsElementGetSizeBytes(complexElem) == sizeof(*complexStruct));
 
     char buffer[64];
@@ -109,7 +111,6 @@
         _RS_ASSERT(rsElementGetSubElementNameLength(complexElem, i) == subElemNamesSizes[i] + 1);
 
         uint32_t written = rsElementGetSubElementName(complexElem, i, buffer, 64);
-        rsDebug(subElemNames[i], subElemNames[i]);
         _RS_ASSERT(written == subElemNamesSizes[i]);
         _RS_ASSERT(equals(buffer, subElemNames[i], written));
 
@@ -117,6 +118,22 @@
         _RS_ASSERT(rsElementGetSubElementOffsetBytes(complexElem, i) == subElemOffsets[i]);
     }
 
+    // Tests error checking
+    rs_element subElem = rsElementGetSubElement(complexElem, subElemCount);
+    _RS_ASSERT(!rsIsObject(subElem));
+
+    _RS_ASSERT(rsElementGetSubElementNameLength(complexElem, subElemCount) == 0);
+
+    _RS_ASSERT(rsElementGetSubElementName(complexElem, subElemCount, buffer, 64) == 0);
+    _RS_ASSERT(rsElementGetSubElementName(complexElem, 0, NULL, 64) == 0);
+    _RS_ASSERT(rsElementGetSubElementName(complexElem, 0, buffer, 0) == 0);
+    uint32_t written = rsElementGetSubElementName(complexElem, 0, buffer, 5);
+    _RS_ASSERT(written == 4);
+    _RS_ASSERT(buffer[4] == '\0');
+
+    _RS_ASSERT(rsElementGetSubElementArraySize(complexElem, subElemCount) == 0);
+    _RS_ASSERT(rsElementGetSubElementOffsetBytes(complexElem, subElemCount) == 0);
+
     if (failed) {
         rsDebug("test_element_getters FAILED", 0);
     }

tests/RenderScriptTests/tests/src/com/android/rs/test/mesh.rs

diff --git a/tests/RenderScriptTests/tests/src/com/android/rs/test/mesh.rs b/tests/RenderScriptTests/tests/src/com/android/rs/test/mesh.rs
index 4d2b255..efacdcb 100644
--- a/tests/RenderScriptTests/tests/src/com/android/rs/test/mesh.rs
+++ b/tests/RenderScriptTests/tests/src/com/android/rs/test/mesh.rs
@@ -33,6 +33,12 @@
     rs_primitive p0 = rsMeshGetPrimitive(mesh, 0);
     rs_primitive p1 = rsMeshGetPrimitive(mesh, 1);
     rs_primitive p2 = rsMeshGetPrimitive(mesh, 2);
+    rs_primitive p3 = rsMeshGetPrimitive(mesh, 3);
+
+    _RS_ASSERT(p0 == RS_PRIMITIVE_POINT);
+    _RS_ASSERT(p1 == RS_PRIMITIVE_LINE);
+    _RS_ASSERT(p2 == RS_PRIMITIVE_TRIANGLE);
+    _RS_ASSERT(p3 == RS_PRIMITIVE_POINT);
 
     if (failed) {
         rsDebug("test_mesh_getters FAILED", 0);