vkr: prepare meson for venus renderer

Signed-off-by: Chia-I Wu <olvaffe@gmail.com>
Reviewed-by: Ryan Neph <ryanneph@google.com>
Reviewed-by: Gert Wollny <gert.wollny@collabora.com>
macos/master
Chia-I Wu 5 years ago
parent f1e9388304
commit 6e12fa67e6
  1. 1
      config.h.meson
  2. 8
      meson.build
  3. 7
      meson_options.txt
  4. 8
      src/meson.build

@ -4,6 +4,7 @@
#mesondefine HAVE_EPOXY_EGL_H #mesondefine HAVE_EPOXY_EGL_H
#mesondefine HAVE_EPOXY_GLX_H #mesondefine HAVE_EPOXY_GLX_H
#mesondefine ENABLE_MINIGBM_ALLOCATION #mesondefine ENABLE_MINIGBM_ALLOCATION
#mesondefine ENABLE_VENUS
#mesondefine HAVE_FUNC_ATTRIBUTE_VISIBILITY #mesondefine HAVE_FUNC_ATTRIBUTE_VISIBILITY
#mesondefine HAVE_EVENTFD_H #mesondefine HAVE_EVENTFD_H
#mesondefine HAVE_DLFCN_H #mesondefine HAVE_DLFCN_H

@ -202,6 +202,12 @@ if with_glx
endif endif
endif endif
with_venus = get_option('venus-experimental')
if with_venus
venus_dep = dependency('vulkan')
conf_data.set('ENABLE_VENUS', 1)
endif
if cc.compiles('void __attribute__((hidden)) func() {}') if cc.compiles('void __attribute__((hidden)) func() {}')
conf_data.set('HAVE_FUNC_ATTRIBUTE_VISIBILITY', 1) conf_data.set('HAVE_FUNC_ATTRIBUTE_VISIBILITY', 1)
endif endif
@ -251,6 +257,8 @@ lines += 'glx: ' + (have_glx ? 'yes' : 'no')
lines += '' lines += ''
lines += 'minigbm_alloc: ' + (with_minigbm_allocation ? 'yes' : 'no' ) lines += 'minigbm_alloc: ' + (with_minigbm_allocation ? 'yes' : 'no' )
lines += '' lines += ''
lines += 'venus: ' + (with_venus ? 'yes' : 'no' )
lines += ''
lines += 'tests: ' + (with_tests ? 'yes' : 'no' ) lines += 'tests: ' + (with_tests ? 'yes' : 'no' )
lines += 'fuzzer: ' + (with_fuzzer ? 'yes' : 'no' ) lines += 'fuzzer: ' + (with_fuzzer ? 'yes' : 'no' )
lines += 'tracing: ' + with_tracing lines += 'tracing: ' + with_tracing

@ -38,6 +38,13 @@ option(
description : 'enable support for minigbm_allocations' description : 'enable support for minigbm_allocations'
) )
option(
'venus-experimental',
type : 'boolean',
value : 'false',
description : 'enable support for venus'
)
option( option(
'tests', 'tests',
type : 'boolean', type : 'boolean',

@ -74,6 +74,9 @@ vrend_winsys_glx_sources = [
'vrend_winsys_glx.h', 'vrend_winsys_glx.h',
] ]
venus_sources = [
]
virgl_depends = [ virgl_depends = [
gallium_dep, gallium_dep,
epoxy_dep, epoxy_dep,
@ -102,6 +105,11 @@ if have_glx
virgl_depends += [glx_dep] virgl_depends += [glx_dep]
endif endif
if with_venus
virgl_sources += venus_sources
virgl_depends += [venus_dep]
endif
libvirgl = static_library( libvirgl = static_library(
'virgl', 'virgl',
virgl_sources, virgl_sources,

Loading…
Cancel
Save