diff options
author | Jason Sams <rjsams@android.com> | 2010-09-01 13:50:47 -0700 |
---|---|---|
committer | Jason Sams <rjsams@android.com> | 2010-09-01 14:23:13 -0700 |
commit | deb0008c6340e49805fa5386761a6a6a7949763f (patch) | |
tree | 17dbd4931e9fa1a2b529a6fbc327b4ae9f7d6bd8 /libs/rs | |
parent | e447a786357c91d7c48f2475605e692de5b12da1 (diff) | |
download | frameworks_base-deb0008c6340e49805fa5386761a6a6a7949763f.zip frameworks_base-deb0008c6340e49805fa5386761a6a6a7949763f.tar.gz frameworks_base-deb0008c6340e49805fa5386761a6a6a7949763f.tar.bz2 |
Remove ACC and other legacy bits from RS.
Change-Id: I12a3b0477f3201ec7ca63564ae2b387ecc89dedf
Diffstat (limited to 'libs/rs')
-rw-r--r-- | libs/rs/rsProgramVertex.cpp | 47 | ||||
-rw-r--r-- | libs/rs/rsScriptC_Lib.cpp | 1 | ||||
-rw-r--r-- | libs/rs/rsScriptC_LibGL.cpp | 1 |
3 files changed, 1 insertions, 48 deletions
diff --git a/libs/rs/rsProgramVertex.cpp b/libs/rs/rsProgramVertex.cpp index e1628f4..68e3705 100644 --- a/libs/rs/rsProgramVertex.cpp +++ b/libs/rs/rsProgramVertex.cpp @@ -70,52 +70,7 @@ static void logMatrix(const char *txt, const float *f) void ProgramVertex::setupGL(const Context *rsc, ProgramVertexState *state) { - if ((state->mLast.get() == this) && !mDirty) { - return; - } - state->mLast.set(this); - - const float *f = static_cast<const float *>(mConstants[0]->getPtr()); - - glMatrixMode(GL_TEXTURE); - if (mTextureMatrixEnable) { - glLoadMatrixf(&f[RS_PROGRAM_VERTEX_TEXTURE_OFFSET]); - } else { - glLoadIdentity(); - } - - glMatrixMode(GL_MODELVIEW); - glLoadIdentity(); - if (mLightCount) { -#ifndef ANDROID_RS_BUILD_FOR_HOST // GLES Only - int v = 0; - glEnable(GL_LIGHTING); - - glLightModelxv(GL_LIGHT_MODEL_TWO_SIDE, &v); - - for (uint32_t ct = 0; ct < mLightCount; ct++) { - const Light *l = mLights[ct].get(); - glEnable(GL_LIGHT0 + ct); - l->setupGL(ct); - } - for (uint32_t ct = mLightCount; ct < MAX_LIGHTS; ct++) { - glDisable(GL_LIGHT0 + ct); - } -#endif //ANDROID_RS_BUILD_FOR_HOST - } else { - glDisable(GL_LIGHTING); - } - - if (!f) { - LOGE("Must bind constants to vertex program"); - } - - glMatrixMode(GL_PROJECTION); - glLoadMatrixf(&f[RS_PROGRAM_VERTEX_PROJECTION_OFFSET]); - glMatrixMode(GL_MODELVIEW); - glLoadMatrixf(&f[RS_PROGRAM_VERTEX_MODELVIEW_OFFSET]); - - mDirty = false; + assert(0); } void ProgramVertex::loadShader(Context *rsc) { diff --git a/libs/rs/rsScriptC_Lib.cpp b/libs/rs/rsScriptC_Lib.cpp index 5a2b6ba..b4b32bb 100644 --- a/libs/rs/rsScriptC_Lib.cpp +++ b/libs/rs/rsScriptC_Lib.cpp @@ -18,7 +18,6 @@ #include "rsScriptC.h" #include "rsMatrix.h" -#include "acc/acc.h" #include "utils/Timers.h" #include <time.h> diff --git a/libs/rs/rsScriptC_LibGL.cpp b/libs/rs/rsScriptC_LibGL.cpp index a7877cd..2f8f79a 100644 --- a/libs/rs/rsScriptC_LibGL.cpp +++ b/libs/rs/rsScriptC_LibGL.cpp @@ -18,7 +18,6 @@ #include "rsScriptC.h" #include "rsMatrix.h" -#include "acc/acc.h" #include "utils/Timers.h" #define GL_GLEXT_PROTOTYPES |