Merge change 7939

* changes:
  Split rsScriptC into class implemtation and library functions.  Update test apps, all 3 should be working.

1 files changed, 4 insertions, 460 deletions

diff --git a/libs/rs/rsScriptC.cpp b/libs/rs/rsScriptC.cpp
index e9fc4d079b9c..e0928c3c53bc 100644
--- a/libs/rs/rsScriptC.cpp
+++ b/libs/rs/rsScriptC.cpp
@@ -46,413 +46,6 @@ ScriptC::~ScriptC()
     }
 }
 
-extern "C" float fixedToFloat(int32_t f)
-{
-    return ((float)f) / 0x10000;
-}
-
-extern "C" float intToFloat(int32_t f)
-{
-    return (float)f;
-}
-
-extern "C" void matrixLoadIdentity(rsc_Matrix *mat)
-{
-    Matrix *m = reinterpret_cast<Matrix *>(mat);
-    m->loadIdentity();
-}
-
-extern "C" void matrixLoadFloat(rsc_Matrix *mat, const float *f)
-{
-    Matrix *m = reinterpret_cast<Matrix *>(mat);
-    m->load(f);
-}
-
-extern "C" void matrixLoadMat(rsc_Matrix *mat, const rsc_Matrix *newmat)
-{
-    Matrix *m = reinterpret_cast<Matrix *>(mat);
-    m->load(reinterpret_cast<const Matrix *>(newmat));
-}
-
-extern "C" void matrixLoadRotate(rsc_Matrix *mat, float rot, float x, float y, float z)
-{
-    Matrix *m = reinterpret_cast<Matrix *>(mat);
-    m->loadRotate(rot, x, y, z);
-}
-
-extern "C" void matrixLoadScale(rsc_Matrix *mat, float x, float y, float z)
-{
-    Matrix *m = reinterpret_cast<Matrix *>(mat);
-    m->loadScale(x, y, z);
-}
-
-extern "C" void matrixLoadTranslate(rsc_Matrix *mat, float x, float y, float z)
-{
-    Matrix *m = reinterpret_cast<Matrix *>(mat);
-    m->loadTranslate(x, y, z);
-}
-
-extern "C" void matrixLoadMultiply(rsc_Matrix *mat, const rsc_Matrix *lhs, const rsc_Matrix *rhs)
-{
-    Matrix *m = reinterpret_cast<Matrix *>(mat);
-    m->loadMultiply(reinterpret_cast<const Matrix *>(lhs),
-                    reinterpret_cast<const Matrix *>(rhs));
-}
-
-extern "C" void matrixMultiply(rsc_Matrix *mat, const rsc_Matrix *rhs)
-{
-    Matrix *m = reinterpret_cast<Matrix *>(mat);
-    m->multiply(reinterpret_cast<const Matrix *>(rhs));
-}
-
-extern "C" void matrixRotate(rsc_Matrix *mat, float rot, float x, float y, float z)
-{
-    Matrix *m = reinterpret_cast<Matrix *>(mat);
-    m->rotate(rot, x, y, z);
-}
-
-extern "C" void matrixScale(rsc_Matrix *mat, float x, float y, float z)
-{
-    Matrix *m = reinterpret_cast<Matrix *>(mat);
-    m->scale(x, y, z);
-}
-
-extern "C" void matrixTranslate(rsc_Matrix *mat, float x, float y, float z)
-{
-    Matrix *m = reinterpret_cast<Matrix *>(mat);
-    m->translate(x, y, z);
-}
-
-
-extern "C" const void * loadVp(uint32_t bank, uint32_t offset)
-{
-    GET_TLS();
-    return &static_cast<const uint8_t *>(sc->mSlots[bank]->getPtr())[offset];
-}
-
-static float SC_loadF(uint32_t bank, uint32_t offset)
-{
-    GET_TLS();
-    float f = static_cast<const float *>(sc->mSlots[bank]->getPtr())[offset];
-    //LOGE("loadF %i %i = %f %x", bank, offset, f, ((int *)&f)[0]);
-    return f;
-}
-
-static int32_t SC_loadI32(uint32_t bank, uint32_t offset)
-{
-    GET_TLS();
-    int32_t t = static_cast<const int32_t *>(sc->mSlots[bank]->getPtr())[offset];
-    //LOGE("loadI32 %i %i = %i", bank, offset, t);
-    return t;
-}
-
-static uint32_t SC_loadU32(uint32_t bank, uint32_t offset)
-{
-    GET_TLS();
-    return static_cast<const uint32_t *>(sc->mSlots[bank]->getPtr())[offset];
-}
-
-extern "C" void loadEnvVec4(uint32_t bank, uint32_t offset, rsc_Vector4 *v)
-{
-    GET_TLS();
-    memcpy(v, &static_cast<const float *>(sc->mSlots[bank]->getPtr())[offset], sizeof(rsc_Vector4));
-}
-
-extern "C" void loadEnvMatrix(uint32_t bank, uint32_t offset, rsc_Matrix *m)
-{
-    GET_TLS();
-    memcpy(m, &static_cast<const float *>(sc->mSlots[bank]->getPtr())[offset], sizeof(rsc_Matrix));
-}
-
-
-static void SC_storeF(uint32_t bank, uint32_t offset, float v)
-{
-    //LOGE("storeF %i %i %f", bank, offset, v);
-    GET_TLS();
-    static_cast<float *>(sc->mSlots[bank]->getPtr())[offset] = v;
-}
-
-static void SC_storeI32(uint32_t bank, uint32_t offset, int32_t v)
-{
-    GET_TLS();
-    static_cast<int32_t *>(sc->mSlots[bank]->getPtr())[offset] = v;
-}
-
-static void SC_storeU32(uint32_t bank, uint32_t offset, uint32_t v)
-{
-    GET_TLS();
-    static_cast<uint32_t *>(sc->mSlots[bank]->getPtr())[offset] = v;
-}
-
-extern "C" void storeEnvVec4(uint32_t bank, uint32_t offset, const rsc_Vector4 *v)
-{
-    GET_TLS();
-    memcpy(&static_cast<float *>(sc->mSlots[bank]->getPtr())[offset], v, sizeof(rsc_Vector4));
-}
-
-extern "C" void storeEnvMatrix(uint32_t bank, uint32_t offset, const rsc_Matrix *m)
-{
-    GET_TLS();
-    memcpy(&static_cast<float *>(sc->mSlots[bank]->getPtr())[offset], m, sizeof(rsc_Matrix));
-}
-
-
-static void SC_color(float r, float g, float b, float a)
-{
-    glColor4f(r, g, b, a);
-}
-
-extern "C" void renderTriangleMesh(RsTriangleMesh mesh)
-{
-    GET_TLS();
-    rsi_TriangleMeshRender(rsc, mesh);
-}
-
-extern "C" void renderTriangleMeshRange(RsTriangleMesh mesh, uint32_t start, uint32_t count)
-{
-    GET_TLS();
-    rsi_TriangleMeshRenderRange(rsc, mesh, start, count);
-}
-
-extern "C" void materialDiffuse(float r, float g, float b, float a)
-{
-    float v[] = {r, g, b, a};
-    glMaterialfv(GL_FRONT_AND_BACK, GL_DIFFUSE, v);
-}
-
-extern "C" void materialSpecular(float r, float g, float b, float a)
-{
-    float v[] = {r, g, b, a};
-    glMaterialfv(GL_FRONT_AND_BACK, GL_SPECULAR, v);
-}
-
-extern "C" void lightPosition(float x, float y, float z, float w)
-{
-    float v[] = {x, y, z, w};
-    glLightfv(GL_LIGHT0, GL_POSITION, v);
-}
-
-extern "C" void materialShininess(float s)
-{
-    glMaterialfv(GL_FRONT_AND_BACK, GL_SHININESS, &s);
-}
-
-extern "C" void uploadToTexture(RsAllocation va, uint32_t baseMipLevel)
-{
-    GET_TLS();
-    rsi_AllocationUploadToTexture(rsc, va, baseMipLevel);
-}
-
-extern "C" void enable(uint32_t p)
-{
-    glEnable(p);
-}
-
-extern "C" void disable(uint32_t p)
-{
-    glDisable(p);
-}
-
-static float SC_randf(float max)
-{
-    float r = (float)rand();
-    return r / RAND_MAX * max;
-}
-
-// Assumes (GL_FIXED) x,y,z (GL_UNSIGNED_BYTE)r,g,b,a
-static void SC_drawTriangleArray(int ialloc, uint32_t count)
-{
-    GET_TLS();
-    RsAllocation alloc = (RsAllocation)ialloc;
-
-    const Allocation *a = (const Allocation *)alloc;
-    const uint32_t *ptr = (const uint32_t *)a->getPtr();
-
-    rsc->setupCheck();
-
-    glBindBuffer(GL_ARRAY_BUFFER, 0);
-    //glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, tm->mBufferObjects[1]);
-
-    glEnableClientState(GL_VERTEX_ARRAY);
-    glDisableClientState(GL_NORMAL_ARRAY);
-    glDisableClientState(GL_TEXTURE_COORD_ARRAY);
-    glEnableClientState(GL_COLOR_ARRAY);
-
-    glVertexPointer(2, GL_FIXED, 12, ptr + 1);
-    //glTexCoordPointer(2, GL_FIXED, 24, ptr + 1);
-    glColorPointer(4, GL_UNSIGNED_BYTE, 12, ptr);
-
-    glDrawArrays(GL_TRIANGLES, 0, count * 3);
-}
-
-extern "C" void drawRect(int32_t x1, int32_t x2, int32_t y1, int32_t y2)
-{
-    GET_TLS();
-    x1 = (x1 << 16);
-    x2 = (x2 << 16);
-    y1 = (y1 << 16);
-    y2 = (y2 << 16);
-
-    int32_t vtx[] = {x1,y1, x1,y2, x2,y1, x2,y2};
-    static const int32_t tex[] = {0,0, 0,0x10000, 0x10000,0, 0x10000,0x10000};
-
-
-    rsc->setupCheck();
-
-    glBindBuffer(GL_ARRAY_BUFFER, 0);
-    //glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, tm->mBufferObjects[1]);
-
-    glEnableClientState(GL_VERTEX_ARRAY);
-    glEnableClientState(GL_TEXTURE_COORD_ARRAY);
-    glDisableClientState(GL_NORMAL_ARRAY);
-    glDisableClientState(GL_COLOR_ARRAY);
-
-    glVertexPointer(2, GL_FIXED, 8, vtx);
-    glTexCoordPointer(2, GL_FIXED, 8, tex);
-    //glColorPointer(4, GL_UNSIGNED_BYTE, 12, ptr);
-
-    glDrawArrays(GL_TRIANGLE_STRIP, 0, 4);
-}
-
-static void SC_drawQuad(float x1, float y1, float z1,
-                        float x2, float y2, float z2,
-                        float x3, float y3, float z3,
-                        float x4, float y4, float z4)
-{
-    GET_TLS();
-
-    //LOGE("Quad");
-    //LOGE("%4.2f, %4.2f, %4.2f", x1, y1, z1);
-    //LOGE("%4.2f, %4.2f, %4.2f", x2, y2, z2);
-    //LOGE("%4.2f, %4.2f, %4.2f", x3, y3, z3);
-    //LOGE("%4.2f, %4.2f, %4.2f", x4, y4, z4);
-
-    float vtx[] = {x1,y1,z1, x2,y2,z2, x3,y3,z3, x4,y4,z4};
-    static const float tex[] = {0,1, 1,1, 1,0, 0,0};
-
-
-    rsc->setupCheck();
-
-    glBindBuffer(GL_ARRAY_BUFFER, 0);
-    //glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, tm->mBufferObjects[1]);
-
-    glEnableClientState(GL_VERTEX_ARRAY);
-    glVertexPointer(3, GL_FLOAT, 0, vtx);
-
-    glClientActiveTexture(GL_TEXTURE0);
-    glEnableClientState(GL_TEXTURE_COORD_ARRAY);
-    glTexCoordPointer(2, GL_FLOAT, 0, tex);
-    glClientActiveTexture(GL_TEXTURE1);
-    glEnableClientState(GL_TEXTURE_COORD_ARRAY);
-    glTexCoordPointer(2, GL_FLOAT, 0, tex);
-    glClientActiveTexture(GL_TEXTURE0);
-
-    glDisableClientState(GL_NORMAL_ARRAY);
-    glDisableClientState(GL_COLOR_ARRAY);
-
-    //glColorPointer(4, GL_UNSIGNED_BYTE, 12, ptr);
-
-    glDrawArrays(GL_TRIANGLE_FAN, 0, 4);
-}
-
-extern "C" void pfClearColor(float r, float g, float b, float a)
-{
-    //LOGE("c %f %f %f %f", r, g, b, a);
-    GET_TLS();
-    sc->mEnviroment.mClearColor[0] = r;
-    sc->mEnviroment.mClearColor[1] = g;
-    sc->mEnviroment.mClearColor[2] = b;
-    sc->mEnviroment.mClearColor[3] = a;
-}
-
-extern "C" void pfBindTexture(RsProgramFragment vpf, uint32_t slot, RsAllocation va)
-{
-    GET_TLS();
-    rsi_ProgramFragmentBindTexture(rsc,
-                                   static_cast<ProgramFragment *>(vpf),
-                                   slot,
-                                   static_cast<Allocation *>(va));
-
-}
-
-extern "C" void pfBindSampler(RsProgramFragment vpf, uint32_t slot, RsSampler vs)
-{
-    GET_TLS();
-    rsi_ProgramFragmentBindSampler(rsc,
-                                   static_cast<ProgramFragment *>(vpf),
-                                   slot,
-                                   static_cast<Sampler *>(vs));
-
-}
-
-extern "C" void contextBindProgramFragmentStore(RsProgramFragmentStore pfs)
-{
-    GET_TLS();
-    rsi_ContextBindProgramFragmentStore(rsc, pfs);
-
-}
-
-extern "C" void contextBindProgramFragment(RsProgramFragment pf)
-{
-    GET_TLS();
-    rsi_ContextBindProgramFragment(rsc, pf);
-
-}
-
-
-static rsc_FunctionTable scriptCPtrTable;
-/* = {
-    loadVp,
-    SC_loadF,
-    SC_loadI32,
-    SC_loadU32,
-    loadEnvVec4,
-    loadEnvMatrix,
-
-    SC_storeF,
-    SC_storeI32,
-    SC_storeU32,
-    storeEnvVec4,
-    storeEnvMatrix,
-
-    matrixLoadIdentity,
-    matrixLoadFloat,
-    matrixLoadMat,
-    matrixLoadRotate,
-    matrixLoadScale,
-    matrixLoadTranslate,
-    matrixLoadMultiply,
-    matrixMultiply,
-    matrixRotate,
-    matrixScale,
-    matrixTranslate,
-
-    SC_color,
-
-    pfBindTexture,
-    pfBindSampler,
-
-    materialDiffuse,
-    materialSpecular,
-    lightPosition,
-    materialShininess,
-    uploadToTexture,
-    enable,
-    disable,
-
-    SC_randf,
-    contextBindProgramFragment,
-    contextBindProgramFragmentStore,
-
-
-    renderTriangleMesh,
-    renderTriangleMeshRange,
-
-    SC_drawTriangleArray,
-    drawRect
-
-};
-*/
 
 bool ScriptC::run(Context *rsc, uint32_t launchIndex)
 {
@@ -469,9 +62,11 @@ bool ScriptC::run(Context *rsc, uint32_t launchIndex)
         rsc->setVertex(mEnviroment.mVertex.get());
     }
 
+    bool ret = false;
     tls->mScript = this;
-    return mProgram.mScript(launchIndex, &scriptCPtrTable) != 0;
+    ret = mProgram.mScript(launchIndex) != 0;
     tls->mScript = NULL;
+    return ret;
 }
 
 ScriptCState::ScriptCState()
@@ -505,47 +100,6 @@ void ScriptCState::clear()
 
 }
 
-ScriptCState::SymbolTable_t ScriptCState::gSyms[] = {
-    // IO
-    { "loadI32", (void *)&SC_loadI32, "int loadI32(int, int)" },
-    //{ "loadU32", (void *)&SC_loadU32, "unsigned int loadU32(int, int)" },
-    { "loadF", (void *)&SC_loadF, "float loadF(int, int)" },
-    { "storeI32", (void *)&SC_storeI32, "void storeI32(int, int, int)" },
-    //{ "storeU32", (void *)&SC_storeU32, "void storeU32(int, int, unsigned int)" },
-    { "storeF", (void *)&SC_storeF, "void storeF(int, int, float)" },
-
-    // math
-    { "sinf", (void *)&sinf, "float sinf(float)" },
-    { "cosf", (void *)&cosf, "float cosf(float)" },
-    { "fabs", (void *)&fabs, "float fabs(float)" },
-    { "randf", (void *)&SC_randf, "float randf(float)" },
-
-    // context
-    { "drawQuad", (void *)&SC_drawQuad, "void drawQuad(float x1, float y1, float z1, float x2, float y2, float z2, float x3, float y3, float z3, float x4, float y4, float z4)" },
-    { "contextBindProgramFragmentStore", (void *)&contextBindProgramFragmentStore, "void contextBindProgramFragmentStore(int)" },
-    { "pfClearColor", (void *)&pfClearColor, "void pfClearColor(float, float, float, float)" },
-    { "pfBindTexture", (void *)&pfBindTexture, "void pfBindTexture(int, int, int)" },
-
-    { "color", (void *)&SC_color, "void color(float, float, float, float)" },
-    { "drawTriangleArray", (void *)&SC_drawTriangleArray, "void drawTriangleArray(int ialloc, int count)" },
-
-
-    { NULL, NULL, NULL }
-};
-
-const ScriptCState::SymbolTable_t * ScriptCState::lookupSymbol(const char *sym)
-{
-    ScriptCState::SymbolTable_t *syms = gSyms;
-
-    while (syms->mPtr) {
-        if (!strcmp(syms->mName, sym)) {
-            return syms;
-        }
-        syms++;
-    }
-    return NULL;
-}
-
 static ACCvoid* symbolLookup(ACCvoid* pContext, const ACCchar* name) 
 {
     const ScriptCState::SymbolTable_t *sym = ScriptCState::lookupSymbol(name);
@@ -560,16 +114,6 @@ static ACCvoid* symbolLookup(ACCvoid* pContext, const ACCchar* name)
     return NULL;
 }
 
-void ScriptCState::appendDecls(String8 *str)
-{
-    ScriptCState::SymbolTable_t *syms = gSyms;
-    while (syms->mPtr) {
-        str->append(syms->mDecl);
-        str->append(";\n");
-        syms++;
-    }
-}
-
 void ScriptCState::runCompiler(Context *rsc)
 {
     mAccScript = accCreateScript();
@@ -711,7 +255,7 @@ void rsi_ScriptCAddType(Context * rsc, RsType vt)
 void rsi_ScriptCSetScript(Context * rsc, void *vp)
 {
     ScriptCState *ss = &rsc->mScriptC;
-    ss->mProgram.mScript = reinterpret_cast<rsc_RunScript>(vp);
+    ss->mProgram.mScript = reinterpret_cast<ScriptC::RunScript_t>(vp);
 }
 
 void rsi_ScriptCSetRoot(Context * rsc, bool isRoot)