From 26ad2f9149bf993e1643d141413b0ab728a23aa2 Mon Sep 17 00:00:00 2001 From: Ernst Persson Date: Sat, 1 Feb 2025 00:58:00 +0100 Subject: [PATCH] intel/vulkan: Add bvh build dependency Fixes: 41baeb3810a ("anv: Implement acceleration structure API") Closes: https://gitlab.freedesktop.org/mesa/mesa/-/issues/12558 Reviewed-by: Jordan Justen Part-of: (cherry picked from commit c64871acccc77e6104db2a4c1aa36c94880626a5) --- .pick_status.json | 2 +- src/intel/vulkan/bvh/meson.build | 1 - src/intel/vulkan/meson.build | 3 ++- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.pick_status.json b/.pick_status.json index f0dfe4d7164..4e65f8edfc6 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -504,7 +504,7 @@ "description": "intel/vulkan: Add bvh build dependency", "nominated": true, "nomination_type": 2, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": "41baeb3810a44f1746e05d9556d1951e72527499", "notes": null diff --git a/src/intel/vulkan/bvh/meson.build b/src/intel/vulkan/bvh/meson.build index 68c0ebb3222..8dbb5281c5b 100644 --- a/src/intel/vulkan/bvh/meson.build +++ b/src/intel/vulkan/bvh/meson.build @@ -29,7 +29,6 @@ anv_bvh_includes = files( 'anv_bvh.h', ) -bvh_spv = [] foreach s : bvh_shaders command = [ prog_glslang, '-V', '-I' + vk_bvh_include_dir, '-I' + anv_bvh_include_dir, '--target-env', 'spirv1.5', '-x', '-o', '@OUTPUT@', '@INPUT@' diff --git a/src/intel/vulkan/meson.build b/src/intel/vulkan/meson.build index 4dd08297851..62ea7366d75 100644 --- a/src/intel/vulkan/meson.build +++ b/src/intel/vulkan/meson.build @@ -37,6 +37,7 @@ idep_anv_headers = declare_dependency( include_directories : inc_anv, ) +bvh_spv = [] if with_intel_vk_rt if with_intel_bvh_grl subdir('grl') @@ -124,7 +125,7 @@ endif foreach _gfx_ver : ['90', '110', '120', '125', '200', '300'] libanv_per_hw_ver_libs += static_library( 'anv_per_hw_ver@0@'.format(_gfx_ver), - [anv_per_hw_ver_files, anv_entrypoints[0]], + [anv_per_hw_ver_files, anv_entrypoints[0]] + bvh_spv, include_directories : [ inc_include, inc_src, inc_intel, ],