mirror of
https://gitlab.freedesktop.org/mesa/mesa.git
synced 2026-06-15 22:08:17 +02:00
gfxstream: meson format -i {all meson files}
More readable, allows meson format to be used in the future. Acked-by: Eric Engestrom <eric@igalia.com> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/38388>
This commit is contained in:
parent
c73c737eb2
commit
5826a0aad9
12 changed files with 295 additions and 222 deletions
|
|
@ -3,13 +3,6 @@
|
||||||
|
|
||||||
inc_aemu = include_directories('include')
|
inc_aemu = include_directories('include')
|
||||||
|
|
||||||
files_libaemu = files(
|
files_libaemu = files('Stream.cpp', 'ring_buffer.cpp')
|
||||||
'ring_buffer.cpp',
|
|
||||||
'Stream.cpp',
|
|
||||||
)
|
|
||||||
|
|
||||||
libaemu = static_library(
|
libaemu = static_library('aemu', files_libaemu, include_directories: [inc_aemu])
|
||||||
'aemu',
|
|
||||||
files_libaemu,
|
|
||||||
include_directories: [inc_aemu],
|
|
||||||
)
|
|
||||||
|
|
|
||||||
|
|
@ -4,25 +4,27 @@
|
||||||
inc_goldfish_address_space = include_directories('include')
|
inc_goldfish_address_space = include_directories('include')
|
||||||
|
|
||||||
files_lib_goldfish_address_space = files(
|
files_lib_goldfish_address_space = files(
|
||||||
'AddressSpaceStream.cpp',
|
'AddressSpaceStream.cpp',
|
||||||
'VirtioGpuAddressSpaceStream.cpp',
|
'VirtioGpuAddressSpaceStream.cpp',
|
||||||
)
|
)
|
||||||
|
|
||||||
if host_machine.system() == 'android'
|
if host_machine.system() == 'android'
|
||||||
files_lib_goldfish_address_space += files('GoldfishAddressSpaceStream.cpp')
|
files_lib_goldfish_address_space += files('GoldfishAddressSpaceStream.cpp')
|
||||||
files_lib_goldfish_address_space += files('goldfish_address_space.cpp')
|
files_lib_goldfish_address_space += files('goldfish_address_space.cpp')
|
||||||
endif
|
endif
|
||||||
|
|
||||||
lib_goldfish_address_space = static_library(
|
lib_goldfish_address_space = static_library(
|
||||||
'goldfish_address_space',
|
'goldfish_address_space',
|
||||||
files_lib_goldfish_address_space,
|
files_lib_goldfish_address_space,
|
||||||
cpp_args: gfxstream_guest_args,
|
cpp_args: gfxstream_guest_args,
|
||||||
include_directories: [inc_goldfish_address_space,
|
include_directories: [
|
||||||
inc_guest_iostream,
|
inc_goldfish_address_space,
|
||||||
inc_platform_virtgpu,
|
inc_guest_iostream,
|
||||||
inc_include,
|
inc_platform_virtgpu,
|
||||||
inc_aemu,
|
inc_include,
|
||||||
inc_src],
|
inc_aemu,
|
||||||
link_with: [libplatform_virtgpu],
|
inc_src,
|
||||||
dependencies: dep_libdrm
|
],
|
||||||
|
link_with: [libplatform_virtgpu],
|
||||||
|
dependencies: dep_libdrm,
|
||||||
)
|
)
|
||||||
|
|
|
||||||
|
|
@ -4,19 +4,25 @@
|
||||||
inc_connection_manager = include_directories('.')
|
inc_connection_manager = include_directories('.')
|
||||||
|
|
||||||
files_libconnection_manager = files(
|
files_libconnection_manager = files(
|
||||||
'GfxStreamConnectionManager.cpp',
|
'GfxStreamConnection.cpp',
|
||||||
'GfxStreamConnection.cpp',
|
'GfxStreamConnectionManager.cpp',
|
||||||
'QemuPipeStreamStub.cpp',
|
'QemuPipeStreamStub.cpp',
|
||||||
'VirtioGpuPipeStream.cpp',
|
'VirtioGpuPipeStream.cpp',
|
||||||
)
|
)
|
||||||
|
|
||||||
libconnection_manager = static_library(
|
libconnection_manager = static_library(
|
||||||
'connection_manager',
|
'connection_manager',
|
||||||
files_libconnection_manager,
|
files_libconnection_manager,
|
||||||
cpp_args: gfxstream_guest_args,
|
cpp_args: gfxstream_guest_args,
|
||||||
include_directories: [inc_connection_manager, inc_guest_iostream,
|
include_directories: [
|
||||||
inc_guest_iostream, inc_goldfish_address_space,
|
inc_connection_manager,
|
||||||
inc_platform_virtgpu, inc_src, inc_aemu],
|
inc_guest_iostream,
|
||||||
link_with: [lib_goldfish_address_space, libplatform_virtgpu],
|
inc_guest_iostream,
|
||||||
dependencies: dep_libdrm
|
inc_goldfish_address_space,
|
||||||
|
inc_platform_virtgpu,
|
||||||
|
inc_src,
|
||||||
|
inc_aemu,
|
||||||
|
],
|
||||||
|
link_with: [lib_goldfish_address_space, libplatform_virtgpu],
|
||||||
|
dependencies: dep_libdrm,
|
||||||
)
|
)
|
||||||
|
|
|
||||||
|
|
@ -7,7 +7,7 @@
|
||||||
|
|
||||||
with_vulkan_icd_dir = get_option('vulkan-icd-dir')
|
with_vulkan_icd_dir = get_option('vulkan-icd-dir')
|
||||||
if with_vulkan_icd_dir == ''
|
if with_vulkan_icd_dir == ''
|
||||||
with_vulkan_icd_dir = join_paths(get_option('datadir'), 'vulkan/icd.d')
|
with_vulkan_icd_dir = join_paths(get_option('datadir'), 'vulkan/icd.d')
|
||||||
endif
|
endif
|
||||||
|
|
||||||
#===============#
|
#===============#
|
||||||
|
|
@ -17,9 +17,9 @@ gfxstream_guest_args = ['-D_FILE_OFFSET_BITS=64']
|
||||||
|
|
||||||
# Our internal guest build
|
# Our internal guest build
|
||||||
if host_machine.system() == 'windows'
|
if host_machine.system() == 'windows'
|
||||||
gfxstream_guest_args += '-DWINDOWS_GUEST_BUILD'
|
gfxstream_guest_args += '-DWINDOWS_GUEST_BUILD'
|
||||||
else
|
else
|
||||||
gfxstream_guest_args += '-DLINUX_GUEST_BUILD'
|
gfxstream_guest_args += '-DLINUX_GUEST_BUILD'
|
||||||
endif
|
endif
|
||||||
# Include the gfxstream private VkStructureType definitions
|
# Include the gfxstream private VkStructureType definitions
|
||||||
gfxstream_guest_args += '-DVK_GFXSTREAM_STRUCTURE_TYPE_EXT'
|
gfxstream_guest_args += '-DVK_GFXSTREAM_STRUCTURE_TYPE_EXT'
|
||||||
|
|
|
||||||
|
|
@ -2,16 +2,16 @@
|
||||||
# SPDX-License-Identifier: MIT
|
# SPDX-License-Identifier: MIT
|
||||||
|
|
||||||
files_libplatform_virtgpu_drm = files(
|
files_libplatform_virtgpu_drm = files(
|
||||||
'DrmVirtGpuDevice.cpp',
|
'DrmSync.cpp',
|
||||||
'DrmVirtGpuBlobMapping.cpp',
|
'DrmVirtGpuBlob.cpp',
|
||||||
'DrmVirtGpuBlob.cpp',
|
'DrmVirtGpuBlobMapping.cpp',
|
||||||
'DrmSync.cpp',
|
'DrmVirtGpuDevice.cpp',
|
||||||
)
|
)
|
||||||
|
|
||||||
libplatform_virtgpu_drm = static_library(
|
libplatform_virtgpu_drm = static_library(
|
||||||
'platform_virtgpu_drm',
|
'platform_virtgpu_drm',
|
||||||
files_libplatform_virtgpu_drm,
|
files_libplatform_virtgpu_drm,
|
||||||
cpp_args: gfxstream_guest_args,
|
cpp_args: gfxstream_guest_args,
|
||||||
include_directories: [inc_platform_virtgpu, inc_src, inc_include],
|
include_directories: [inc_platform_virtgpu, inc_src, inc_include],
|
||||||
dependencies: dep_libdrm,
|
dependencies: dep_libdrm,
|
||||||
)
|
)
|
||||||
|
|
|
||||||
|
|
@ -2,24 +2,31 @@
|
||||||
# SPDX-License-Identifier: MIT
|
# SPDX-License-Identifier: MIT
|
||||||
|
|
||||||
if with_virtgpu_kumquat
|
if with_virtgpu_kumquat
|
||||||
subdir('vulkan-mapper')
|
subdir('vulkan-mapper')
|
||||||
files_libplatform_virtgpu_kumquat = files(
|
files_libplatform_virtgpu_kumquat = files(
|
||||||
'VirtGpuKumquatDevice.cpp',
|
'VirtGpuKumquatBlob.cpp',
|
||||||
'VirtGpuKumquatBlobMapping.cpp',
|
'VirtGpuKumquatBlobMapping.cpp',
|
||||||
'VirtGpuKumquatBlob.cpp',
|
'VirtGpuKumquatDevice.cpp',
|
||||||
'VirtGpuKumquatSync.cpp',
|
'VirtGpuKumquatSync.cpp',
|
||||||
)
|
)
|
||||||
else
|
else
|
||||||
dep_gfxstream_vulkan_mapper = null_dep
|
dep_gfxstream_vulkan_mapper = null_dep
|
||||||
files_libplatform_virtgpu_kumquat = files('VirtGpuKumquatStub.cpp')
|
files_libplatform_virtgpu_kumquat = files('VirtGpuKumquatStub.cpp')
|
||||||
endif
|
endif
|
||||||
|
|
||||||
libplatform_virtgpu_kumquat = static_library(
|
libplatform_virtgpu_kumquat = static_library(
|
||||||
'platform_virtgpu_kumquat',
|
'platform_virtgpu_kumquat',
|
||||||
files_libplatform_virtgpu_kumquat,
|
files_libplatform_virtgpu_kumquat,
|
||||||
cpp_args: gfxstream_guest_args,
|
cpp_args: gfxstream_guest_args,
|
||||||
include_directories: [inc_platform_virtgpu, inc_src,
|
include_directories: [
|
||||||
inc_vulkan_util, inc_include],
|
inc_platform_virtgpu,
|
||||||
dependencies: [idep_vulkan_util_headers, dep_virtgpu_kumquat_ffi,
|
inc_src,
|
||||||
dep_gfxstream_vulkan_mapper],
|
inc_vulkan_util,
|
||||||
|
inc_include,
|
||||||
|
],
|
||||||
|
dependencies: [
|
||||||
|
idep_vulkan_util_headers,
|
||||||
|
dep_virtgpu_kumquat_ffi,
|
||||||
|
dep_gfxstream_vulkan_mapper,
|
||||||
|
],
|
||||||
)
|
)
|
||||||
|
|
|
||||||
|
|
@ -3,21 +3,27 @@
|
||||||
|
|
||||||
inc_gfxstream_vulkan_mapper = include_directories('.')
|
inc_gfxstream_vulkan_mapper = include_directories('.')
|
||||||
|
|
||||||
files_gfxstream_vulkan_mapper = files(
|
files_gfxstream_vulkan_mapper = files('GfxStreamVulkanMapper.cpp')
|
||||||
'GfxStreamVulkanMapper.cpp',
|
|
||||||
)
|
|
||||||
|
|
||||||
libgfxstream_vulkan_mapper = static_library(
|
libgfxstream_vulkan_mapper = static_library(
|
||||||
'gfxstream_vulkan_mapper',
|
'gfxstream_vulkan_mapper',
|
||||||
files_gfxstream_vulkan_mapper,
|
files_gfxstream_vulkan_mapper,
|
||||||
cpp_args: gfxstream_guest_args,
|
cpp_args: gfxstream_guest_args,
|
||||||
include_directories: [inc_src, inc_vulkan_util, inc_gfxstream_vulkan_mapper,
|
include_directories: [
|
||||||
inc_include],
|
inc_src,
|
||||||
dependencies: [idep_vulkan_util_headers, idep_vulkan_util,
|
inc_vulkan_util,
|
||||||
idep_mesautil, dep_virtgpu_kumquat_ffi],
|
inc_gfxstream_vulkan_mapper,
|
||||||
|
inc_include,
|
||||||
|
],
|
||||||
|
dependencies: [
|
||||||
|
idep_vulkan_util_headers,
|
||||||
|
idep_vulkan_util,
|
||||||
|
idep_mesautil,
|
||||||
|
dep_virtgpu_kumquat_ffi,
|
||||||
|
],
|
||||||
)
|
)
|
||||||
|
|
||||||
dep_gfxstream_vulkan_mapper = declare_dependency(
|
dep_gfxstream_vulkan_mapper = declare_dependency(
|
||||||
include_directories : [inc_gfxstream_vulkan_mapper],
|
include_directories: [inc_gfxstream_vulkan_mapper],
|
||||||
link_with : [libgfxstream_vulkan_mapper]
|
link_with: [libgfxstream_vulkan_mapper],
|
||||||
)
|
)
|
||||||
|
|
|
||||||
|
|
@ -8,21 +8,19 @@ subdir('kumquat')
|
||||||
libplatform_virtgpu = [libplatform_virtgpu_kumquat]
|
libplatform_virtgpu = [libplatform_virtgpu_kumquat]
|
||||||
|
|
||||||
if system_has_kms_drm
|
if system_has_kms_drm
|
||||||
subdir('drm')
|
subdir('drm')
|
||||||
libplatform_virtgpu += libplatform_virtgpu_drm
|
libplatform_virtgpu += libplatform_virtgpu_drm
|
||||||
elif host_machine.system() == 'windows'
|
elif host_machine.system() == 'windows'
|
||||||
subdir('windows')
|
subdir('windows')
|
||||||
libplatform_virtgpu += libplatform_virtgpu_windows
|
libplatform_virtgpu += libplatform_virtgpu_windows
|
||||||
endif
|
endif
|
||||||
|
|
||||||
files_libplatform_virtgpu = files(
|
files_libplatform_virtgpu = files('VirtGpu.cpp')
|
||||||
'VirtGpu.cpp',
|
|
||||||
)
|
|
||||||
|
|
||||||
libplatform_virtgpu = static_library(
|
libplatform_virtgpu = static_library(
|
||||||
'platform_virtgpu',
|
'platform_virtgpu',
|
||||||
files_libplatform_virtgpu,
|
files_libplatform_virtgpu,
|
||||||
cpp_args: gfxstream_guest_args,
|
cpp_args: gfxstream_guest_args,
|
||||||
include_directories: [inc_platform_virtgpu, inc_src],
|
include_directories: [inc_platform_virtgpu, inc_src],
|
||||||
link_with: libplatform_virtgpu
|
link_with: libplatform_virtgpu,
|
||||||
)
|
)
|
||||||
|
|
|
||||||
|
|
@ -2,15 +2,15 @@
|
||||||
# SPDX-License-Identifier: MIT
|
# SPDX-License-Identifier: MIT
|
||||||
|
|
||||||
files_libplatform_virtgpu_windows = files(
|
files_libplatform_virtgpu_windows = files(
|
||||||
'WindowsVirtGpuDevice.cpp',
|
'WindowsSync.cpp',
|
||||||
'WindowsVirtGpuBlobMapping.cpp',
|
'WindowsVirtGpuBlob.cpp',
|
||||||
'WindowsVirtGpuBlob.cpp',
|
'WindowsVirtGpuBlobMapping.cpp',
|
||||||
'WindowsSync.cpp',
|
'WindowsVirtGpuDevice.cpp',
|
||||||
)
|
)
|
||||||
|
|
||||||
libplatform_virtgpu_windows = static_library(
|
libplatform_virtgpu_windows = static_library(
|
||||||
'platform_virtgpu_windows',
|
'platform_virtgpu_windows',
|
||||||
files_libplatform_virtgpu_windows,
|
files_libplatform_virtgpu_windows,
|
||||||
cpp_args: gfxstream_guest_args,
|
cpp_args: gfxstream_guest_args,
|
||||||
include_directories: [inc_platform_virtgpu, inc_src, inc_include],
|
include_directories: [inc_platform_virtgpu, inc_src, inc_include],
|
||||||
)
|
)
|
||||||
|
|
|
||||||
|
|
@ -4,77 +4,108 @@
|
||||||
subdir('stubs')
|
subdir('stubs')
|
||||||
|
|
||||||
files_lib_vulkan_gfxstream = files(
|
files_lib_vulkan_gfxstream = files(
|
||||||
'gfxstream_vk_device.cpp',
|
'gfxstream_vk_cmd.cpp',
|
||||||
'gfxstream_vk_cmd.cpp',
|
'gfxstream_vk_device.cpp',
|
||||||
'gfxstream_vk_wsi.cpp'
|
'gfxstream_vk_wsi.cpp',
|
||||||
)
|
)
|
||||||
|
|
||||||
gfxstream_vk_wsi_args = []
|
gfxstream_vk_wsi_args = []
|
||||||
if with_platform_x11
|
if with_platform_x11
|
||||||
gfxstream_vk_wsi_args += '-DGFXSTREAM_VK_X11'
|
gfxstream_vk_wsi_args += '-DGFXSTREAM_VK_X11'
|
||||||
endif
|
endif
|
||||||
|
|
||||||
if with_platform_wayland
|
if with_platform_wayland
|
||||||
gfxstream_vk_wsi_args += '-DGFXSTREAM_VK_WAYLAND'
|
gfxstream_vk_wsi_args += '-DGFXSTREAM_VK_WAYLAND'
|
||||||
endif
|
endif
|
||||||
|
|
||||||
gfxstream_deps = [dep_libdrm, idep_vulkan_wsi_headers,
|
gfxstream_deps = [
|
||||||
idep_vulkan_lite_runtime, idep_vulkan_util_headers,
|
dep_libdrm,
|
||||||
idep_vulkan_wsi, dep_valgrind]
|
idep_vulkan_wsi_headers,
|
||||||
|
idep_vulkan_lite_runtime,
|
||||||
|
idep_vulkan_util_headers,
|
||||||
|
idep_vulkan_wsi,
|
||||||
|
dep_valgrind,
|
||||||
|
]
|
||||||
|
|
||||||
if with_perfetto
|
if with_perfetto
|
||||||
gfxstream_deps += dep_perfetto
|
gfxstream_deps += dep_perfetto
|
||||||
endif
|
endif
|
||||||
|
|
||||||
lib_vulkan_gfxstream = shared_library(
|
lib_vulkan_gfxstream = shared_library(
|
||||||
'vulkan_gfxstream',
|
'vulkan_gfxstream',
|
||||||
files_lib_vulkan_gfxstream + files_lib_vulkan_enc + gfxstream_vk_entrypoints +
|
files_lib_vulkan_gfxstream + files_lib_vulkan_enc + gfxstream_vk_entrypoints + gfxstream_guest_vk_autogen + vulkan_gfxstream_h,
|
||||||
gfxstream_guest_vk_autogen + vulkan_gfxstream_h,
|
cpp_args: gfxstream_guest_args + gfxstream_vk_wsi_args,
|
||||||
cpp_args: gfxstream_guest_args + gfxstream_vk_wsi_args,
|
include_directories: [
|
||||||
include_directories: [inc_vulkan_headers, inc_guest_iostream,
|
inc_vulkan_headers,
|
||||||
inc_vulkan_enc, inc_platform_virtgpu,
|
inc_guest_iostream,
|
||||||
inc_gfxstream_vk_stubs, inc_goldfish_address_space,
|
inc_vulkan_enc,
|
||||||
inc_include, inc_src, inc_aemu,
|
inc_platform_virtgpu,
|
||||||
inc_platform_virtgpu, inc_connection_manager],
|
inc_gfxstream_vk_stubs,
|
||||||
link_with: [libgfxstream_vk_stubs, libvulkan_wsi, libplatform_virtgpu,
|
inc_goldfish_address_space,
|
||||||
libconnection_manager, libaemu],
|
inc_include,
|
||||||
link_args: [vulkan_icd_link_args, ld_args_bsymbolic, ld_args_gc_sections],
|
inc_src,
|
||||||
link_depends: vulkan_icd_link_depends,
|
inc_aemu,
|
||||||
dependencies: gfxstream_deps,
|
inc_platform_virtgpu,
|
||||||
install: true,
|
inc_connection_manager,
|
||||||
|
],
|
||||||
|
link_with: [
|
||||||
|
libgfxstream_vk_stubs,
|
||||||
|
libvulkan_wsi,
|
||||||
|
libplatform_virtgpu,
|
||||||
|
libconnection_manager,
|
||||||
|
libaemu,
|
||||||
|
],
|
||||||
|
link_args: [vulkan_icd_link_args, ld_args_bsymbolic, ld_args_gc_sections],
|
||||||
|
link_depends: vulkan_icd_link_depends,
|
||||||
|
dependencies: gfxstream_deps,
|
||||||
|
install: true,
|
||||||
)
|
)
|
||||||
|
|
||||||
icd_file_name = libname_prefix + 'vulkan_gfxstream.' + libname_suffix
|
icd_file_name = libname_prefix + 'vulkan_gfxstream.' + libname_suffix
|
||||||
|
|
||||||
gfxstream_icd = custom_target(
|
gfxstream_icd = custom_target(
|
||||||
'gfxstream_vk_icd',
|
'gfxstream_vk_icd',
|
||||||
input : [vk_icd_gen, vk_api_xml],
|
input: [vk_icd_gen, vk_api_xml],
|
||||||
output : 'gfxstream_vk_icd.@0@.json'.format(host_machine.cpu()),
|
output: 'gfxstream_vk_icd.@0@.json'.format(host_machine.cpu()),
|
||||||
command : [
|
command: [
|
||||||
prog_python, '@INPUT0@',
|
prog_python,
|
||||||
'--api-version', '1.1', '--xml', '@INPUT1@',
|
'@INPUT0@',
|
||||||
'--sizeof-pointer', sizeof_pointer,
|
'--api-version',
|
||||||
'--lib-path', vulkan_icd_lib_path / icd_file_name,
|
'1.1',
|
||||||
'--out', '@OUTPUT@',
|
'--xml',
|
||||||
],
|
'@INPUT1@',
|
||||||
build_by_default : true,
|
'--sizeof-pointer',
|
||||||
install_dir : with_vulkan_icd_dir,
|
sizeof_pointer,
|
||||||
install : true,
|
'--lib-path',
|
||||||
|
vulkan_icd_lib_path / icd_file_name,
|
||||||
|
'--out',
|
||||||
|
'@OUTPUT@',
|
||||||
|
],
|
||||||
|
build_by_default: true,
|
||||||
|
install_dir: with_vulkan_icd_dir,
|
||||||
|
install: true,
|
||||||
)
|
)
|
||||||
|
|
||||||
_dev_icdname = 'gfxstream_vk_devenv_icd.@0@.json'.format(host_machine.cpu())
|
_dev_icdname = 'gfxstream_vk_devenv_icd.@0@.json'.format(host_machine.cpu())
|
||||||
_dev_icd = custom_target(
|
_dev_icd = custom_target(
|
||||||
'gfxstream_vk_devenv_icd',
|
'gfxstream_vk_devenv_icd',
|
||||||
input : [vk_icd_gen, vk_api_xml],
|
input: [vk_icd_gen, vk_api_xml],
|
||||||
output : _dev_icdname,
|
output: _dev_icdname,
|
||||||
command : [
|
command: [
|
||||||
prog_python, '@INPUT0@',
|
prog_python,
|
||||||
'--api-version', '1.3', '--xml', '@INPUT1@',
|
'@INPUT0@',
|
||||||
'--sizeof-pointer', sizeof_pointer,
|
'--api-version',
|
||||||
'--lib-path', meson.current_build_dir() / icd_file_name,
|
'1.3',
|
||||||
'--out', '@OUTPUT@',
|
'--xml',
|
||||||
],
|
'@INPUT1@',
|
||||||
build_by_default : true,
|
'--sizeof-pointer',
|
||||||
|
sizeof_pointer,
|
||||||
|
'--lib-path',
|
||||||
|
meson.current_build_dir() / icd_file_name,
|
||||||
|
'--out',
|
||||||
|
'@OUTPUT@',
|
||||||
|
],
|
||||||
|
build_by_default: true,
|
||||||
)
|
)
|
||||||
|
|
||||||
devenv.append('VK_DRIVER_FILES', _dev_icd.full_path())
|
devenv.append('VK_DRIVER_FILES', _dev_icd.full_path())
|
||||||
|
|
|
||||||
|
|
@ -2,14 +2,16 @@
|
||||||
# SPDX-License-Identifier: MIT
|
# SPDX-License-Identifier: MIT
|
||||||
|
|
||||||
inc_gfxstream_vk_stubs = include_directories('.')
|
inc_gfxstream_vk_stubs = include_directories('.')
|
||||||
files_libgfxstream_vk_stubs = files(
|
files_libgfxstream_vk_stubs = files('GfxStreamRenderControl.cpp')
|
||||||
'GfxStreamRenderControl.cpp',
|
|
||||||
)
|
|
||||||
|
|
||||||
libgfxstream_vk_stubs = static_library(
|
libgfxstream_vk_stubs = static_library(
|
||||||
'gfxstream_vk_stubs',
|
'gfxstream_vk_stubs',
|
||||||
files_libgfxstream_vk_stubs,
|
files_libgfxstream_vk_stubs,
|
||||||
cpp_args: gfxstream_guest_args,
|
cpp_args: gfxstream_guest_args,
|
||||||
include_directories: [inc_connection_manager, inc_platform_virtgpu,
|
include_directories: [
|
||||||
inc_guest_iostream, inc_src],
|
inc_connection_manager,
|
||||||
|
inc_platform_virtgpu,
|
||||||
|
inc_guest_iostream,
|
||||||
|
inc_src,
|
||||||
|
],
|
||||||
)
|
)
|
||||||
|
|
|
||||||
|
|
@ -5,84 +5,112 @@ output_host_path = meson.current_build_dir() + '/host/vulkan/cereal'
|
||||||
guest_enc_path = meson.current_build_dir()
|
guest_enc_path = meson.current_build_dir()
|
||||||
|
|
||||||
if build_machine.system() != 'android'
|
if build_machine.system() != 'android'
|
||||||
gfxstream_guest_vk_autogen = custom_target(
|
gfxstream_guest_vk_autogen = custom_target(
|
||||||
'gfxstream_guest_vk_autogen',
|
'gfxstream_guest_vk_autogen',
|
||||||
output : [
|
output: [
|
||||||
'VkEncoder.h',
|
'VkEncoder.h',
|
||||||
'goldfish_vk_counting_guest.h',
|
'goldfish_vk_counting_guest.h',
|
||||||
'goldfish_vk_deepcopy_guest.h',
|
'goldfish_vk_deepcopy_guest.h',
|
||||||
'goldfish_vk_marshaling_guest.h',
|
'goldfish_vk_marshaling_guest.h',
|
||||||
'goldfish_vk_extension_structs_guest.h',
|
'goldfish_vk_extension_structs_guest.h',
|
||||||
'goldfish_vk_reserved_marshaling_guest.h',
|
'goldfish_vk_reserved_marshaling_guest.h',
|
||||||
'goldfish_vk_transform_guest.h',
|
'goldfish_vk_transform_guest.h',
|
||||||
'goldfish_vk_counting_guest.cpp',
|
'goldfish_vk_counting_guest.cpp',
|
||||||
'goldfish_vk_deepcopy_guest.cpp',
|
'goldfish_vk_deepcopy_guest.cpp',
|
||||||
'goldfish_vk_extension_structs_guest.cpp',
|
'goldfish_vk_extension_structs_guest.cpp',
|
||||||
'goldfish_vk_marshaling_guest.cpp',
|
'goldfish_vk_marshaling_guest.cpp',
|
||||||
'goldfish_vk_reserved_marshaling_guest.cpp',
|
'goldfish_vk_reserved_marshaling_guest.cpp',
|
||||||
'goldfish_vk_transform_guest.cpp',
|
'goldfish_vk_transform_guest.cpp',
|
||||||
'VkEncoder.cpp',
|
'VkEncoder.cpp',
|
||||||
'func_table.cpp',
|
'func_table.cpp',
|
||||||
],
|
],
|
||||||
env: {'GFXSTREAM_NO_CLANG_FMT': '1', 'CEREAL_VARIANT' : 'guest',
|
env: {
|
||||||
'GFXSTREAM_GUEST_ENCODER_DIR': guest_enc_path},
|
'GFXSTREAM_NO_CLANG_FMT': '1',
|
||||||
input: [genvk, vk_api_xml, vk_gfxstream_xml],
|
'CEREAL_VARIANT' : 'guest',
|
||||||
command: [prog_python, '@INPUT0@', '-registry', '@INPUT1@', '-registryGfxstream', '@INPUT2@',
|
'GFXSTREAM_GUEST_ENCODER_DIR': guest_enc_path,
|
||||||
'cereal', '-o', output_host_path],
|
},
|
||||||
)
|
input: [genvk, vk_api_xml, vk_gfxstream_xml],
|
||||||
|
command: [
|
||||||
|
prog_python,
|
||||||
|
'@INPUT0@',
|
||||||
|
'-registry',
|
||||||
|
'@INPUT1@',
|
||||||
|
'-registryGfxstream',
|
||||||
|
'@INPUT2@',
|
||||||
|
'cereal',
|
||||||
|
'-o',
|
||||||
|
output_host_path,
|
||||||
|
],
|
||||||
|
)
|
||||||
|
|
||||||
vulkan_gfxstream_h = custom_target(
|
vulkan_gfxstream_h = custom_target(
|
||||||
'vulkan_gfxstream_header',
|
'vulkan_gfxstream_header',
|
||||||
output : [
|
output: ['vulkan_gfxstream.h'],
|
||||||
'vulkan_gfxstream.h',
|
env: {'GFXSTREAM_NO_CLANG_FMT': '1', 'CEREAL_VARIANT' : 'guest'},
|
||||||
],
|
input: [genvk, vk_gfxstream_xml],
|
||||||
env: {'GFXSTREAM_NO_CLANG_FMT': '1', 'CEREAL_VARIANT' : 'guest'},
|
command: [
|
||||||
input: [genvk, vk_gfxstream_xml],
|
prog_python,
|
||||||
command: [prog_python, '@INPUT0@', '-registry', '@INPUT1@', 'vulkan_gfxstream.h',
|
'@INPUT0@',
|
||||||
'-o', guest_enc_path],
|
'-registry',
|
||||||
)
|
'@INPUT1@',
|
||||||
|
'vulkan_gfxstream.h',
|
||||||
|
'-o',
|
||||||
|
guest_enc_path,
|
||||||
|
],
|
||||||
|
)
|
||||||
else
|
else
|
||||||
gfxstream_guest_vk_autogen = files(
|
gfxstream_guest_vk_autogen = files(
|
||||||
'VkEncoder.h',
|
|
||||||
'goldfish_vk_counting_guest.h',
|
|
||||||
'goldfish_vk_deepcopy_guest.h',
|
|
||||||
'goldfish_vk_marshaling_guest.h',
|
|
||||||
'goldfish_vk_extension_structs_guest.h',
|
|
||||||
'goldfish_vk_reserved_marshaling_guest.h',
|
|
||||||
'goldfish_vk_transform_guest.h',
|
|
||||||
'goldfish_vk_counting_guest.cpp',
|
|
||||||
'goldfish_vk_deepcopy_guest.cpp',
|
|
||||||
'goldfish_vk_extension_structs_guest.cpp',
|
|
||||||
'goldfish_vk_marshaling_guest.cpp',
|
|
||||||
'goldfish_vk_reserved_marshaling_guest.cpp',
|
|
||||||
'goldfish_vk_transform_guest.cpp',
|
|
||||||
'VkEncoder.cpp',
|
'VkEncoder.cpp',
|
||||||
'func_table.cpp'
|
'VkEncoder.h',
|
||||||
)
|
'func_table.cpp',
|
||||||
|
'goldfish_vk_counting_guest.cpp',
|
||||||
|
'goldfish_vk_counting_guest.h',
|
||||||
|
'goldfish_vk_deepcopy_guest.cpp',
|
||||||
|
'goldfish_vk_deepcopy_guest.h',
|
||||||
|
'goldfish_vk_extension_structs_guest.cpp',
|
||||||
|
'goldfish_vk_extension_structs_guest.h',
|
||||||
|
'goldfish_vk_marshaling_guest.cpp',
|
||||||
|
'goldfish_vk_marshaling_guest.h',
|
||||||
|
'goldfish_vk_reserved_marshaling_guest.cpp',
|
||||||
|
'goldfish_vk_reserved_marshaling_guest.h',
|
||||||
|
'goldfish_vk_transform_guest.cpp',
|
||||||
|
'goldfish_vk_transform_guest.h',
|
||||||
|
)
|
||||||
|
|
||||||
vulkan_gfxstream_h = files('vulkan_gfxstream.h')
|
vulkan_gfxstream_h = files('vulkan_gfxstream.h')
|
||||||
endif
|
endif
|
||||||
|
|
||||||
gfxstream_vk_entrypoints = custom_target(
|
gfxstream_vk_entrypoints = custom_target(
|
||||||
'gfxstream_vk_entrypoints',
|
'gfxstream_vk_entrypoints',
|
||||||
input : [vk_entrypoints_gen, vk_api_xml],
|
input: [vk_entrypoints_gen, vk_api_xml],
|
||||||
output : ['gfxstream_vk_entrypoints.h', 'gfxstream_vk_entrypoints.c'],
|
output: ['gfxstream_vk_entrypoints.h', 'gfxstream_vk_entrypoints.c'],
|
||||||
command : [
|
command: [
|
||||||
prog_python, '@INPUT0@', '--xml', '@INPUT1@', '--proto', '--weak',
|
prog_python,
|
||||||
'--out-h', '@OUTPUT0@', '--out-c', '@OUTPUT1@', '--prefix', 'gfxstream_vk',
|
'@INPUT0@',
|
||||||
'--beta', with_vulkan_beta.to_string()
|
'--xml',
|
||||||
],
|
'@INPUT1@',
|
||||||
|
'--proto',
|
||||||
|
'--weak',
|
||||||
|
'--out-h',
|
||||||
|
'@OUTPUT0@',
|
||||||
|
'--out-c',
|
||||||
|
'@OUTPUT1@',
|
||||||
|
'--prefix',
|
||||||
|
'gfxstream_vk',
|
||||||
|
'--beta',
|
||||||
|
with_vulkan_beta.to_string(),
|
||||||
|
],
|
||||||
)
|
)
|
||||||
|
|
||||||
files_lib_vulkan_enc = files(
|
files_lib_vulkan_enc = files(
|
||||||
'CommandBufferStagingStream.cpp',
|
'CommandBufferStagingStream.cpp',
|
||||||
'DescriptorSetVirtualization.cpp',
|
'DescriptorSetVirtualization.cpp',
|
||||||
'HostVisibleMemoryVirtualization.cpp',
|
'GfxStreamVulkanConnection.cpp',
|
||||||
'ResourceTracker.cpp',
|
'HostVisibleMemoryVirtualization.cpp',
|
||||||
'Resources.cpp',
|
'ResourceTracker.cpp',
|
||||||
'Validation.cpp',
|
'Resources.cpp',
|
||||||
'VulkanHandleMapping.cpp',
|
'Validation.cpp',
|
||||||
'VulkanStreamGuest.cpp',
|
'VulkanHandleMapping.cpp',
|
||||||
'gfxstream_vk_private.cpp',
|
'VulkanStreamGuest.cpp',
|
||||||
'GfxStreamVulkanConnection.cpp',
|
'gfxstream_vk_private.cpp',
|
||||||
) + sha1_h
|
) + sha1_h
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue