Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8dab9693 authored by Jason Sams's avatar Jason Sams Committed by Android Git Automerger
Browse files

am c7412b3b: Minor bug fixes and add glError check. 

Merge commit 'c7412b3b' into eclair-mr2

* commit 'c7412b3b':
  Minor bug fixes and add glError check.
parents 8111da3e c7412b3b

libs/rs/rsContext.cpp

+6 −0
Original line number Diff line number Diff line
@@ -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;

}

libs/rs/rsProgramRaster.cpp

+1 −1
Original line number Diff line number Diff line
@@ -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()) {