diff options
author | Jason Sams <rjsams@android.com> | 2011-02-23 14:47:17 -0800 |
---|---|---|
committer | Jason Sams <rjsams@android.com> | 2011-02-23 14:47:17 -0800 |
commit | 07078e385872ee9eed475aaf43e1b89bcc3329f1 (patch) | |
tree | 001f51afb7cf483308cfc7bda053fe72e05ec406 /libs/rs | |
parent | 3b36ff48f1d64022366b180c75fa9ef9d034f9e8 (diff) | |
download | frameworks_base-07078e385872ee9eed475aaf43e1b89bcc3329f1.zip frameworks_base-07078e385872ee9eed475aaf43e1b89bcc3329f1.tar.gz frameworks_base-07078e385872ee9eed475aaf43e1b89bcc3329f1.tar.bz2 |
fix bug 3477451
Bogus asserts with pure compute scripts.
Change-Id: If5928c563e06405f75a11606d9148d64fa10be07
Diffstat (limited to 'libs/rs')
-rw-r--r-- | libs/rs/rsContext.cpp | 24 |
1 files changed, 14 insertions, 10 deletions
diff --git a/libs/rs/rsContext.cpp b/libs/rs/rsContext.cpp index 1dfedb3..2e6ea12 100644 --- a/libs/rs/rsContext.cpp +++ b/libs/rs/rsContext.cpp @@ -270,19 +270,23 @@ void Context::deinitEGL() { Context::PushState::PushState(Context *con) { mRsc = con; - mFragment.set(con->getProgramFragment()); - mVertex.set(con->getProgramVertex()); - mStore.set(con->getProgramStore()); - mRaster.set(con->getProgramRaster()); - mFont.set(con->getFont()); + if (con->mIsGraphicsContext) { + mFragment.set(con->getProgramFragment()); + mVertex.set(con->getProgramVertex()); + mStore.set(con->getProgramStore()); + mRaster.set(con->getProgramRaster()); + mFont.set(con->getFont()); + } } Context::PushState::~PushState() { - mRsc->setProgramFragment(mFragment.get()); - mRsc->setProgramVertex(mVertex.get()); - mRsc->setProgramStore(mStore.get()); - mRsc->setProgramRaster(mRaster.get()); - mRsc->setFont(mFont.get()); + if (mRsc->mIsGraphicsContext) { + mRsc->setProgramFragment(mFragment.get()); + mRsc->setProgramVertex(mVertex.get()); + mRsc->setProgramStore(mStore.get()); + mRsc->setProgramRaster(mRaster.get()); + mRsc->setFont(mFont.get()); + } } |