diff options
| author | Jason Sams <rjsams@android.com> | 2010-06-22 17:22:13 -0700 |
|---|---|---|
| committer | Jason Sams <rjsams@android.com> | 2010-06-22 17:22:13 -0700 |
| commit | 7c1f4c38a2d3a972f7dc6f508d3318c11ec539c7 (patch) | |
| tree | 770928e5210f90d2a262e5f13cac228901d2de67 | |
| parent | ef7fa7bc66e3b5cab0519a06ed89c52bfe60d27c (diff) | |
| download | frameworks_base-7c1f4c38a2d3a972f7dc6f508d3318c11ec539c7.zip frameworks_base-7c1f4c38a2d3a972f7dc6f508d3318c11ec539c7.tar.gz frameworks_base-7c1f4c38a2d3a972f7dc6f508d3318c11ec539c7.tar.bz2 | |
Re-enable optimization for detecting nop state changes in fragment
and vertex programs.
Change-Id: Ic5b9ecf564d121d7a00a1eed92afb4c4783ce8bc
| -rw-r--r-- | libs/rs/rsProgramFragment.cpp | 6 | ||||
| -rw-r--r-- | libs/rs/rsProgramVertex.cpp | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/libs/rs/rsProgramFragment.cpp b/libs/rs/rsProgramFragment.cpp index 8151f06..cbe33c7 100644 --- a/libs/rs/rsProgramFragment.cpp +++ b/libs/rs/rsProgramFragment.cpp @@ -97,7 +97,7 @@ void ProgramFragment::setupGL(const Context *rsc, ProgramFragmentState *state) } glTexEnvi(GL_POINT_SPRITE_OES, GL_COORD_REPLACE_OES, mPointSpriteEnable); #endif //ANDROID_RS_BUILD_FOR_HOST - + } mTextures[ct]->uploadCheck(rsc); glBindTexture(GL_TEXTURE_2D, mTextures[ct]->getTextureID()); @@ -153,7 +153,7 @@ void ProgramFragment::setupGL2(const Context *rsc, ProgramFragmentState *state, //LOGE("sgl2 frag1 %x", glGetError()); if ((state->mLast.get() == this) && !mDirty) { - //return; + return; } state->mLast.set(this); @@ -300,7 +300,7 @@ void ProgramFragment::init(Context *rsc) void ProgramFragment::serialize(OStream *stream) const { - + } ProgramFragment *ProgramFragment::createFromStream(Context *rsc, IStream *stream) diff --git a/libs/rs/rsProgramVertex.cpp b/libs/rs/rsProgramVertex.cpp index b8d1461..85d90c7 100644 --- a/libs/rs/rsProgramVertex.cpp +++ b/libs/rs/rsProgramVertex.cpp @@ -221,7 +221,7 @@ void ProgramVertex::setupGL2(const Context *rsc, ProgramVertexState *state, Shad { //LOGE("sgl2 vtx1 %x", glGetError()); if ((state->mLast.get() == this) && !mDirty) { - //return; + return; } rsc->checkError("ProgramVertex::setupGL2 start"); |