Removed last bits of predefined element types from native code. Predefined types are now constructed at the java layer from standard building blocks.

1 files changed, 0 insertions, 197 deletions

diff --git a/rsElement.cpp b/rsElement.cpp
index 67945229..b5267b36 100644
--- a/rsElement.cpp
+++ b/rsElement.cpp
@@ -21,170 +21,6 @@
 using namespace android;
 using namespace android::renderscript;
 
-void ElementState::initPredefined()
-{
-    Component * u_8  = new Component(Component::USER,   Component::UNSIGNED,  true,  8, 0);
-    Component * i_8  = new Component(Component::USER,   Component::SIGNED,    true,  8, 0);
-    Component * u_16 = new Component(Component::USER,   Component::UNSIGNED,  true,  16, 0);
-    Component * i_16 = new Component(Component::USER,   Component::SIGNED,    true,  16, 0);
-    Component * u_32 = new Component(Component::USER,   Component::UNSIGNED,  true,  32, 0);
-    Component * i_32 = new Component(Component::USER,   Component::SIGNED,    true,  32, 0);
-    Component * f_32 = new Component(Component::USER,   Component::FLOAT,     true,  32, 0);
-
-
-    Component * r_4  = new Component(Component::RED,    Component::UNSIGNED,  true,  4, 0);
-    Component * r_5  = new Component(Component::RED,    Component::UNSIGNED,  true,  5, 0);
-    Component * r_8  = new Component(Component::RED,    Component::UNSIGNED,  true,  8, 0);
-
-    Component * g_4  = new Component(Component::GREEN,  Component::UNSIGNED,  true,  4, 0);
-    Component * g_5  = new Component(Component::GREEN,  Component::UNSIGNED,  true,  5, 0);
-    Component * g_6  = new Component(Component::GREEN,  Component::UNSIGNED,  true,  6, 0);
-    Component * g_8  = new Component(Component::GREEN,  Component::UNSIGNED,  true,  8, 0);
-
-    Component * b_4  = new Component(Component::BLUE,   Component::UNSIGNED,  true,  4, 0);
-    Component * b_5  = new Component(Component::BLUE,   Component::UNSIGNED,  true,  5, 0);
-    Component * b_8  = new Component(Component::BLUE,   Component::UNSIGNED,  true,  8, 0);
-
-    Component * a_1  = new Component(Component::ALPHA,  Component::UNSIGNED,  true,  1, 0);
-    Component * a_4  = new Component(Component::ALPHA,  Component::UNSIGNED,  true,  4, 0);
-    Component * a_8  = new Component(Component::ALPHA,  Component::UNSIGNED,  true,  8, 0);
-
-    Component * idx_16 = new Component(Component::INDEX,  Component::UNSIGNED,  false, 16, 0);
-    Component * idx_32 = new Component(Component::INDEX,  Component::UNSIGNED,  false, 32, 0);
-
-    Component * x    = new Component(Component::X,      Component::FLOAT,     false, 32, 0);
-    Component * y    = new Component(Component::Y,      Component::FLOAT,     false, 32, 0);
-    Component * z    = new Component(Component::Z,      Component::FLOAT,     false, 32, 0);
-
-    Component * nx   = new Component(Component::NX,     Component::FLOAT,     false, 32, 0);
-    Component * ny   = new Component(Component::NY,     Component::FLOAT,     false, 32, 0);
-    Component * nz   = new Component(Component::NZ,     Component::FLOAT,     false, 32, 0);
-
-    Component * s    = new Component(Component::S,      Component::FLOAT,     false, 32, 0);
-    Component * t    = new Component(Component::T,      Component::FLOAT,     false, 32, 0);
-
-    Element * e;
-
-    e = new Element(1);
-    e->setComponent(0, u_8);
-    mPredefinedList.add(Predefined(RS_ELEMENT_USER_U8, e));
-
-    e = new Element(1);
-    e->setComponent(0, i_8);
-    mPredefinedList.add(Predefined(RS_ELEMENT_USER_I8, e));
-
-    e = new Element(1);
-    e->setComponent(0, u_16);
-    mPredefinedList.add(Predefined(RS_ELEMENT_USER_U16, e));
-
-    e = new Element(1);
-    e->setComponent(0, i_16);
-    mPredefinedList.add(Predefined(RS_ELEMENT_USER_I16, e));
-
-    e = new Element(1);
-    e->setComponent(0, u_32);
-    mPredefinedList.add(Predefined(RS_ELEMENT_USER_U32, e));
-
-    e = new Element(1);
-    e->setComponent(0, i_32);
-    mPredefinedList.add(Predefined(RS_ELEMENT_USER_I32, e));
-
-    e = new Element(1);
-    e->setComponent(0, f_32);
-    mPredefinedList.add(Predefined(RS_ELEMENT_USER_FLOAT, e));
-
-    e = new Element(1);
-    e->setComponent(0, a_8);
-    mPredefinedList.add(Predefined(RS_ELEMENT_A_8, e));
-
-    e = new Element(3);
-    e->setComponent(0, r_5);
-    e->setComponent(1, g_6);
-    e->setComponent(2, b_5);
-    mPredefinedList.add(Predefined(RS_ELEMENT_RGB_565, e));
-
-    e = new Element(4);
-    e->setComponent(0, r_5);
-    e->setComponent(1, g_5);
-    e->setComponent(2, b_5);
-    e->setComponent(3, a_1);
-    mPredefinedList.add(Predefined(RS_ELEMENT_RGBA_5551, e));
-
-    e = new Element(4);
-    e->setComponent(0, r_4);
-    e->setComponent(1, g_4);
-    e->setComponent(2, b_4);
-    e->setComponent(3, a_4);
-    mPredefinedList.add(Predefined(RS_ELEMENT_RGBA_4444, e));
-
-    e = new Element(3);
-    e->setComponent(0, r_8);
-    e->setComponent(1, g_8);
-    e->setComponent(2, b_8);
-    mPredefinedList.add(Predefined(RS_ELEMENT_RGB_888, e));
-
-    e = new Element(4);
-    e->setComponent(0, r_8);
-    e->setComponent(1, g_8);
-    e->setComponent(2, b_8);
-    e->setComponent(3, a_8);
-    mPredefinedList.add(Predefined(RS_ELEMENT_RGBA_8888, e));
-
-    e = new Element(1);
-    e->setComponent(0, idx_16);
-    mPredefinedList.add(Predefined(RS_ELEMENT_INDEX_16, e));
-
-    e = new Element(1);
-    e->setComponent(0, idx_32);
-    mPredefinedList.add(Predefined(RS_ELEMENT_INDEX_32, e));
-
-    e = new Element(2);
-    e->setComponent(0, x);
-    e->setComponent(1, y);
-    mPredefinedList.add(Predefined(RS_ELEMENT_XY_F32, e));
-
-    e = new Element(3);
-    e->setComponent(0, x);
-    e->setComponent(1, y);
-    e->setComponent(2, z);
-    mPredefinedList.add(Predefined(RS_ELEMENT_XYZ_F32, e));
-
-    e = new Element(4);
-    e->setComponent(0, s);
-    e->setComponent(1, t);
-    e->setComponent(2, x);
-    e->setComponent(3, y);
-    mPredefinedList.add(Predefined(RS_ELEMENT_ST_XY_F32, e));
-
-    e = new Element(5);
-    e->setComponent(0, s);
-    e->setComponent(1, t);
-    e->setComponent(2, x);
-    e->setComponent(3, y);
-    e->setComponent(4, z);
-    mPredefinedList.add(Predefined(RS_ELEMENT_ST_XYZ_F32, e));
-
-    e = new Element(6);
-    e->setComponent(0, nx);
-    e->setComponent(1, ny);
-    e->setComponent(2, nz);
-    e->setComponent(3, x);
-    e->setComponent(4, y);
-    e->setComponent(5, z);
-    mPredefinedList.add(Predefined(RS_ELEMENT_NORM_XYZ_F32, e));
-
-    e = new Element(8);
-    e->setComponent(0, nx);
-    e->setComponent(1, ny);
-    e->setComponent(2, nz);
-    e->setComponent(3, s);
-    e->setComponent(4, t);
-    e->setComponent(5, x);
-    e->setComponent(6, y);
-    e->setComponent(7, z);
-    mPredefinedList.add(Predefined(RS_ELEMENT_NORM_ST_XYZ_F32, e));
-}
-
 
 Element::Element()
 {
@@ -358,39 +194,6 @@ void rsi_ElementBegin(Context *rsc)
     rsc->mStateElement.mComponentBuildList.clear();
 }
 
-void rsi_ElementAddPredefined(Context *rsc, RsElementPredefined predef)
-{
-    ElementState * sec = &rsc->mStateElement;
-
-    RsElement ve = rsi_ElementGetPredefined(rsc, predef);
-    const Element *e = static_cast<const Element *>(ve);
-
-    for(size_t ct = 0; ct < sec->mPredefinedList[predef].mElement->getComponentCount(); ct++) {
-        sec->mComponentBuildList.add(sec->mPredefinedList[predef].mElement->getComponent(ct));
-    }
-}
-
-RsElement rsi_ElementGetPredefined(Context *rsc, RsElementPredefined predef)
-{
-    ElementState * sec = &rsc->mStateElement;
-
-    if (!sec->mPredefinedList.size()) {
-        sec->initPredefined();
-    }
-
-    if ((predef < 0) ||
-        (static_cast<uint32_t>(predef) >= sec->mPredefinedList.size())) {
-        LOGE("rsElementGetPredefined: Request for bad predefined type");
-        // error
-        return NULL;
-    }
-
-    rsAssert(sec->mPredefinedList[predef].mEnum == predef);
-    Element * e = sec->mPredefinedList[predef].mElement;
-    e->incUserRef();
-    return e;
-}
-
 void rsi_ElementAdd(Context *rsc, RsDataKind dk, RsDataType dt, bool isNormalized, size_t bits, const char *name)
 {
     ElementState * sec = &rsc->mStateElement;