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

am 8dab9693: am c7412b3b: Minor bug fixes and add glError check.

Browse Source 
Merge commit '8dab969302f2229397024bdaa005b35f30a46c62' into eclair-mr2-plus-aosp

* commit '8dab969302f2229397024bdaa005b35f30a46c62':
  Minor bug fixes and add glError check.
This commit is contained in:
Jason Sams
2009-10-15 19:14:15 -07:00
committed by Android Git Automerger
parent 1fab3e7981 8dab969302
commit af4e786ab3
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()) {