diff options
| author | Simon Zeni <simon@bl4ckb0ne.ca> | 2022-11-11 15:54:07 -0500 |
|---|---|---|
| committer | Simon Ser <contact@emersion.fr> | 2022-11-11 22:56:37 +0000 |
| commit | f3ba14e491333d6bbba8c60328c4dbfd20571182 (patch) | |
| tree | b6fd00e32214f1093f46d7e8d0a3b227bc5d7383 | |
| parent | 1c4a625fe3e6bc3317d3e1816eee4a701a36c588 (diff) | |
render/vulkan: remove hardcoded validation layers
Users should use the VK_INSTANCE_LAYERS env var to set layers at runtime
| -rw-r--r-- | render/vulkan/renderer.c | 2 | ||||
| -rw-r--r-- | render/vulkan/vulkan.c | 12 |
2 files changed, 4 insertions, 10 deletions
diff --git a/render/vulkan/renderer.c b/render/vulkan/renderer.c index c64937aa..ff208abc 100644 --- a/render/vulkan/renderer.c +++ b/render/vulkan/renderer.c @@ -1938,6 +1938,8 @@ error: struct wlr_renderer *wlr_vk_renderer_create_with_drm_fd(int drm_fd) { wlr_log(WLR_INFO, "The vulkan renderer is only experimental and " "not expected to be ready for daily use"); + wlr_log(WLR_INFO, "Run with VK_INSTANCE_LAYERS=VK_LAYER_KHRONOS_validation " + "to enable the validation layer"); // NOTE: we could add functionality to allow the compositor passing its // name and version to this function. Just use dummies until then, diff --git a/render/vulkan/vulkan.c b/render/vulkan/vulkan.c index 748ba9c3..c964fe12 100644 --- a/render/vulkan/vulkan.c +++ b/render/vulkan/vulkan.c @@ -138,21 +138,13 @@ struct wlr_vk_instance *vulkan_instance_create(bool debug) { .apiVersion = VK_API_VERSION_1_1, }; - const char *layers[] = { - "VK_LAYER_KHRONOS_validation", - // "VK_LAYER_RENDERDOC_Capture", - // "VK_LAYER_live_introspection", - }; - - unsigned layer_count = debug * (sizeof(layers) / sizeof(layers[0])); - VkInstanceCreateInfo instance_info = { .sType = VK_STRUCTURE_TYPE_INSTANCE_CREATE_INFO, .pApplicationInfo = &application_info, .enabledExtensionCount = extensions_len, .ppEnabledExtensionNames = extensions, - .enabledLayerCount = layer_count, - .ppEnabledLayerNames = layers, + .enabledLayerCount = 0, + .ppEnabledLayerNames = NULL, }; VkDebugUtilsMessageSeverityFlagsEXT severity = |