Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am c7412b3b: Minor bug fixes and add glError check.

Browse Source 
Merge commit 'c7412b3b08d62c298dc7c3e5f369f406a3c0eac2' into eclair-mr2

* commit 'c7412b3b08d62c298dc7c3e5f369f406a3c0eac2':
  Minor bug fixes and add glError check.
This commit is contained in:
Jason Sams
2009-10-15 16:17:08 -07:00
committed by Android Git Automerger
parent 8111da3ecf c7412b3b08
commit 8dab969302
2 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
libs/rs/rsContext.cpp
View File

@@ -145,6 +145,12 @@ bool Context::runRootScript()
} }
mStateFragmentStore.mLast.clear(); mStateFragmentStore.mLast.clear();
bool ret = runScript(mRootScript.get(), 0); bool ret = runScript(mRootScript.get(), 0);
GLenum err = glGetError();
if (err != GL_NO_ERROR) {
LOGE("Pending GL Error, 0x%x", err);
}
return ret; return ret;
} }

2
libs/rs/rsProgramRaster.cpp
View File

@@ -74,7 +74,7 @@ void ProgramRaster::setupGL(const Context *rsc, ProgramRasterState *state)
if (mLineSmooth) { if (mLineSmooth) {
glEnable(GL_LINE_SMOOTH); glEnable(GL_LINE_SMOOTH);
} else { } else {
glEnable(GL_LINE_SMOOTH); glDisable(GL_LINE_SMOOTH);
} }
if (rsc->checkVersion1_1()) { if (rsc->checkVersion1_1()) {