summaryrefslogtreecommitdiffstats
path: root/libs/rs
diff options
context:
space:
mode:
authorJason Sams <rjsams@android.com>2009-10-14 15:43:53 -0700
committerJason Sams <rjsams@android.com>2009-10-15 16:06:42 -0700
commitc7412b3b08d62c298dc7c3e5f369f406a3c0eac2 (patch)
tree4ff8ec640c4a6c05643fb9aeb0ac9bc533ec50ab /libs/rs
parent6a17e163a0dca28c1b2f957561e909172b7259c8 (diff)
downloadframeworks_base-c7412b3b08d62c298dc7c3e5f369f406a3c0eac2.zip
frameworks_base-c7412b3b08d62c298dc7c3e5f369f406a3c0eac2.tar.gz
frameworks_base-c7412b3b08d62c298dc7c3e5f369f406a3c0eac2.tar.bz2
Minor bug fixes and add glError check.
Diffstat (limited to 'libs/rs')
-rw-r--r--libs/rs/rsContext.cpp6
-rw-r--r--libs/rs/rsProgramRaster.cpp2
2 files changed, 7 insertions, 1 deletions
diff --git a/libs/rs/rsContext.cpp b/libs/rs/rsContext.cpp
index 33ed0ca..5127717 100644
--- a/libs/rs/rsContext.cpp
+++ b/libs/rs/rsContext.cpp
@@ -145,6 +145,12 @@ bool Context::runRootScript()
}
mStateFragmentStore.mLast.clear();
bool ret = runScript(mRootScript.get(), 0);
+
+ GLenum err = glGetError();
+ if (err != GL_NO_ERROR) {
+ LOGE("Pending GL Error, 0x%x", err);
+ }
+
return ret;
}
diff --git a/libs/rs/rsProgramRaster.cpp b/libs/rs/rsProgramRaster.cpp
index fcf6824..51ae7cf 100644
--- a/libs/rs/rsProgramRaster.cpp
+++ b/libs/rs/rsProgramRaster.cpp
@@ -74,7 +74,7 @@ void ProgramRaster::setupGL(const Context *rsc, ProgramRasterState *state)
if (mLineSmooth) {
glEnable(GL_LINE_SMOOTH);
} else {
- glEnable(GL_LINE_SMOOTH);
+ glDisable(GL_LINE_SMOOTH);
}
if (rsc->checkVersion1_1()) {