Scarfski/filament
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Refactor CallbackUtils.

Browse Source
This commit is contained in:
Philip Rideout
2020-08-05 15:38:31 -07:00
parent 2727cddd7a
commit dc74ee2ddc
3 changed files with 28 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
android/filament-android/src/main/cpp/Texture.cpp
View File

@@ -410,7 +410,7 @@ public:
, mHandler(env->NewGlobalRef(handler))
, mCallback(env->NewGlobalRef(runnable))
{
initCallbackJni(env, mCallbackUtils);
acquireCallbackJni(env, mCallbackUtils);
if (mBitmap) {
AndroidBitmap_getInfo(mEnv, mBitmap, &mInfo);
AndroidBitmap_lockPixels(mEnv, mBitmap, &mData);
@@ -418,22 +418,7 @@ public:
}
~AutoBitmap() noexcept {
if (mHandler && mCallback) {
#ifdef ANDROID
if (mEnv->IsInstanceOf(mHandler, mCallbackUtils.handlerClass)) {
mEnv->CallBooleanMethod(mHandler, mCallbackUtils.post, mCallback);
}
#endif
if (mEnv->IsInstanceOf(mHandler, mCallbackUtils.executorClass)) {
mEnv->CallVoidMethod(mHandler, mCallbackUtils.execute, mCallback);
}
}
mEnv->DeleteGlobalRef(mHandler);
mEnv->DeleteGlobalRef(mCallback);
#ifdef ANDROID
mEnv->DeleteGlobalRef(mCallbackUtils.handlerClass);
#endif
mEnv->DeleteGlobalRef(mCallbackUtils.executorClass);
releaseCallbackJni(mEnv, mCallbackUtils, mHandler, mCallback);
if (mBitmap) {
AndroidBitmap_unlockPixels(mEnv, mBitmap);
mEnv->DeleteGlobalRef(mBitmap);