meson: Turn on swr for relevant targets
Currently that's dri, libgl-xlib, and osmesa. v2: - put drivers on a separate line from normal dependencies (Eric E) cc: George Kyriazis <george.kyriazis@intel.com> cc: Tim Rowley <timothy.o.rowley@intel.com> cc: Bruce Cherniak <bruce.cherniak@intel.com> Signed-off-by: Dylan Baker <dylan.c.baker@intel.com> Reviewed-by: Eric Engestrom <eric.engestrom@imgtec.com>
This commit is contained in:
parent
e0b037d697
commit
425fcbde3f
|
@ -145,7 +145,6 @@ endif
|
|||
if with_gallium_st_nine
|
||||
subdir('state_trackers/nine')
|
||||
endif
|
||||
# TODO: SWR
|
||||
# TODO: clover
|
||||
if with_dri
|
||||
subdir('state_trackers/dri')
|
||||
|
|
|
@ -69,7 +69,7 @@ libgallium_dri = shared_library(
|
|||
dep_selinux, dep_expat, dep_libdrm, dep_llvm, dep_lmsensors, dep_thread,
|
||||
driver_swrast, driver_r300, driver_r600, driver_radeonsi, driver_nouveau,
|
||||
driver_pl111, driver_vc4, driver_vc5, driver_freedreno, driver_etnaviv,
|
||||
driver_imx, driver_i915, driver_svga, driver_virgl,
|
||||
driver_imx, driver_i915, driver_svga, driver_virgl, driver_swr,
|
||||
],
|
||||
)
|
||||
|
||||
|
@ -77,7 +77,7 @@ foreach d : [[with_gallium_pl111, 'pl111_dri.so'],
|
|||
[with_gallium_radeonsi, 'radeonsi_dri.so'],
|
||||
[with_gallium_nouveau, 'nouveau_dri.so'],
|
||||
[with_gallium_freedreno, ['msm_dri.so', 'kgsl_dri.so']],
|
||||
[with_gallium_softpipe, 'swrast_dri.so'],
|
||||
[with_gallium_softpipe or with_gallium_swr, 'swrast_dri.so'],
|
||||
[with_gallium_softpipe and with_gallium_drisw_kms, 'kms_swrast_dri.so'],
|
||||
[with_gallium_vc4, 'vc4_dri.so'],
|
||||
[with_gallium_vc5, 'vc5_dri.so'],
|
||||
|
|
|
@ -38,7 +38,6 @@ endif
|
|||
if with_shared_glapi
|
||||
gallium_xlib_link_with += libglapi
|
||||
endif
|
||||
# TODO: SWR
|
||||
|
||||
libgl = shared_library(
|
||||
'GL',
|
||||
|
@ -55,7 +54,8 @@ libgl = shared_library(
|
|||
libgallium, libmesa_util, libmesa_gallium, gallium_xlib_link_with,
|
||||
],
|
||||
dependencies : [
|
||||
dep_thread, dep_clock, dep_unwind, dep_lmsensors, driver_swrast,
|
||||
dep_thread, dep_clock, dep_unwind, dep_lmsensors,
|
||||
driver_swrast, driver_swr,
|
||||
],
|
||||
install : true,
|
||||
version : '1.5.0',
|
||||
|
|
|
@ -32,8 +32,6 @@ if with_ld_version_script
|
|||
osmesa_link_deps += files('osmesa.sym')
|
||||
endif
|
||||
|
||||
# TODO: swr
|
||||
|
||||
libosmesa = shared_library(
|
||||
osmesa_lib_name,
|
||||
'target.c',
|
||||
|
@ -51,7 +49,8 @@ libosmesa = shared_library(
|
|||
osmesa_link_with,
|
||||
],
|
||||
dependencies : [
|
||||
dep_selinux, dep_thread, dep_clock, dep_unwind, driver_swrast,
|
||||
dep_selinux, dep_thread, dep_clock, dep_unwind,
|
||||
driver_swrast, driver_swr,
|
||||
],
|
||||
version : '8.0.0',
|
||||
install : true,
|
||||
|
|
Loading…
Reference in New Issue