From 5caab525bad31c4116d6297007e87acdbaf4ae58 Mon Sep 17 00:00:00 2001
From: Philipp Zabel <p.zabel@pengutronix.de>
Date: Fri, 20 Aug 2021 11:46:38 +0200
Subject: mesalib: version bump 21.1.7 -> 21.2.1

Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
Message-Id: <20210820094638.19873-1-p.zabel@pengutronix.de>
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
---
 rules/host-mesalib.make |  8 ++++++++
 rules/mesalib.in        | 12 ++++++++++++
 rules/mesalib.make      | 17 +++++++++++++++--
 3 files changed, 35 insertions(+), 2 deletions(-)

diff --git a/rules/host-mesalib.make b/rules/host-mesalib.make
index 95794c4c9..13a956e10 100644
--- a/rules/host-mesalib.make
+++ b/rules/host-mesalib.make
@@ -21,7 +21,9 @@ HOST_MESALIB_CONF_OPT	:= \
 	-Dandroid-stub=false \
 	-Dbuild-aco-tests=false \
 	-Dbuild-tests=false \
+	-Dcustom-shader-replacement= \
 	-Dd3d-drivers-path=/usr/lib/d3d \
+	-Ddatasources=auto \
 	-Ddraw-use-llvm=false \
 	-Ddri-drivers= \
 	-Ddri-drivers-path=/usr/lib/dri \
@@ -30,7 +32,9 @@ HOST_MESALIB_CONF_OPT	:= \
 	-Degl=disabled \
 	-Degl-lib-suffix= \
 	-Degl-native-platform=auto \
+	-Dexecmem=true \
 	-Dfreedreno-kgsl=false \
+	-Dgallium-d3d10umd=false \
 	-Dgallium-drivers= \
 	-Dgallium-extra-hud=false \
 	-Dgallium-nine=false \
@@ -41,6 +45,7 @@ HOST_MESALIB_CONF_OPT	:= \
 	-Dgallium-xa=disabled \
 	-Dgallium-xvmc=disabled \
 	-Dgbm=disabled \
+	-Dgbm-backends-path= \
 	-Dgles-lib-suffix= \
 	-Dgles1=disabled \
 	-Dgles2=disabled \
@@ -54,15 +59,18 @@ HOST_MESALIB_CONF_OPT	:= \
 	-Dllvm=disabled \
 	-Dlmsensors=disabled \
 	-Dmicrosoft-clc=disabled \
+	-Dmoltenvk-dir= \
 	-Domx-libs-path=/usr/lib/dri \
 	-Dopencl-native=false \
 	-Dopencl-spirv=false \
 	-Dopengl=true \
 	-Dosmesa=false \
 	-Dosmesa-bits=8 \
+	-Dperfetto=false \
 	-Dplatform-sdk-version=25 \
 	-Dplatforms= \
 	-Dpower8=disabled \
+	-Dprefer-crocus=false \
 	-Dprefer-iris=true \
 	-Dselinux=false \
 	-Dshader-cache=disabled \
diff --git a/rules/mesalib.in b/rules/mesalib.in
index 2f64606dc..b9fd1d3c8 100644
--- a/rules/mesalib.in
+++ b/rules/mesalib.in
@@ -125,6 +125,14 @@ config MESALIB_DRI_ZINK
 	bool
 	prompt "zink"
 
+config MESALIB_DRI_ASAHI
+	bool
+	prompt "asahi"
+
+config MESALIB_DRI_CROCUS
+	bool
+	prompt "crocus"
+
 comment "API Support"
 
 config MESALIB_OPENGL
@@ -205,6 +213,10 @@ config MESALIB_VULKAN_FREEDRENO
 	bool
 	prompt "Freedreno (Turnip)"
 
+config MESALIB_VULKAN_PANFROST
+	bool
+	prompt "Panfrost"
+
 config MESALIB_VULKAN_SWRAST
 	bool
 	# needs LLVM
diff --git a/rules/mesalib.make b/rules/mesalib.make
index b5dadf84e..945b7c523 100644
--- a/rules/mesalib.make
+++ b/rules/mesalib.make
@@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_MESALIB) += mesalib
 #
 # Paths and names
 #
-MESALIB_VERSION	:= 21.1.7
-MESALIB_MD5	:= ed45b314285612ea3634f8e5c0c2689e
+MESALIB_VERSION	:= 21.2.1
+MESALIB_MD5	:= f81336168864b1f890edfa5db8587f2b
 MESALIB		:= mesa-$(MESALIB_VERSION)
 MESALIB_SUFFIX	:= tar.xz
 MESALIB_URL	:= \
@@ -59,6 +59,10 @@ ifdef PTXCONF_ARCH_X86
 MESALIB_GALLIUM_DRIVERS-$(PTXCONF_MESALIB_DRI_IRIS)	+= iris
 endif
 MESALIB_GALLIUM_DRIVERS-$(PTXCONF_MESALIB_DRI_ZINK)	+= zink
+MESALIB_GALLIUM_DRIVERS-$(PTXCONF_MESALIB_DRI_ASAHI)	+= asahi
+ifdef PTXCONF_ARCH_X86
+MESALIB_GALLIUM_DRIVERS-$(PTXCONF_MESALIB_DRI_CROCUS)	+= crocus
+endif
 
 MESALIB_DRI_LIBS-y = \
 	$(subst nouveau,nouveau_vieux,$(MESALIB_DRI_DRIVERS-y))
@@ -92,6 +96,7 @@ endif
 ifdef PTXCONF_ARCH_ARM
 MESALIB_VULKAN_DRIVERS-$(PTXCONF_MESALIB_VULKAN_BROADCOM)	+= broadcom
 MESALIB_VULKAN_DRIVERS-$(PTXCONF_MESALIB_VULKAN_FREEDRENO)	+= freedreno
+MESALIB_VULKAN_DRIVERS-$(PTXCONF_MESALIB_VULKAN_PANFROST)	+= panfrost
 endif
 MESALIB_VULKAN_DRIVERS-$(PTXCONF_MESALIB_VULKAN_SWRAST)		+= swrast
 
@@ -117,7 +122,9 @@ MESALIB_CONF_OPT	:= \
 	-Dandroid-stub=false \
 	-Dbuild-aco-tests=false \
 	-Dbuild-tests=false \
+	-Dcustom-shader-replacement= \
 	-Dd3d-drivers-path=/usr/lib/d3d \
+	-Ddatasources=auto \
 	-Ddraw-use-llvm=true \
 	-Ddri-drivers=$(subst $(space),$(comma),$(MESALIB_DRI_DRIVERS-y)) \
 	-Ddri-drivers-path=/usr/lib/dri \
@@ -126,7 +133,9 @@ MESALIB_CONF_OPT	:= \
 	-Degl=$(call ptx/endis, PTXCONF_MESALIB_EGL)d \
 	-Degl-lib-suffix= \
 	-Degl-native-platform=auto \
+	-Dexecmem=true \
 	-Dfreedreno-kgsl=false \
+	-Dgallium-d3d10umd=false \
 	-Dgallium-drivers=$(subst $(space),$(comma),$(MESALIB_GALLIUM_DRIVERS-y)) \
 	-Dgallium-extra-hud=$(call ptx/truefalse, PTXCONF_MESALIB_EXTENDED_HUD) \
 	-Dgallium-nine=false \
@@ -137,6 +146,7 @@ MESALIB_CONF_OPT	:= \
 	-Dgallium-xa=disabled \
 	-Dgallium-xvmc=disabled \
 	-Dgbm=$(call ptx/endis, PTXCONF_MESALIB_GBM)d \
+	-Dgbm-backends-path= \
 	-Dgles-lib-suffix= \
 	-Dgles1=$(call ptx/endis, PTXCONF_MESALIB_GLES1)d \
 	-Dgles2=$(call ptx/endis, PTXCONF_MESALIB_GLES2)d \
@@ -150,15 +160,18 @@ MESALIB_CONF_OPT	:= \
 	-Dllvm=disabled \
 	-Dlmsensors=$(call ptx/endis, PTXCONF_MESALIB_LMSENSORS)d \
 	-Dmicrosoft-clc=disabled \
+	-Dmoltenvk-dir= \
 	-Domx-libs-path=/usr/lib/dri \
 	-Dopencl-native=false \
 	-Dopencl-spirv=false \
 	-Dopengl=$(call ptx/truefalse, PTXCONF_MESALIB_OPENGL) \
 	-Dosmesa=false \
 	-Dosmesa-bits=8 \
+	-Dperfetto=false \
 	-Dplatform-sdk-version=25 \
 	-Dplatforms=$(subst $(space),$(comma),$(MESALIBS_EGL_PLATFORMS-y)) \
 	-Dpower8=disabled \
+	-Dprefer-crocus=false \
 	-Dprefer-iris=true \
 	-Dselinux=false \
 	-Dshader-cache=$(call ptx/endis, PTXCONF_MESALIB_SHADER_CACHE)d \
-- 
cgit v1.2.3