From 56c910aafcd6ed06d92168aa3ec47ef4490423be Mon Sep 17 00:00:00 2001 From: Eric Engestrom Date: Thu, 24 Jul 2025 13:00:38 +0200 Subject: [PATCH] meson: include VkLayer_MESA_screenshot in the devenv See https://github.com/KhronosGroup/Vulkan-Loader/blob/main/docs/LoaderLayerInterface.md#linux-layer-discovery Part-of: --- ...enshot.json => VkLayer_MESA_screenshot.json.in} | 2 +- src/vulkan/screenshot-layer/meson.build | 14 ++++++++++++-- 2 files changed, 13 insertions(+), 3 deletions(-) rename src/vulkan/screenshot-layer/{VkLayer_MESA_screenshot.json => VkLayer_MESA_screenshot.json.in} (81%) diff --git a/src/vulkan/screenshot-layer/VkLayer_MESA_screenshot.json b/src/vulkan/screenshot-layer/VkLayer_MESA_screenshot.json.in similarity index 81% rename from src/vulkan/screenshot-layer/VkLayer_MESA_screenshot.json rename to src/vulkan/screenshot-layer/VkLayer_MESA_screenshot.json.in index 74a254bfca7..f0fb90686da 100644 --- a/src/vulkan/screenshot-layer/VkLayer_MESA_screenshot.json +++ b/src/vulkan/screenshot-layer/VkLayer_MESA_screenshot.json.in @@ -3,7 +3,7 @@ "layer" : { "name": "VK_LAYER_MESA_screenshot", "type": "GLOBAL", - "library_path": "libVkLayer_MESA_screenshot.so", + "library_path": "@library_path@", "api_version": "1.4.303", "implementation_version": "1", "description": "Mesa Screenshot layer" diff --git a/src/vulkan/screenshot-layer/meson.build b/src/vulkan/screenshot-layer/meson.build index 14c5dc4f2f9..8efa0cc7935 100644 --- a/src/vulkan/screenshot-layer/meson.build +++ b/src/vulkan/screenshot-layer/meson.build @@ -34,12 +34,22 @@ vklayer_mesa_screenshot = shared_library( install : true ) -install_data( - files('VkLayer_MESA_screenshot.json'), +configure_file( + configuration : {'library_path' : 'libVkLayer_MESA_screenshot.so'}, + input : 'VkLayer_MESA_screenshot.json.in', + output : '@BASENAME@', + install : true, install_dir : join_paths(get_option('datadir'), 'vulkan', 'explicit_layer.d'), install_tag : 'runtime', ) +configure_file( + configuration : {'library_path' : vklayer_mesa_screenshot.full_path()}, + input : 'VkLayer_MESA_screenshot.json.in', + output : '@PLAINNAME@_dev.json', +) +devenv.append('VK_ADD_LAYER_PATH', meson.current_build_dir()) + install_data( 'mesa-screenshot-control.py', install_dir : get_option('bindir'),