summaryrefslogtreecommitdiff
path: root/libs/rs/rsProgramRaster.cpp
diff options
context:
space:
mode:
author Jason Sams <rjsams@android.com> 2010-09-16 18:18:29 -0700
committer Jason Sams <rjsams@android.com> 2010-09-16 18:18:29 -0700
commitd081fffab58b4cb8a36b7a083ab7793585bc1510 (patch)
tree2d4ea330edfd21499546fc0a9ae9d647d7a1ee0e /libs/rs/rsProgramRaster.cpp
parenta8bf9429b29743b3489817feb21bde2416acc465 (diff)
Cleanup GL setup code and remove legacy 1.1 paths.
Reset pointers to NULL when allocations are unbound. Change-Id: Ifaba634ecbb154970b7fb47faa8e6475d16d2f66
Diffstat (limited to 'libs/rs/rsProgramRaster.cpp')
-rw-r--r--libs/rs/rsProgramRaster.cpp46
1 files changed, 0 insertions, 46 deletions
diff --git a/libs/rs/rsProgramRaster.cpp b/libs/rs/rsProgramRaster.cpp
index 5b6937017294..62d060d37899 100644
--- a/libs/rs/rsProgramRaster.cpp
+++ b/libs/rs/rsProgramRaster.cpp
@@ -61,52 +61,6 @@ void ProgramRaster::setCullMode(RsCullMode mode)
mDirty = true;
}
-void ProgramRaster::setupGL(const Context *rsc, ProgramRasterState *state)
-{
- if (state->mLast.get() == this && !mDirty) {
- return;
- }
- state->mLast.set(this);
- mDirty = false;
-
- if (mPointSmooth) {
- glEnable(GL_POINT_SMOOTH);
- } else {
- glDisable(GL_POINT_SMOOTH);
- }
-
- glLineWidth(mLineWidth);
- if (mLineSmooth) {
- glEnable(GL_LINE_SMOOTH);
- } else {
- glDisable(GL_LINE_SMOOTH);
- }
-
- if (rsc->checkVersion1_1()) {
-#ifndef ANDROID_RS_BUILD_FOR_HOST
- if (mPointSprite) {
- glEnable(GL_POINT_SPRITE_OES);
- } else {
- glDisable(GL_POINT_SPRITE_OES);
- }
-#endif //ANDROID_RS_BUILD_FOR_HOST
- }
-
- switch(mCull) {
- case RS_CULL_BACK:
- glEnable(GL_CULL_FACE);
- glCullFace(GL_BACK);
- break;
- case RS_CULL_FRONT:
- glEnable(GL_CULL_FACE);
- glCullFace(GL_FRONT);
- break;
- case RS_CULL_NONE:
- glDisable(GL_CULL_FACE);
- break;
- }
-}
-
void ProgramRaster::setupGL2(const Context *rsc, ProgramRasterState *state)
{
if (state->mLast.get() == this && !mDirty) {