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

Commit 3eb31061 authored by Jason Sams's avatar Jason Sams Committed by Android (Google) Code Review
Browse files

Merge "Fix a severe cleanup bug where teardown of the GL driver could occur on the wrong thread."

parents e627f55b 546f01b6

libs/rs/rs.spec

+3 −0
Original line number Diff line number Diff line
@@ -47,6 +47,9 @@ ContextSetPriority { 
	param int32_t priority

	}



ContextDestroy {

}



AssignName {

	param void *obj

	param const char *name

libs/rs/rsContext.cpp

+4 −5
Original line number Diff line number Diff line
@@ -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);