diff options
| author | Jason Sams <rjsams@android.com> | 2010-12-09 12:21:19 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2010-12-09 12:21:19 -0800 |
| commit | 3eb3106137aa23ceb19c5817fa43bbe545636430 (patch) | |
| tree | 161a661f3956745723d18e0ea64ff55c794b610b /libs | |
| parent | e627f55bf8eaadf8d404b9592608e05b8a33ef5e (diff) | |
| parent | 546f01b6d52d8da18c7a39239a36adf5b05ccf48 (diff) | |
| download | frameworks_base-3eb3106137aa23ceb19c5817fa43bbe545636430.zip frameworks_base-3eb3106137aa23ceb19c5817fa43bbe545636430.tar.gz frameworks_base-3eb3106137aa23ceb19c5817fa43bbe545636430.tar.bz2 | |
Merge "Fix a severe cleanup bug where teardown of the GL driver could occur on the wrong thread."
Diffstat (limited to 'libs')
| -rw-r--r-- | libs/rs/rs.spec | 3 | ||||
| -rw-r--r-- | libs/rs/rsContext.cpp | 9 |
2 files changed, 7 insertions, 5 deletions
diff --git a/libs/rs/rs.spec b/libs/rs/rs.spec index b1551ba..97ecca0 100644 --- a/libs/rs/rs.spec +++ b/libs/rs/rs.spec @@ -47,6 +47,9 @@ ContextSetPriority { param int32_t priority } +ContextDestroy { +} + AssignName { param void *obj param const char *name diff --git a/libs/rs/rsContext.cpp b/libs/rs/rsContext.cpp index 35db332..2988950 100644 --- a/libs/rs/rsContext.cpp +++ b/libs/rs/rsContext.cpp @@ -1019,6 +1019,10 @@ void rsi_ContextDump(Context *rsc, int32_t bits) { ObjectBase::dumpAll(rsc); } +void rsi_ContextDestroy(Context *rsc) { + delete rsc; +} + } } @@ -1038,11 +1042,6 @@ RsContext rsContextCreateGL(RsDevice vdev, uint32_t version, RsSurfaceConfig sc) return rsc; } -void rsContextDestroy(RsContext vrsc) { - Context * rsc = static_cast<Context *>(vrsc); - delete rsc; -} - RsMessageToClientType rsContextPeekMessage(RsContext vrsc, size_t *receiveLen, uint32_t *subID, bool wait) { Context * rsc = static_cast<Context *>(vrsc); return rsc->peekMessageToClient(receiveLen, subID, wait); |