From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Thu, 11 May 2023 10:29:13 +0200 Received: from metis.ext.pengutronix.de ([2001:67c:670:201:290:27ff:fe1d:cc33]) by lore.white.stw.pengutronix.de with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94.2) (envelope-from ) id 1px1fl-00DjBQ-SS for lore@lore.pengutronix.de; Thu, 11 May 2023 10:29:13 +0200 Received: from localhost ([127.0.0.1] helo=metis.ext.pengutronix.de) by metis.ext.pengutronix.de with esmtp (Exim 4.92) (envelope-from ) id 1px1fk-00071O-B4; Thu, 11 May 2023 10:29:12 +0200 Received: from dude05.red.stw.pengutronix.de ([2a0a:edc0:0:1101:1d::54]) by metis.ext.pengutronix.de with esmtp (Exim 4.92) (envelope-from ) id 1px1fN-000716-9x; Thu, 11 May 2023 10:28:49 +0200 From: Philipp Zabel To: ptxdist@pengutronix.de Date: Thu, 11 May 2023 10:28:46 +0200 Message-Id: <20230511082846.763139-1-p.zabel@pengutronix.de> X-Mailer: git-send-email 2.39.2 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [ptxdist] [PATCH] mesalib: version bump 23.0.0 -> 23.1.0 X-BeenThere: ptxdist@pengutronix.de X-Mailman-Version: 2.1.29 Precedence: list List-Id: PTXdist Development Mailing List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: ptxdist@pengutronix.de Cc: Philipp Zabel Sender: "ptxdist" X-SA-Exim-Connect-IP: 127.0.0.1 X-SA-Exim-Mail-From: ptxdist-bounces@pengutronix.de X-SA-Exim-Scanned: No (on metis.ext.pengutronix.de); SAEximRunCond expanded to false Enable a gallium driver (swrast) in host-mesalib to keep the build system from deactivating the glsl_compiler target. Add an option to build the Intel hasvk Vulkan driver for gfx7/8 platforms. Signed-off-by: Philipp Zabel --- rules/host-mesalib.make | 10 +++++----- rules/mesalib.in | 5 +++++ rules/mesalib.make | 13 +++++++------ 3 files changed, 17 insertions(+), 11 deletions(-) diff --git a/rules/host-mesalib.make b/rules/host-mesalib.make index adcd227d8e23..3412cdb3db11 100644 --- a/rules/host-mesalib.make +++ b/rules/host-mesalib.make @@ -18,6 +18,8 @@ HOST_PACKAGES-$(PTXCONF_HOST_MESALIB) += host-mesalib HOST_MESALIB_CONF_TOOL := meson HOST_MESALIB_CONF_OPT := \ $(HOST_MESON_OPT) \ + -Dallow-kcmp=enabled \ + -Dandroid-libbacktrace=disabled \ -Dandroid-stub=false \ -Dbuild-aco-tests=false \ -Dbuild-tests=false \ @@ -25,7 +27,6 @@ HOST_MESALIB_CONF_OPT := \ -Dd3d-drivers-path=/usr/lib/d3d \ -Ddatasources=auto \ -Ddraw-use-llvm=false \ - -Ddri-drivers= \ -Ddri-drivers-path=/usr/lib/dri \ -Ddri-search-path=/usr/lib/dri \ -Ddri3=disabled \ @@ -33,11 +34,10 @@ HOST_MESALIB_CONF_OPT := \ -Degl-lib-suffix= \ -Degl-native-platform=auto \ -Dexecmem=true \ - -Dfreedreno-kgsl=false \ - -Dfreedreno-virtio=false \ + -Dfreedreno-kmds= \ -Dgallium-d3d10umd=false \ -Dgallium-d3d12-video=disabled \ - -Dgallium-drivers= \ + -Dgallium-drivers=swrast \ -Dgallium-extra-hud=false \ -Dgallium-nine=false \ -Dgallium-omx=disabled \ @@ -60,6 +60,7 @@ HOST_MESALIB_CONF_OPT := \ -Dimagination-srv=false \ -Dinstall-intel-gpu-tests=false \ -Dintel-clc=disabled \ + -Dintel-xe-kmd=disabled \ -Dlibunwind=disabled \ -Dllvm=disabled \ -Dlmsensors=disabled \ @@ -70,7 +71,6 @@ HOST_MESALIB_CONF_OPT := \ -Dopencl-spirv=false \ -Dopengl=true \ -Dosmesa=false \ - -Dosmesa-bits=unspecified \ -Dperfetto=false \ -Dplatform-sdk-version=25 \ -Dplatforms= \ diff --git a/rules/mesalib.in b/rules/mesalib.in index cf9619c85241..6f68c3ceebf5 100644 --- a/rules/mesalib.in +++ b/rules/mesalib.in @@ -237,6 +237,11 @@ config MESALIB_VULKAN_INTEL select MESALIB_XMLCONFIG prompt "Intel (Anvil)" +config MESALIB_VULKAN_INTEL_HASVK + bool + select MESALIB_XMLCONFIG + prompt "Intel (hasvk)" + config MESALIB_VULKAN_FREEDRENO bool prompt "Freedreno (Turnip)" diff --git a/rules/mesalib.make b/rules/mesalib.make index f918a4ffc316..379e169a0660 100644 --- a/rules/mesalib.make +++ b/rules/mesalib.make @@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_MESALIB) += mesalib # # Paths and names # -MESALIB_VERSION := 23.0.2 -MESALIB_MD5 := ffea65f5dd7f1be1e4f941ad990a3ae7 +MESALIB_VERSION := 23.1.0 +MESALIB_MD5 := 786ef9e01490654da0d4deb0f7a75700 MESALIB := mesa-$(MESALIB_VERSION) MESALIB_SUFFIX := tar.xz MESALIB_URL := \ @@ -101,6 +101,7 @@ MESALIB_VIDEO_CODECS-$(PTXCONF_MESALIB_VIDEO_H265ENC) += h265enc ifdef PTXCONF_ARCH_X86 MESALIB_VULKAN_DRIVERS-$(PTXCONF_MESALIB_VULKAN_AMD) += amd MESALIB_VULKAN_DRIVERS-$(PTXCONF_MESALIB_VULKAN_INTEL) += intel +MESALIB_VULKAN_DRIVERS-$(PTXCONF_MESALIB_VULKAN_INTEL_HASVK) += intel_hasvk endif ifdef PTXCONF_ARCH_ARM_NEON MESALIB_VULKAN_DRIVERS-$(PTXCONF_MESALIB_VULKAN_BROADCOM) += broadcom @@ -138,6 +139,8 @@ endif MESALIB_CONF_TOOL := meson MESALIB_CONF_OPT := \ $(CROSS_MESON_USR) \ + -Dallow-kcmp=enabled \ + -Dandroid-libbacktrace=disabled \ -Dandroid-stub=false \ -Dbuild-aco-tests=false \ -Dbuild-tests=false \ @@ -145,7 +148,6 @@ MESALIB_CONF_OPT := \ -Dd3d-drivers-path=/usr/lib/d3d \ -Ddatasources=auto \ -Ddraw-use-llvm=true \ - -Ddri-drivers=[] \ -Ddri-drivers-path=/usr/lib/dri \ -Ddri-search-path=/usr/lib/dri \ -Ddri3=$(call ptx/endis, PTXCONF_MESALIB_DRI3)d \ @@ -154,8 +156,7 @@ MESALIB_CONF_OPT := \ -Degl-native-platform=auto \ -Denable-glcpp-tests=false \ -Dexecmem=true \ - -Dfreedreno-kgsl=false \ - -Dfreedreno-virtio=false \ + -Dfreedreno-kmds=msm \ -Dgallium-d3d10umd=false \ -Dgallium-d3d12-video=disabled \ -Dgallium-drivers=$(subst $(space),$(comma),$(MESALIB_GALLIUM_DRIVERS-y)) \ @@ -181,6 +182,7 @@ MESALIB_CONF_OPT := \ -Dimagination-srv=false \ -Dinstall-intel-gpu-tests=false \ -Dintel-clc=disabled \ + -Dintel-xe-kmd=disabled \ -Dlibunwind=disabled \ -Dllvm=disabled \ -Dlmsensors=$(call ptx/endis, PTXCONF_MESALIB_LMSENSORS)d \ @@ -191,7 +193,6 @@ MESALIB_CONF_OPT := \ -Dopencl-spirv=false \ -Dopengl=$(call ptx/truefalse, PTXCONF_MESALIB_OPENGL) \ -Dosmesa=false \ - -Dosmesa-bits=unspecified \ -Dperfetto=false \ -Dplatform-sdk-version=25 \ -Dplatforms=$(subst $(space),$(comma),$(MESALIBS_EGL_PLATFORMS-y)) \ -- 2.39.2