Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Use the first Vulkan layer path" into nyc-mr1-dev

Browse Source
This commit is contained in:
Chia-I Wu
2016-06-29 07:39:01 +00:00
committed by Android (Google) Code Review
parent 5e055187be 15e74c9614
commit bbadc5d313
1 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
core/jni/android_app_ApplicationLoaders.cpp
View File

@@ -14,6 +14,8 @@
* limitations under the License.
*/
#define LOG_TAG "ApplicationLoaders"
#include <nativehelper/ScopedUtfChars.h>
#include <nativeloader/native_loader.h>
#include <vulkan/vulkan_loader_data.h>
@@ -22,10 +24,17 @@
static void setupVulkanLayerPath_native(JNIEnv* env, jobject clazz,
jobject classLoader, jstring librarySearchPath) {
android_namespace_t* ns = android::FindNamespaceByClassLoader(env, classLoader);
ScopedUtfChars layerPathChars(env, librarySearchPath);
vulkan::LoaderData& loader_data = vulkan::LoaderData::GetInstance();
loader_data.layer_path = layerPathChars.c_str();
loader_data.app_namespace = android::FindNamespaceByClassLoader(env, classLoader);
if (loader_data.layer_path.empty()) {
loader_data.layer_path = layerPathChars.c_str();
loader_data.app_namespace = ns;
} else {
ALOGD("ignored Vulkan layer search path %s for namespace %p",
layerPathChars.c_str(), ns);
}
}
static const JNINativeMethod g_methods[] = {