projects
/
mesa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
radv: pass sample locations for transitions before depth/stencil resolves
[mesa.git]
/
src
/
amd
/
vulkan
/
meson.build
diff --git
a/src/amd/vulkan/meson.build
b/src/amd/vulkan/meson.build
index 0f1261d4809cfa012902d0b589f68813307d6046..2ff2fb34465c8bfb35701fc4d4abb4af512e83bb 100644
(file)
--- a/
src/amd/vulkan/meson.build
+++ b/
src/amd/vulkan/meson.build
@@
-39,8
+39,8
@@
radv_extensions_c = custom_target(
],
)
],
)
-vk_format_table_c = custom_target(
- 'vk_format_table.c',
+
amd_
vk_format_table_c = custom_target(
+ '
amd_
vk_format_table.c',
input : ['vk_format_table.py', 'vk_format_layout.csv'],
output : 'vk_format_table.c',
command : [prog_python, '@INPUT@'],
input : ['vk_format_table.py', 'vk_format_layout.csv'],
output : 'vk_format_table.c',
command : [prog_python, '@INPUT@'],
@@
-78,9
+78,11
@@
libradv_files = files(
'radv_meta_copy.c',
'radv_meta_decompress.c',
'radv_meta_fast_clear.c',
'radv_meta_copy.c',
'radv_meta_decompress.c',
'radv_meta_fast_clear.c',
+ 'radv_meta_fmask_expand.c',
'radv_meta_resolve.c',
'radv_meta_resolve_cs.c',
'radv_meta_resolve_fs.c',
'radv_meta_resolve.c',
'radv_meta_resolve_cs.c',
'radv_meta_resolve_fs.c',
+ 'radv_nir_lower_ycbcr_textures.c',
'radv_nir_to_llvm.c',
'radv_pass.c',
'radv_pipeline.c',
'radv_nir_to_llvm.c',
'radv_pass.c',
'radv_pipeline.c',
@@
-127,21
+129,27
@@
if with_xlib_lease
radv_flags += '-DVK_USE_PLATFORM_XLIB_XRANDR_EXT'
endif
radv_flags += '-DVK_USE_PLATFORM_XLIB_XRANDR_EXT'
endif
+if with_platform_android
+ radv_flags += [
+ '-DVK_USE_PLATFORM_ANDROID_KHR'
+ ]
+ libradv_files += files('radv_android.c')
+endif
+
libvulkan_radeon = shared_library(
'vulkan_radeon',
libvulkan_radeon = shared_library(
'vulkan_radeon',
- [libradv_files, radv_entrypoints, radv_extensions_c,
vk_format_table_c, sha1
_h],
+ [libradv_files, radv_entrypoints, radv_extensions_c,
amd_vk_format_table_c, sha1_h, xmlpool_options
_h],
include_directories : [
include_directories : [
- inc_common, inc_amd, inc_amd_common, inc_compiler, inc_vulkan_util,
- inc_vulkan_wsi,
+ inc_common, inc_amd, inc_amd_common, inc_compiler, inc_util, inc_vulkan_wsi,
],
link_with : [
],
link_with : [
- libamd_common, libamdgpu_addrlib, libvulkan_
util, libvulkan_
wsi,
- libmesa_util,
+ libamd_common, libamdgpu_addrlib, libvulkan_wsi,
+ libmesa_util,
libxmlconfig
],
dependencies : [
dep_llvm, dep_libdrm_amdgpu, dep_thread, dep_elf, dep_dl, dep_m,
],
dependencies : [
dep_llvm, dep_libdrm_amdgpu, dep_thread, dep_elf, dep_dl, dep_m,
- dep_valgrind,
- idep_nir,
+ dep_valgrind,
radv_deps,
+ idep_nir,
idep_vulkan_util, idep_amdgfxregs_h,
],
c_args : [c_vis_args, no_override_init_args, radv_flags],
cpp_args : [cpp_vis_args, radv_flags],
],
c_args : [c_vis_args, no_override_init_args, radv_flags],
cpp_args : [cpp_vis_args, radv_flags],