diff --git a/graphics/mesa-devel/Makefile b/graphics/mesa-devel/Makefile
index 8cbec9f741941..5df59c27fc4d9 100644
--- a/graphics/mesa-devel/Makefile
+++ b/graphics/mesa-devel/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	mesa
-DISTVERSION=	21.1-branchpoint-3257
-DISTVERSIONSUFFIX=	-gd3ea8f519ea
+DISTVERSION=	21.1-branchpoint-3477
+DISTVERSIONSUFFIX=	-gd22cdcd33a4
 CATEGORIES=	graphics
 PKGNAMESUFFIX=	-devel
 
@@ -11,12 +11,10 @@ PATCHFILES+=	cb8f7a253934.patch:-p1 # https://gitlab.freedesktop.org/mesa/mesa/-
 PATCHFILES+=	700efacda59c.patch:-p1
 PATCHFILES+=	e141af3ac859.patch:-p1 # https://gitlab.freedesktop.org/mesa/mesa/-/issues/966#note_394512
 PATCHFILES+=	167fa293d7b7.patch:-p1 # https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/5464
-PATCHFILES+=	e79bfbcf45b9.patch:-p1 # https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/7778
-PATCHFILES+=	505d08f0c1a0.patch:-p1 # https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/7778
+PATCHFILES+=	d58b934a6aa7.patch:-p1 # https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/7778
 PATCHFILES+=	50433886a3e3.patch:-p1 # https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/6881
 PATCHFILES+=	79a9c5e470c2.patch:-p1 # https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/8221
 PATCHFILES+=	891152495cf7.patch:-p1 # https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/9168
-PATCHFILES+=	fc8b31412912.patch:-p1 # https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/11516
 
 MAINTAINER=	jbeich@FreeBSD.org
 COMMENT=	Bleeding edge Mesa drivers (OpenGL, Vulkan)
diff --git a/graphics/mesa-devel/distinfo b/graphics/mesa-devel/distinfo
index 9c0eb342d17c6..6206a49624d23 100644
--- a/graphics/mesa-devel/distinfo
+++ b/graphics/mesa-devel/distinfo
@@ -1,6 +1,6 @@
-TIMESTAMP = 1624316071
-SHA256 (mesa3d-mesa-21.1-branchpoint-3257-gd3ea8f519ea_GH0.tar.gz) = aa45abf306d7a58a7bbb604df5eec61f9e2e3258c4ec7a920d7f03970053f7eb
-SIZE (mesa3d-mesa-21.1-branchpoint-3257-gd3ea8f519ea_GH0.tar.gz) = 24178438
+TIMESTAMP = 1624491873
+SHA256 (mesa3d-mesa-21.1-branchpoint-3477-gd22cdcd33a4_GH0.tar.gz) = 0b78bb10ea08612417a9154cc79e7bcf7983ce44f7551107e24c462edfd4fdaa
+SIZE (mesa3d-mesa-21.1-branchpoint-3477-gd22cdcd33a4_GH0.tar.gz) = 24267920
 SHA256 (55822330540d.patch) = fc776fee1d59f743a060ad1f78e1d9eba8826beb1fe7abef1734a407734b6109
 SIZE (55822330540d.patch) = 1278
 SHA256 (f6c7569ad9ea.patch) = 481784ca37e35549bf265e21eee1b9a29d2b0b8d3294de1d5b6b83a84f3d7a9b
@@ -13,15 +13,11 @@ SHA256 (e141af3ac859.patch) = b547f7389a9ea7f9d69e32e86854b291f04b2f2f5738cd87b2
 SIZE (e141af3ac859.patch) = 2379
 SHA256 (167fa293d7b7.patch) = cc3ad8e59d5d4d7380917e715f676abba65549b07e377dbf6fcec5c294915360
 SIZE (167fa293d7b7.patch) = 2496
-SHA256 (e79bfbcf45b9.patch) = 105d46211199073923e752af9844e4d5d414312ec526e0cc78fcc85c4dce6a64
-SIZE (e79bfbcf45b9.patch) = 4023
-SHA256 (505d08f0c1a0.patch) = 7d8d2b0a3791f57c1432398d866b87faae71d18d8478df8b6d38ee4e47338313
-SIZE (505d08f0c1a0.patch) = 3893
+SHA256 (d58b934a6aa7.patch) = 3b518588d716accd2385593fd56591749a348dbb88ac3776ecb8c28d43838e30
+SIZE (d58b934a6aa7.patch) = 3893
 SHA256 (50433886a3e3.patch) = 15af265e9dbb5dec7514062cfa549d1c1053f567395d9d133611c2a5138da470
 SIZE (50433886a3e3.patch) = 2008
 SHA256 (79a9c5e470c2.patch) = d6f5e0378d16864e21399c4e0b9192ea2de540ef1421e672b62c5e1c69252cab
 SIZE (79a9c5e470c2.patch) = 866
 SHA256 (891152495cf7.patch) = e120e26688c1bfca76f4cb711814d1483693cbc66fcb130c88f98a8bf142f826
 SIZE (891152495cf7.patch) = 1258
-SHA256 (fc8b31412912.patch) = 4dad9b88f3aef46105e0124166fd08acc0a99b7dca62a3c35fbe0f9324ab570f
-SIZE (fc8b31412912.patch) = 886