commit eb4426dfb63983559cf903b2ea984569e990c4fd
author Tim Murray <timmurray@google.com> Tue Aug 27 15:30:16 2013 -0700
committer Tim Murray <timmurray@google.com> Wed Aug 28 11:49:48 2013 -0700
tree 866839620016ee5d215a46caf3f95b5b52e4f2c5
parent 7d1b757c0be2622b72b3d3a10826752adb3e5182

Fix element handling. Add YUV support.

bug 10427951

Change-Id: I2c9cd4faca881e3fa05eb65ab5edaab9f1c6c140

cpp/Element.cpp

diff --git a/cpp/Element.cpp b/cpp/Element.cpp
index d685595..8223f99 100644
--- a/cpp/Element.cpp
+++ b/cpp/Element.cpp
@@ -73,7 +73,7 @@
 
 #define CREATE_USER(N, T) android::RSC::sp<const Element> Element::N(android::RSC::sp<RS> rs) { \
     if (rs->mElements.N == NULL) {                                  \
-        rs->mElements.N = (createUser(rs, RS_TYPE_##T)).get();      \
+        rs->mElements.N = (createUser(rs, RS_TYPE_##T));            \
     }                                                               \
     return rs->mElements.N;                                         \
     }
@@ -104,22 +104,36 @@
 CREATE_USER(MATRIX_2X2, MATRIX_2X2);
 
 #define CREATE_PIXEL(N, T, K) android::RSC::sp<const Element> Element::N(android::RSC::sp<RS> rs) { \
-    return createPixel(rs, RS_TYPE_##T, RS_KIND_##K); \
+    if (rs->mElements.N == NULL) {                                  \
+        rs->mElements.N = createPixel(rs, RS_TYPE_##T, RS_KIND_##K);    \
+    }                                                                   \
+    return rs->mElements.N;                                             \
 }
+
 CREATE_PIXEL(A_8, UNSIGNED_8, PIXEL_A);
 CREATE_PIXEL(RGB_565, UNSIGNED_5_6_5, PIXEL_RGB);
 CREATE_PIXEL(RGB_888, UNSIGNED_8, PIXEL_RGB);
 CREATE_PIXEL(RGBA_4444, UNSIGNED_4_4_4_4, PIXEL_RGBA);
 CREATE_PIXEL(RGBA_8888, UNSIGNED_8, PIXEL_RGBA);
+CREATE_PIXEL(YUV, UNSIGNED_8, PIXEL_YUV);
 
 #define CREATE_VECTOR(N, T) android::RSC::sp<const Element> Element::N##_2(android::RSC::sp<RS> rs) { \
-    return createVector(rs, RS_TYPE_##T, 2); \
-} \
+    if (rs->mElements.N##_2 == NULL) {                                  \
+        rs->mElements.N##_2 = createVector(rs, RS_TYPE_##T, 2);         \
+    }                                                                   \
+    return rs->mElements.N##_2;                                         \
+}                                                                       \
 android::RSC::sp<const Element> Element::N##_3(android::RSC::sp<RS> rs) { \
-    return createVector(rs, RS_TYPE_##T, 3); \
+    if (rs->mElements.N##_3 == NULL) {                                  \
+        rs->mElements.N##_3 = createVector(rs, RS_TYPE_##T, 3);         \
+    }                                                                   \
+    return rs->mElements.N##_3;                                         \
 } \
 android::RSC::sp<const Element> Element::N##_4(android::RSC::sp<RS> rs) { \
-    return createVector(rs, RS_TYPE_##T, 4); \
+    if (rs->mElements.N##_4 == NULL) {                                  \
+        rs->mElements.N##_4 = createVector(rs, RS_TYPE_##T, 4);         \
+    }                                                                   \
+    return rs->mElements.N##_4;                                         \
 }
 CREATE_VECTOR(U8, UNSIGNED_8);
 CREATE_VECTOR(I8, SIGNED_8);