diff --git a/src/vulkan/overlay-layer/VkLayer_MESA_overlay.json b/src/vulkan/overlay-layer/VkLayer_MESA_overlay.json.in similarity index 82% rename from src/vulkan/overlay-layer/VkLayer_MESA_overlay.json rename to src/vulkan/overlay-layer/VkLayer_MESA_overlay.json.in index d6fdbaff7f9..c9725463682 100644 --- a/src/vulkan/overlay-layer/VkLayer_MESA_overlay.json +++ b/src/vulkan/overlay-layer/VkLayer_MESA_overlay.json.in @@ -3,7 +3,7 @@ "layer" : { "name": "VK_LAYER_MESA_overlay", "type": "GLOBAL", - "library_path": "libVkLayer_MESA_overlay.so", + "library_path": "@library_path@", "api_version": "1.4.303", "implementation_version": "1", "description": "Mesa Overlay layer" diff --git a/src/vulkan/overlay-layer/meson.build b/src/vulkan/overlay-layer/meson.build index b78be004fd7..5294037ea5f 100644 --- a/src/vulkan/overlay-layer/meson.build +++ b/src/vulkan/overlay-layer/meson.build @@ -36,12 +36,22 @@ vklayer_mesa_overlay = shared_library( install : true ) -install_data( - files('VkLayer_MESA_overlay.json'), +configure_file( + configuration : {'library_path' : 'libVkLayer_MESA_overlay.so'}, + input : 'VkLayer_MESA_overlay.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_overlay.full_path()}, + input : 'VkLayer_MESA_overlay.json.in', + output : '@PLAINNAME@_dev.json', +) +devenv.append('VK_ADD_LAYER_PATH', meson.current_build_dir()) + install_data( 'mesa-overlay-control.py', install_dir : get_option('bindir'),