On Mon, Oct 11, 2021 at 07:47:44PM +0200, Christian Melki wrote: > Was missing VIRGL and SVGA from the gallium libs list. > Used with QEMU amongst other things.
Please split out this part. > Also fix the library paths used by various libs. > Let them follow CROSS_LIB_DIR. This part will probably not be necessary in the end depending on the outcome of out other discussion. Michael > Signed-off-by: Christian Melki <[email protected]> > --- > rules/mesalib.in | 8 ++++++++ > rules/mesalib.make | 31 ++++++++++++++++++------------- > 2 files changed, 26 insertions(+), 13 deletions(-) > > diff --git a/rules/mesalib.in b/rules/mesalib.in > index b9fd1d3c8..a2644408c 100644 > --- a/rules/mesalib.in > +++ b/rules/mesalib.in > @@ -93,6 +93,14 @@ config MESALIB_DRI_KMSRO > bool > prompt "KMS renderonly" > > +config MESALIB_DRI_SVGA > + bool > + prompt "SVGA" > + > +config MESALIB_DRI_VIRGL > + bool > + prompt "VIRGL" > + > config MESALIB_DRI_FREEDRENO > bool > prompt "Freedreno" > diff --git a/rules/mesalib.make b/rules/mesalib.make > index 574d7bdf9..729d7d48d 100644 > --- a/rules/mesalib.make > +++ b/rules/mesalib.make > @@ -38,6 +38,8 @@ MESALIB_DRI_DRIVERS-$(PTXCONF_MESALIB_DRI_NOUVEAU_VIEUX)+= > nouveau > MESALIB_DRI_DRIVERS-$(PTXCONF_MESALIB_DRI_R200) += r200 > > MESALIB_GALLIUM_DRIVERS-$(PTXCONF_MESALIB_DRI_KMSRO) += kmsro > +MESALIB_GALLIUM_DRIVERS-$(PTXCONF_MESALIB_DRI_SVGA) += svga > +MESALIB_GALLIUM_DRIVERS-$(PTXCONF_MESALIB_DRI_VIRGL) += virgl > ifndef PTXCONF_ARCH_ARM # broken: > https://bugs.freedesktop.org/show_bug.cgi?id=72064 > ifndef PTXCONF_ARCH_X86 # needs llvm > MESALIB_GALLIUM_DRIVERS-$(PTXCONF_MESALIB_DRI_R300) += r300 > @@ -69,6 +71,8 @@ MESALIB_DRI_LIBS-y = \ > > MESALIB_DRI_GALLIUM_LIBS-y = \ > $(subst kmsro, \ > + kms_swrast \ > + virgl \ > armada-drm \ > exynos \ > hx8357d \ > @@ -87,7 +91,8 @@ MESALIB_DRI_GALLIUM_LIBS-y = \ > st7735r \ > stm \ > sun4i-drm \ > - ,$(subst freedreno,kgsl,$(MESALIB_GALLIUM_DRIVERS-y))) > + ,$(subst freedreno,kgsl \ > + ,$(subst svga,vmwgfx, $(MESALIB_GALLIUM_DRIVERS-y)))) > > ifdef PTXCONF_ARCH_X86 > MESALIB_VULKAN_DRIVERS-$(PTXCONF_MESALIB_VULKAN_AMD) += amd > @@ -125,12 +130,12 @@ MESALIB_CONF_OPT := \ > -Dbuild-aco-tests=false \ > -Dbuild-tests=false \ > -Dcustom-shader-replacement= \ > - -Dd3d-drivers-path=/usr/lib/d3d \ > + -Dd3d-drivers-path=/usr/$(CROSS_LIB_DIR)/d3d \ > -Ddatasources=auto \ > -Ddraw-use-llvm=true \ > -Ddri-drivers=$(subst $(space),$(comma),$(MESALIB_DRI_DRIVERS-y)) \ > - -Ddri-drivers-path=/usr/lib/dri \ > - -Ddri-search-path=/usr/lib/dri \ > + -Ddri-drivers-path=/usr/$(CROSS_LIB_DIR)/dri \ > + -Ddri-search-path=/usr/$(CROSS_LIB_DIR)/dri \ > -Ddri3=$(call ptx/endis, PTXCONF_MESALIB_DRI3)d \ > -Degl=$(call ptx/endis, PTXCONF_MESALIB_EGL)d \ > -Degl-lib-suffix= \ > @@ -163,7 +168,7 @@ MESALIB_CONF_OPT := \ > -Dlmsensors=$(call ptx/endis, PTXCONF_MESALIB_LMSENSORS)d \ > -Dmicrosoft-clc=disabled \ > -Dmoltenvk-dir= \ > - -Domx-libs-path=/usr/lib/dri \ > + -Domx-libs-path=/usr/$(CROSS_LIB_DIR)/dri \ > -Dopencl-native=false \ > -Dopencl-spirv=false \ > -Dopengl=$(call ptx/truefalse, PTXCONF_MESALIB_OPENGL) \ > @@ -187,14 +192,14 @@ MESALIB_CONF_OPT := \ > -Dstatic-libclc=[] \ > -Dswr-arches=[] \ > -Dtools=[] \ > - -Dva-libs-path=/usr/lib/dri \ > + -Dva-libs-path=/usr/$(CROSS_LIB_DIR)/dri \ > -Dvalgrind=disabled \ > - -Dvdpau-libs-path=/usr/lib/vdpau \ > + -Dvdpau-libs-path=/usr/$(CROSS_LIB_DIR)/vdpau \ > -Dvulkan-drivers=$(subst $(space),$(comma),$(MESALIB_VULKAN_DRIVERS-y)) > \ > -Dvulkan-icd-dir=/etc/vulkan/icd.d \ > -Dvulkan-layers=$(subst $(space),$(comma),$(MESALIB_VULKAN_LAYERS-y)) \ > -Dxlib-lease=$(call ptx/endis, PTXCONF_MESALIB_EGL_X11)d \ > - -Dxvmc-libs-path=/usr/lib \ > + -Dxvmc-libs-path=/usr/$(CROSS_LIB_DIR) \ > -Dzlib=enabled \ > -Dzstd=$(call ptx/endis, PTXCONF_MESALIB_SHADER_CACHE)d > > @@ -230,22 +235,22 @@ $(STATEDIR)/mesalib.targetinstall: > > @$(foreach lib, $(MESALIB_DRI_LIBS-y), \ > $(call install_copy, mesalib, 0, 0, 0644, -, \ > - /usr/lib/dri/$(lib)_dri.so)$(ptx/nl)) > + /usr/$(CROSS_LIB_DIR)/dri/$(lib)_dri.so)$(ptx/nl)) > > ifneq ($(strip $(MESALIB_DRI_GALLIUM_LIBS-y)),) > @$(call install_copy, mesalib, 0, 0, 0644, \ > - $(MESALIB_PKGDIR)/usr/lib/dri/$(firstword > $(MESALIB_DRI_GALLIUM_LIBS-y))_dri.so, \ > - /usr/lib/dri/gallium_dri.so) > + $(MESALIB_PKGDIR)/usr/$(CROSS_LIB_DIR)/dri/$(firstword > $(MESALIB_DRI_GALLIUM_LIBS-y))_dri.so, \ > + /usr/$(CROSS_LIB_DIR)/dri/gallium_dri.so) > > @$(foreach lib, $(MESALIB_DRI_GALLIUM_LIBS-y), \ > $(call install_link, mesalib, gallium_dri.so, \ > - /usr/lib/dri/$(lib)_dri.so)$(ptx/nl)) > + /usr/$(CROSS_LIB_DIR)/dri/$(lib)_dri.so)$(ptx/nl)) > endif > > ifneq ($(strip $(MESALIB_VULKAN_LIBS-y)),) > @$(foreach lib, $(MESALIB_VULKAN_LIBS-y), \ > $(call install_copy, mesalib, 0, 0, 0644, -, \ > - /usr/lib/libvulkan_$(lib).so)$(ptx/nl) \ > + /usr/$(CROSS_LIB_DIR)/libvulkan_$(lib).so)$(ptx/nl) \ > $(call install_glob, mesalib, 0, 0, -, \ > /etc/vulkan/icd.d, */$(lib)_icd.*.json)$(ptx/nl)) > endif > -- > 2.30.2 > > > _______________________________________________ > ptxdist mailing list > [email protected] > To unsubscribe, send a mail with subject "unsubscribe" to > [email protected] > -- Pengutronix e.K. | | Steuerwalder Str. 21 | http://www.pengutronix.de/ | 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 | Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 | _______________________________________________ ptxdist mailing list [email protected] To unsubscribe, send a mail with subject "unsubscribe" to [email protected]
