commit 684726cbbd177ee4ee9000e9422058547acd237f
author Tim Murray <timmurray@google.com> Wed Nov 14 11:57:42 2012 -0800
committer Tim Murray <timmurray@google.com> Wed Nov 14 16:59:29 2012 -0800
tree 2533f61babb8e109069f7f3ba05ba44ca9b4dbb0
parent baca6c3c3d79a324c7976ba873afdded0b6bcfb5

Add createSized2D to C++ API

Change-Id: Idee31c74ba93cae334473a43a045e18c34a3fc31

cpp/Allocation.cpp

diff --git a/cpp/Allocation.cpp b/cpp/Allocation.cpp
index c07e056..3551baa 100644
--- a/cpp/Allocation.cpp
+++ b/cpp/Allocation.cpp
@@ -307,7 +307,7 @@
 
 
 android::sp<Allocation> Allocation::createTyped(sp<RS> rs, sp<const Type> type,
-                        RsAllocationMipmapControl mips, uint32_t usage) {
+                                                RsAllocationMipmapControl mips, uint32_t usage) {
     void *id = rsAllocationCreateTyped(rs->getContext(), type->getID(), mips, usage, 0);
     if (id == 0) {
         ALOGE("Allocation creation failed.");
@@ -317,8 +317,10 @@
 }
 
 android::sp<Allocation> Allocation::createTyped(sp<RS> rs, sp<const Type> type,
-                                    RsAllocationMipmapControl mips, uint32_t usage, void *pointer) {
-    void *id = rsAllocationCreateTyped(rs->getContext(), type->getID(), mips, usage, (uint32_t)pointer);
+                                                RsAllocationMipmapControl mips, uint32_t usage,
+                                                void *pointer) {
+    void *id = rsAllocationCreateTyped(rs->getContext(), type->getID(), mips, usage,
+                                       (uint32_t)pointer);
     if (id == 0) {
         ALOGE("Allocation creation failed.");
     }
@@ -326,21 +328,25 @@
 }
 
 android::sp<Allocation> Allocation::createTyped(sp<RS> rs, sp<const Type> type,
-        uint32_t usage) {
+                                                uint32_t usage) {
     return createTyped(rs, type, RS_ALLOCATION_MIPMAP_NONE, usage);
 }
 
 android::sp<Allocation> Allocation::createSized(sp<RS> rs, sp<const Element> e,
-        size_t count, uint32_t usage) {
-
+                                                size_t count, uint32_t usage) {
     Type::Builder b(rs, e);
     b.setX(count);
     sp<const Type> t = b.create();
 
-    void *id = rsAllocationCreateTyped(rs->getContext(), t->getID(),
-        RS_ALLOCATION_MIPMAP_NONE, usage, 0);
-    if (id == 0) {
-        ALOGE("Allocation creation failed.");
-    }
-    return new Allocation(id, rs, t, usage);
+    return createTyped(rs, t, usage);
+}
+
+android::sp<Allocation> Allocation::createSized2D(sp<RS> rs, sp<const Element> e,
+                                                  size_t x, size_t y, uint32_t usage) {
+    Type::Builder b(rs, e);
+    b.setX(x);
+    b.setY(y);
+    sp<const Type> t = b.create();
+
+    return createTyped(rs, t, usage);
 }

cpp/rsCppStructs.h

diff --git a/cpp/rsCppStructs.h b/cpp/rsCppStructs.h
index b2b6d36..888837f 100644
--- a/cpp/rsCppStructs.h
+++ b/cpp/rsCppStructs.h
@@ -254,6 +254,10 @@
                                    uint32_t usage = RS_ALLOCATION_USAGE_SCRIPT);
     static sp<Allocation> createSized(sp<RS> rs, sp<const Element> e, size_t count,
                                    uint32_t usage = RS_ALLOCATION_USAGE_SCRIPT);
+    static sp<Allocation> createSized2D(sp<RS> rs, sp<const Element> e,
+                                        size_t x, size_t y,
+                                        uint32_t usage = RS_ALLOCATION_USAGE_SCRIPT);
+
 
 };