On Thu, May 20, 2021 at 04:06:34PM +0200, Philipp Zabel wrote: > - Make Vulkan layers configurable. > - The license file was modified trivially in commit 2f42c21221cf > ("docs: Xorg -> X.Org") >
I need: diff --git a/rules/mesalib.in b/rules/mesalib.in index 7c0b99f5a895..a21fde235ebc 100644 --- a/rules/mesalib.in +++ b/rules/mesalib.in @@ -206,6 +206,8 @@ config MESALIB_VULKAN_FREEDRENO config MESALIB_VULKAN_SWRAST bool + # needs LLVM + depends on BROKEN select MESALIB_DRI_SWRAST prompt "Software Rasterizer" Otherwise building everything fails with: ../Mesa-21.1.1/meson.build:1648:2: ERROR: Problem encountered: The following drivers require LLVM: Radv, RadeonSI, SWR, Lavapipe. One of these is enabled, but LLVM is disabled. I'll fix it locally while applying the patch. Michael > Signed-off-by: Philipp Zabel <p.za...@pengutronix.de> > --- > rules/mesalib.in | 14 ++++++++++++++ > rules/mesalib.make | 14 +++++++++----- > 2 files changed, 23 insertions(+), 5 deletions(-) > > diff --git a/rules/mesalib.in b/rules/mesalib.in > index 86981f8d3923..7c0b99f5a895 100644 > --- a/rules/mesalib.in > +++ b/rules/mesalib.in > @@ -209,6 +209,20 @@ config MESALIB_VULKAN_SWRAST > select MESALIB_DRI_SWRAST > prompt "Software Rasterizer" > > +comment "Vulkan layers" > + > +config MESALIB_VULKAN_DEVICE_SELECT > + bool > + prompt "Device select layer" > + > +config MESALIB_VULKAN_INTEL_NULLHW > + bool > + prompt "Intel nullhw layer" > + > +config MESALIB_VULKAN_OVERLAY > + bool > + prompt "Overlay layer" > + > config MESALIB_ZSTD > bool > prompt "use Zstandard for shader cache compression" > diff --git a/rules/mesalib.make b/rules/mesalib.make > index 5d8f3aad308d..f86da31f221a 100644 > --- a/rules/mesalib.make > +++ b/rules/mesalib.make > @@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_MESALIB) += mesalib > # > # Paths and names > # > -MESALIB_VERSION := 21.0.3 > -MESALIB_MD5 := 3331ef6d043768b4f3b33283a6dd44d8 > +MESALIB_VERSION := 21.1.1 > +MESALIB_MD5 := 69dc5839192f75991c5f5162d351587f > MESALIB := mesa-$(MESALIB_VERSION) > MESALIB_SUFFIX := tar.xz > MESALIB_URL := \ > @@ -24,7 +24,7 @@ MESALIB_SOURCE := > $(SRCDIR)/$(MESALIB).$(MESALIB_SUFFIX) > MESALIB_DIR := $(BUILDDIR)/Mesa-$(MESALIB_VERSION) > MESALIB_LICENSE := MIT > MESALIB_LICENSE_FILES := \ > - file://docs/license.rst;md5=9aa1bc48c9826ad9fdb16661f6930496 > + file://docs/license.rst;md5=17a4ea65de7a9ab42437f3131e616a7f > > # > ---------------------------------------------------------------------------- > # Prepare > @@ -97,6 +97,10 @@ MESALIB_VULKAN_DRIVERS-$(PTXCONF_MESALIB_VULKAN_SWRAST) > += swrast > > MESALIB_VULKAN_LIBS-y = $(subst amd,radeon,$(subst > swrast,lvp,$(MESALIB_VULKAN_DRIVERS-y))) > > +MESALIB_VULKAN_LAYERS-$(PTXCONF_MESALIB_VULKAN_DEVICE_SELECT) += > device-select > +MESALIB_VULKAN_LAYERS-$(PTXCONF_MESALIB_VULKAN_INTEL_NULLHW) += intel-nullhw > +MESALIB_VULKAN_LAYERS-$(PTXCONF_MESALIB_VULKAN_OVERLAY) += > overlay > + > MESALIB_LIBS-y := libglapi > MESALIB_LIBS-$(PTXCONF_MESALIB_GLX) += libGL > MESALIB_LIBS-$(PTXCONF_MESALIB_GLES1) += libGLESv1_CM > @@ -114,6 +118,7 @@ MESALIB_CONF_OPT := \ > -Dbuild-aco-tests=false \ > -Dbuild-tests=false \ > -Dd3d-drivers-path=/usr/lib/d3d \ > + -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 \ > @@ -169,10 +174,9 @@ MESALIB_CONF_OPT := \ > -Dva-libs-path=/usr/lib/dri \ > -Dvalgrind=disabled \ > -Dvdpau-libs-path=/usr/lib/vdpau \ > - -Dvulkan-device-select-layer=false \ > -Dvulkan-drivers=$(subst $(space),$(comma),$(MESALIB_VULKAN_DRIVERS-y)) > \ > -Dvulkan-icd-dir=/etc/vulkan/icd.d \ > - -Dvulkan-overlay-layer=false \ > + -Dvulkan-layers=$(subst $(space),$(comma),$(MESALIB_VULKAN_LAYERS-y)) \ > -Dxlib-lease=$(call ptx/endis, PTXCONF_MESALIB_EGL_X11)d \ > -Dxvmc-libs-path=/usr/lib \ > -Dzlib=enabled \ > -- > 2.29.2 > > > _______________________________________________ > ptxdist mailing list > ptxdist@pengutronix.de > To unsubscribe, send a mail with subject "unsubscribe" to > ptxdist-requ...@pengutronix.de > -- 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 ptxdist@pengutronix.de To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-requ...@pengutronix.de