aboutsummaryrefslogtreecommitdiffstats
path: root/src/vulkan/overlay-layer
diff options
context:
space:
mode:
authorLionel Landwerlin <[email protected]>2019-02-26 23:23:03 +0000
committerLionel Landwerlin <[email protected]>2019-02-27 11:45:42 +0000
commit2fff5966d661346378fe51bba74af5b0eb2db303 (patch)
tree14e375347863e1181b85cb5084a57226a2cd1652 /src/vulkan/overlay-layer
parent7763e664cefd1e394101b37fbc552b50f820f44a (diff)
vulkan/overlay: install layer binary in libdir
This will allow multilib. v2: Drop path from json file, dlopen should be able to locate the lib in libdir v3: Switch from configure_file to install_data (Dylan) Signed-off-by: Lionel Landwerlin <[email protected]> Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=109788 Tested-by: Mike Lothian <[email protected]> Reviewed-by: Eric Engestrom <[email protected]>
Diffstat (limited to 'src/vulkan/overlay-layer')
-rw-r--r--src/vulkan/overlay-layer/VkLayer_MESA_overlay.json (renamed from src/vulkan/overlay-layer/VkLayer_MESA_overlay.json.in)2
-rw-r--r--src/vulkan/overlay-layer/meson.build15
2 files changed, 4 insertions, 13 deletions
diff --git a/src/vulkan/overlay-layer/VkLayer_MESA_overlay.json.in b/src/vulkan/overlay-layer/VkLayer_MESA_overlay.json
index 5a9a88a9841..6877c3a3ecd 100644
--- a/src/vulkan/overlay-layer/VkLayer_MESA_overlay.json.in
+++ b/src/vulkan/overlay-layer/VkLayer_MESA_overlay.json
@@ -3,7 +3,7 @@
"layer" : {
"name": "VK_LAYER_MESA_overlay",
"type": "GLOBAL",
- "library_path": "@install_dir@/libVkLayer_MESA_overlay.so",
+ "library_path": "libVkLayer_MESA_overlay.so",
"api_version": "1.1.73",
"implementation_version": "1",
"description": "Mesa Overlay layer"
diff --git a/src/vulkan/overlay-layer/meson.build b/src/vulkan/overlay-layer/meson.build
index 9d1bc97c131..d2cdee2d6bb 100644
--- a/src/vulkan/overlay-layer/meson.build
+++ b/src/vulkan/overlay-layer/meson.build
@@ -18,8 +18,6 @@
# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
# SOFTWARE.
-vklayer_install_dir = join_paths(get_option('prefix'), 'share', 'vulkan', 'explicit_layer.d')
-
glslang = find_program('glslangValidator')
overlay_shaders = [
@@ -47,17 +45,10 @@ vklayer_mesa_overlay = shared_library(
include_directories : [inc_common, inc_vulkan_util],
link_args : cc.get_supported_link_arguments(['-Wl,-Bsymbolic-functions', '-Wl,-z,relro']),
link_with : [libmesa_util, libvulkan_util],
- install_dir : vklayer_install_dir,
install : true
)
-sdata = configuration_data()
-sdata.set('install_dir', vklayer_install_dir)
-
-configure_file(
- input : 'VkLayer_MESA_overlay.json.in',
- output : '@BASENAME@',
- configuration : sdata,
- install_dir : vklayer_install_dir,
- install : true
+install_data(
+ files('VkLayer_MESA_overlay.json'),
+ install_dir : join_paths(get_option('datadir'), 'vulkan', 'explicit_layer.d'),
)