Add support for autoloading callback extension.
This works by checking for the property vulkan.enableLayerCallback. If the
property doesn't exist, is false, or the app has explicitly loaded the callback
extension the change does nothing. If the property is enabled and the app
has not loaded the extension this change forces the loader to enable it.
Change-Id: I52f7afb4136358a360aaf62188d98b34b563778a
(cherry picked from commit adeac8e46bd0034321ea348132d3f9db967b72e9)
diff --git a/vulkan/libvulkan/loader.cpp b/vulkan/libvulkan/loader.cpp
index 1674935..9e9b00a 100644
--- a/vulkan/libvulkan/loader.cpp
+++ b/vulkan/libvulkan/loader.cpp
@@ -719,8 +719,7 @@
String dir_name("/data/local/tmp/vulkan/", string_allocator);
FindLayersInDirectory(*instance, layers, dir_name);
- // TODO: Add auto enabling of the layer extension
-
+ // Load layers
{
char layer_prop[PROPERTY_VALUE_MAX];
property_get("vulkan.layers", layer_prop, "");
@@ -746,7 +745,6 @@
}
}
}
-
for (uint32_t i = 0; i < create_info->layerCount; ++i) {
String layer_name(create_info->ppEnabledLayerNames[i],
string_allocator);
@@ -756,7 +754,6 @@
layers.erase(element);
}
}
-
for (auto& layer : layers) {
dlclose(layer.second);
}
@@ -804,8 +801,49 @@
return VK_ERROR_INITIALIZATION_FAILED;
}
+ // Force enable callback extension if required
+ bool enable_callback =
+ property_get_bool("debug.vulkan.enable_layer_callback", false);
+ const char* callback_name = "DEBUG_REPORT";
+ if (enable_callback) {
+ for (uint32_t i = 0; i < create_info->extensionCount; ++i) {
+ if (!strcmp(callback_name,
+ create_info->ppEnabledExtensionNames[i])) {
+ enable_callback = false;
+ break;
+ }
+ }
+ }
+ if (enable_callback) {
+ uint32_t extension_count = local_create_info.extensionCount;
+ local_create_info.extensionCount++;
+ void* mem = instance->alloc->pfnAlloc(
+ instance->alloc->pUserData,
+ local_create_info.extensionCount * sizeof(char*), alignof(char*),
+ VK_SYSTEM_ALLOC_TYPE_INTERNAL);
+ if (mem) {
+ const char** enabled_extensions = static_cast<const char**>(mem);
+ for (uint32_t i = 0; i < extension_count; ++i) {
+ enabled_extensions[i] =
+ local_create_info.ppEnabledExtensionNames[i];
+ }
+ enabled_extensions[extension_count] = callback_name;
+ local_create_info.ppEnabledExtensionNames = enabled_extensions;
+ } else {
+ ALOGW("DEBUG_REPORT extension cannot be enabled!");
+ enable_callback = false;
+ local_create_info.extensionCount--;
+ }
+ }
+
*out_instance = instance;
result = instance->vtbl_storage.CreateInstance(create_info, out_instance);
+ if (enable_callback) {
+ const char* const* enabled_extensions =
+ local_create_info.ppEnabledExtensionNames;
+ instance->alloc->pfnFree(instance->alloc->pUserData,
+ const_cast<char**>(enabled_extensions));
+ }
if (result <= 0) {
// For every layer, including the loader top and bottom layers:
// - If a call to the next CreateInstance fails, the layer must clean