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

gltfio: Cache the JNI field ids for MaterialKey.

Browse Source
This commit is contained in:
Philip Rideout
2021-07-01 16:11:55 -07:00
parent d270c42109
commit e9ff2157bc
5 changed files with 176 additions and 84 deletions
Download Patch File Download Diff File Expand all files Collapse all files
android/gltfio-android/src/main/cpp/UbershaderLoader.cpp
+5 -5
View File
@@ -49,15 +49,15 @@ Java_com_google_android_filament_gltfio_UbershaderLoader_nDestroyMaterials(JNIEn
extern "C" JNIEXPORT long JNICALL
Java_com_google_android_filament_gltfio_UbershaderLoader_nCreateMaterialInstance(JNIEnv* env, jclass,
jlong nativeProvider, jobject materialKey, jintArray uvmap, jstring label) {
const jclass materialKeyClass = env->FindClass(JAVA_MATERIAL_KEY);
MaterialKey key = {};
MaterialKey nativeKey = {};
nativeFromJava(env, key, materialKey);
auto& helper = MaterialKeyHelper::get();
helper.copy(env, nativeKey, materialKey);
const char* nativeLabel = label ? env->GetStringUTFChars(label, nullptr) : nullptr;
UvMap nativeUvMap = {};
auto provider = (MaterialProvider*) nativeProvider;
MaterialInstance* instance = provider->createMaterialInstance(&key, &nativeUvMap, nativeLabel);
MaterialInstance* instance = provider->createMaterialInstance(&nativeKey, &nativeUvMap, nativeLabel);
// Copy the UvMap results from the native array into the JVM array.
jint* elements = env->GetIntArrayElements(uvmap, nullptr);
@@ -70,7 +70,7 @@ Java_com_google_android_filament_gltfio_UbershaderLoader_nCreateMaterialInstance
}
// The config parameter is an in-out parameter so we need to copy the results back to Java.
nativeToJava(env, key, materialKey);
helper.copy(env, materialKey, nativeKey);
if (label) {
env->ReleaseStringUTFChars(label, nativeLabel);