Merge Mesa 21.3.7

26 files changed, 137 insertions, 60 deletions

diff --git a/lib/mesa/mk/Makefile b/lib/mesa/mk/Makefile
index 049981ba8..f1e3d79b0 100644
--- a/lib/mesa/mk/Makefile
+++ b/lib/mesa/mk/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.2 2021/07/22 11:10:08 jsg Exp $
+#	$OpenBSD: Makefile,v 1.3 2022/02/24 02:29:48 jsg Exp $
 
 .include "config.mk"
 
@@ -96,6 +96,9 @@ SUBDIR+=	libr600
 .endif
 
 .if ${WITH_GALLIUM_RADEONSI} == "yes" || make(obj)
+.for GEN in 6 7 8 9 10 103
+SUBDIR+=	libradeonsi_gfx${GEN}
+.endfor
 SUBDIR+=	libradeonsi
 .endif
 
diff --git a/lib/mesa/mk/config.mk b/lib/mesa/mk/config.mk
index 1d8127c0a..d81bc066b 100644
--- a/lib/mesa/mk/config.mk
+++ b/lib/mesa/mk/config.mk
@@ -2,7 +2,7 @@
 .include <bsd.own.mk>
 
 CFLAGS+= \
-	-std=c99 \
+	-std=c11 \
 	-Wall \
 	-Winvalid-pch \
 	-Werror=empty-body \
@@ -11,6 +11,7 @@ CFLAGS+= \
 	-Werror=int-conversion \
 	-Werror=missing-prototypes \
 	-Werror=return-type \
+	-Werror=thread-safety \
 	-Wno-missing-field-initializers \
 	-Wno-typedef-redefinition \
 	-fno-math-errno \
@@ -23,15 +24,17 @@ CFLAGS+= \
 CXXFLAGS+= \
 	-std=c++14 \
 	-Wall \
-	-Winvalid-pch \
 	-Werror=empty-body \
 	-Werror=format \
 	-Werror=return-type \
+	-Wformat-security \
+	-Winvalid-pch \
+	-Wno-microsoft-enum-value \
 	-Wno-missing-field-initializers \
 	-Wno-non-virtual-dtor \
+	-Wno-unused-local-typedefs \
 	-fno-math-errno \
 	-fno-trapping-math \
-	-Wformat-security \
 	-Qunused-arguments
 
 .if ${COMPILER_VERSION:L} != "clang"
@@ -59,6 +62,7 @@ CPPFLAGS+= \
 	-DGLX_DIRECT_RENDERING \
 	-DGLX_INDIRECT_RENDERING \
 	-DGLX_USE_DRM \
+	-DHAS_SCHED_H \
 	-DHAVE_ARC4RANDOM_BUF \
 	-DHAVE_COMPRESSION \
 	-DHAVE_DIRENT_D_TYPE \
@@ -67,7 +71,6 @@ CPPFLAGS+= \
 	-DHAVE_DL_ITERATE_PHDR \
 	-DHAVE_DRM_PLATFORM \
 	-DHAVE_ENDIAN_H \
-	-DHAVE_EXECINFO_H \
 	-DHAVE_FLOCK \
 	-DHAVE_FUNC_ATTRIBUTE_ALIAS \
 	-DHAVE_FUNC_ATTRIBUTE_CONST \
@@ -110,6 +113,7 @@ CPPFLAGS+= \
 	-DNDEBUG \
 	-DUSE_GCC_ATOMIC_BUILTINS \
 	-DPACKAGE_BUGREPORT=\"bugs@openbsd.org\" \
+	-DVK_USE_PLATFORM_DISPLAY_KHR \
 	-D_FILE_OFFSET_BITS=64 \
 	-D_ISOC11_SOURCE \
 	-D__STDC_CONSTANT_MACROS \
@@ -145,8 +149,10 @@ CPPFLAGS+=	-DMISSING_64BIT_ATOMICS
 .if ${MACHINE_ARCH} == "i386"
 CPPFLAGS+=	-DUSE_X86_ASM -DUSE_MMX_ASM -DUSE_3DNOW_ASM -DUSE_SSE_ASM \
 		-DUSE_SSE41
+CPPFLAGS+=	-DHAVE_CET_H
 .elif ${MACHINE_ARCH} == "amd64"
 CPPFLAGS+=	-DUSE_X86_64_ASM -DUSE_SSE41
+CPPFLAGS+=	-DHAVE_CET_H
 .elif ${MACHINE_ARCH} == "arm"
 CPPFLAGS+=	-DUSE_ARM_ASM
 .elif ${MACHINE_ARCH} == "aarch64"
diff --git a/lib/mesa/mk/libaco/Makefile b/lib/mesa/mk/libaco/Makefile
index 719cc72bc..937bbcd57 100644
--- a/lib/mesa/mk/libaco/Makefile
+++ b/lib/mesa/mk/libaco/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.3 2021/07/22 11:10:09 jsg Exp $
+#	$OpenBSD: Makefile,v 1.4 2022/02/24 02:29:48 jsg Exp $
 
 LIB=	aco
 
@@ -22,6 +22,7 @@ SRCS=	aco_dead_code_analysis.cpp \
 	aco_lower_to_cssa.cpp \
 	aco_lower_to_hw_instr.cpp \
 	aco_optimizer.cpp \
+	aco_optimizer_postRA.cpp \
 	aco_opt_value_numbering.cpp \
 	aco_print_asm.cpp \
 	aco_print_ir.cpp \
@@ -51,6 +52,7 @@ CPPFLAGS+=	-I${MESA_SRC}/src/gallium/include \
 		-I${MESA_SRC}/src/compiler \
 		-I${MESA_SRC}/src/compiler/nir \
 		-I${MESA_SRC}/src/mesa \
+		-I${MESA_SRC}/generated/src/amd \
 		-I${MESA_SRC}/generated/src/amd/common \
 		-I${MESA_SRC}/generated/src/amd/compiler \
 		-I${MESA_SRC}/generated/src/compiler/nir
diff --git a/lib/mesa/mk/libamd_common/Makefile b/lib/mesa/mk/libamd_common/Makefile
index ce8e227c9..015a36cda 100644
--- a/lib/mesa/mk/libamd_common/Makefile
+++ b/lib/mesa/mk/libamd_common/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.2 2021/07/22 11:10:09 jsg Exp $
+#	$OpenBSD: Makefile,v 1.3 2022/02/24 02:29:48 jsg Exp $
 
 LIB=	amd_common
 
@@ -16,9 +16,13 @@ SRCS=	ac_binary.c \
 	ac_rgp.c \
 	ac_msgpack.c \
 	ac_rgp_elf_object_pack.c \
+	ac_nir.c \
+	ac_nir_cull.c \
 	ac_nir_lower_esgs_io_to_mem.c \
 	ac_nir_lower_tess_io_to_mem.c \
-	amd_family.c
+	ac_nir_lower_ngg.c \
+	amd_family.c \
+	ac_perfcounter.c
 
 SRCS+=	gfx10_format_table.c
 
@@ -33,6 +37,7 @@ CPPFLAGS+=	-I${MESA_SRC}/src/mesa \
 		-I${MESA_SRC}/src/amd/common \
 		-I${MESA_SRC}/src/compiler \
 		-I${MESA_SRC}/src/compiler/nir \
+		-I${MESA_SRC}/src/util \
 		-I${MESA_SRC}/generated/src/amd/common \
 		-I${MESA_SRC}/generated/src/compiler/nir
 
diff --git a/lib/mesa/mk/libanv_common/Makefile b/lib/mesa/mk/libanv_common/Makefile
index b789a5195..8bd807897 100644
--- a/lib/mesa/mk/libanv_common/Makefile
+++ b/lib/mesa/mk/libanv_common/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.2 2021/07/22 11:10:09 jsg Exp $
+#	$OpenBSD: Makefile,v 1.3 2022/02/24 02:29:48 jsg Exp $
 
 LIB=	anv_common
 
@@ -27,8 +27,7 @@ SRCS=	anv_allocator.c \
 	anv_util.c \
 	anv_wsi.c
 
-SRCS+=	anv_wsi_x11.c \
-	anv_wsi_display.c \
+SRCS+=	anv_wsi_display.c \
 	anv_android_stubs.c
 
 SRCS+=	anv_entrypoints.c
diff --git a/lib/mesa/mk/libgallium/Makefile b/lib/mesa/mk/libgallium/Makefile
index e19c9abef..129d2e137 100644
--- a/lib/mesa/mk/libgallium/Makefile
+++ b/lib/mesa/mk/libgallium/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.3 2021/07/22 11:10:09 jsg Exp $
+#	$OpenBSD: Makefile,v 1.4 2022/02/24 02:29:48 jsg Exp $
 
 .include "../Makefile.inc"
 
@@ -33,7 +33,6 @@ SRCS=	cso_cache.c \
 	draw_pt.c \
 	draw_pt_emit.c \
 	draw_pt_fetch.c \
-	draw_pt_fetch_emit.c \
 	draw_pt_fetch_shade_emit.c \
 	draw_pt_fetch_shade_pipeline.c \
 	draw_pt_post_vs.c \
@@ -123,19 +122,17 @@ SRCS=	cso_cache.c \
 	u_blitter.c \
 	u_cache.c \
 	u_compute.c \
-	u_debug_describe.c \
 	u_debug_flush.c \
 	u_debug_image.c \
-	u_debug_refcnt.c \
 	u_dl.c \
 	u_draw.c \
 	u_draw_quad.c \
+	u_driconf.c \
 	u_dump_defines.c \
 	u_dump_state.c \
 	u_framebuffer.c \
 	u_gen_mipmap.c \
 	u_handle_table.c \
-	u_hash_table.c \
 	u_helpers.c \
 	u_index_modify.c \
 	u_linear.c \
@@ -158,8 +155,10 @@ SRCS=	cso_cache.c \
 	u_transfer.c \
 	u_transfer_helper.c \
 	u_threaded_context.c \
+	u_trace_gallium.c \
 	u_upload_mgr.c \
 	u_vbuf.c \
+	u_vertex_state_cache.c \
 	tgsi_to_nir.c \
 	nir_to_tgsi.c \
 	nir_draw_helpers.c
@@ -253,6 +252,7 @@ CPPFLAGS+=	-I${MESA_SRC}/src/gallium/include \
 		-I${MESA_SRC}/src/gallium/auxiliary/util \
 		-I${MESA_SRC}/src/gallium/auxiliary/nir \
 		-I${MESA_SRC}/src/compiler/nir \
+		-I${MESA_SRC}/generated/src/gallium/auxiliary \
 		-I${MESA_SRC}/generated/src/compiler/nir
 #llvm
 CPPFLAGS+=	-I${MESA_SRC}/src/gallium/auxiliary/gallivm \
diff --git a/lib/mesa/mk/libgallium_dri/Makefile b/lib/mesa/mk/libgallium_dri/Makefile
index 91dc0b966..ae7b5ed71 100644
--- a/lib/mesa/mk/libgallium_dri/Makefile
+++ b/lib/mesa/mk/libgallium_dri/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.2 2021/07/22 11:10:09 jsg Exp $
+#	$OpenBSD: Makefile,v 1.3 2022/02/24 02:29:48 jsg Exp $
 
 LIB=	gallium_dri
 
@@ -106,6 +106,12 @@ SLIBS+= libamdgpuwinsys \
 	libaddrlib \
 	libamd_common \
 	libamd_common_llvm \
+	libradeonsi_gfx6 \
+	libradeonsi_gfx7 \
+	libradeonsi_gfx8 \
+	libradeonsi_gfx9 \
+	libradeonsi_gfx10 \
+	libradeonsi_gfx103 \
 	libradeonsi
 .endif
 
diff --git a/lib/mesa/mk/libgbm/Makefile b/lib/mesa/mk/libgbm/Makefile
index 3072a1d4d..301f6c057 100644
--- a/lib/mesa/mk/libgbm/Makefile
+++ b/lib/mesa/mk/libgbm/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.3 2020/09/03 11:29:42 jsg Exp $
+#	$OpenBSD: Makefile,v 1.4 2022/02/24 02:29:48 jsg Exp $
 
 .include <bsd.xconf.mk>
 
@@ -16,7 +16,8 @@ SRCS+=	gbm_dri.c
 CFLAGS+=	${C_VIS_ARGS}
 CPPFLAGS+=	-I${MESA_SRC}/src/gbm/main \
 		-I${MESA_SRC}/src/gbm/backends/dri \
-		-I${MESA_SRC}/src/loader
+		-I${MESA_SRC}/src/loader \
+		-DDEFAULT_BACKENDS_PATH=\"${X11BASE}/lib/gbm\"
 
 LDADD+=	-Wl,--as-needed -Wl,--start-group \
 	${.CURDIR}/../libloader/${__objdir}/libloader.a \
diff --git a/lib/mesa/mk/libgbm/shlib_version b/lib/mesa/mk/libgbm/shlib_version
index 0e9ba6803..ce4bda521 100644
--- a/lib/mesa/mk/libgbm/shlib_version
+++ b/lib/mesa/mk/libgbm/shlib_version
@@ -1,2 +1,2 @@
 major=0
-minor=5
+minor=6
diff --git a/lib/mesa/mk/libglsl/Makefile b/lib/mesa/mk/libglsl/Makefile
index 3ce8bca20..98bbfef41 100644
--- a/lib/mesa/mk/libglsl/Makefile
+++ b/lib/mesa/mk/libglsl/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.3 2021/07/22 11:10:09 jsg Exp $
+#	$OpenBSD: Makefile,v 1.4 2022/02/24 02:29:48 jsg Exp $
 
 .include <bsd.xconf.mk>
 
@@ -82,7 +82,6 @@ SRCS=	ast_array_index.cpp \
 	lower_precision.cpp \
 	lower_subroutine.cpp \
 	lower_tess_level.cpp \
-	lower_texture_projection.cpp \
 	lower_variable_index_to_cond_assign.cpp \
 	lower_vec_index_to_cond_assign.cpp \
 	lower_vec_index_to_swizzle.cpp \
diff --git a/lib/mesa/mk/libi965/Makefile b/lib/mesa/mk/libi965/Makefile
index 76c8d330a..8eb35a2b2 100644
--- a/lib/mesa/mk/libi965/Makefile
+++ b/lib/mesa/mk/libi965/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.2 2021/07/22 11:10:09 jsg Exp $
+#	$OpenBSD: Makefile,v 1.3 2022/02/24 02:29:48 jsg Exp $
 
 LIB=	i965
 
@@ -25,7 +25,6 @@ SRCS=	brw_batch.c \
 	brw_extensions.c \
 	brw_fbo.c \
 	brw_ff_gs.c \
-	brw_ff_gs_emit.c \
 	brw_formatquery.c \
 	brw_generate_mipmap.c \
 	brw_gs.c \
diff --git a/lib/mesa/mk/libintel_compiler/Makefile b/lib/mesa/mk/libintel_compiler/Makefile
index e89534e92..da42d161f 100644
--- a/lib/mesa/mk/libintel_compiler/Makefile
+++ b/lib/mesa/mk/libintel_compiler/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.3 2021/07/22 11:10:10 jsg Exp $
+#	$OpenBSD: Makefile,v 1.4 2022/02/24 02:29:49 jsg Exp $
 
 LIB=	intel_compiler
 
@@ -11,6 +11,7 @@ SRCS=	brw_cfg.cpp \
 	brw_clip_unfilled.c \
 	brw_clip_util.c \
 	brw_compile_clip.c \
+	brw_compile_ff_gs.c \
 	brw_compile_sf.c \
 	brw_compiler.c \
 	brw_dead_control_flow.cpp \
@@ -50,12 +51,12 @@ SRCS=	brw_cfg.cpp \
 	brw_nir_lower_conversions.c \
 	brw_nir_lower_cs_intrinsics.c \
 	brw_nir_lower_alpha_to_coverage.c \
-	brw_nir_lower_image_load_store.c \
 	brw_nir_lower_intersection_shader.c \
 	brw_nir_lower_mem_access_bit_sizes.c \
 	brw_nir_lower_rt_intrinsics.c \
 	brw_nir_lower_scoped_barriers.c \
 	brw_nir_lower_shader_calls.c \
+	brw_nir_lower_storage_image.c \
 	brw_nir_opt_peephole_ffma.c \
 	brw_nir_rt.c \
 	brw_nir_tcs_workarounds.c \
diff --git a/lib/mesa/mk/libintel_dev/Makefile b/lib/mesa/mk/libintel_dev/Makefile
index cb1d2340e..f7ac704b0 100644
--- a/lib/mesa/mk/libintel_dev/Makefile
+++ b/lib/mesa/mk/libintel_dev/Makefile
@@ -1,11 +1,11 @@
-#	$OpenBSD: Makefile,v 1.2 2021/07/22 11:10:10 jsg Exp $
+#	$OpenBSD: Makefile,v 1.3 2022/02/24 02:29:49 jsg Exp $
 
 LIB=	intel_dev
 
 NOPROFILE=
 
-SRCS=	gen_debug.c \
-	gen_device_info.c
+SRCS=	intel_debug.c \
+	intel_device_info.c
 
 .include "../Makefile.inc"
 
diff --git a/lib/mesa/mk/libintel_perf/Makefile b/lib/mesa/mk/libintel_perf/Makefile
index 565e86788..c7813b929 100644
--- a/lib/mesa/mk/libintel_perf/Makefile
+++ b/lib/mesa/mk/libintel_perf/Makefile
@@ -1,14 +1,14 @@
-#	$OpenBSD: Makefile,v 1.1 2020/08/26 06:02:38 jsg Exp $
+#	$OpenBSD: Makefile,v 1.2 2022/02/24 02:29:49 jsg Exp $
 
 LIB=	intel_perf
 
 NOPROFILE=
 
-SRCS=	gen_perf.c \
-	gen_perf_query.c \
-	gen_perf_mdapi.c
+SRCS=	intel_perf.c \
+	intel_perf_query.c \
+	intel_perf_mdapi.c
 
-SRCS+=	gen_perf_metrics.c
+SRCS+=	intel_perf_metrics.c
 
 .include "../Makefile.inc"
 
diff --git a/lib/mesa/mk/libllvmpipe/Makefile b/lib/mesa/mk/libllvmpipe/Makefile
index de3facbeb..a3128b29b 100644
--- a/lib/mesa/mk/libllvmpipe/Makefile
+++ b/lib/mesa/mk/libllvmpipe/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.3 2021/07/22 11:10:12 jsg Exp $
+#	$OpenBSD: Makefile,v 1.4 2022/02/24 02:29:49 jsg Exp $
 
 LIB=	llvmpipe
 
@@ -17,18 +17,27 @@ SRCS=	lp_bld_alpha.c \
 	lp_fence.c \
 	lp_flush.c \
 	lp_jit.c \
+	lp_linear.c \
+	lp_linear_fastpath.c \
+	lp_linear_interp.c \
+	lp_linear_sampler.c \
 	lp_memory.c \
 	lp_perf.c \
 	lp_query.c \
 	lp_rast.c \
 	lp_rast_debug.c \
+	lp_rast_linear.c \
+	lp_rast_linear_fallback.c \
+	lp_rast_rect.c \
 	lp_rast_tri.c \
 	lp_scene.c \
 	lp_scene_queue.c \
 	lp_screen.c \
 	lp_setup.c \
+	lp_setup_analysis.c \
 	lp_setup_line.c \
 	lp_setup_point.c \
+	lp_setup_rect.c \
 	lp_setup_tri.c \
 	lp_setup_vbuf.c \
 	lp_state_blend.c \
@@ -36,6 +45,10 @@ SRCS=	lp_bld_alpha.c \
 	lp_state_cs.c \
 	lp_state_derived.c \
 	lp_state_fs.c \
+	lp_state_fs_analysis.c \
+	lp_state_fs_fastpath.c \
+	lp_state_fs_linear.c \
+	lp_state_fs_linear_llvm.c \
 	lp_state_gs.c \
 	lp_state_rasterizer.c \
 	lp_state_sampler.c \
@@ -57,6 +70,7 @@ CPPFLAGS+=	-I${MESA_SRC}/src/gallium/include \
 		-I${MESA_SRC}/src/gallium/auxiliary \
 		-I${MESA_SRC}/src/gallium/drivers/llvmpipe \
 		-I${MESA_SRC}/src/compiler/nir \
+		-I${MESA_SRC}/generated/src \
 		-I${MESA_SRC}/generated/src/compiler/nir
 
 install:
diff --git a/lib/mesa/mk/libloader/Makefile b/lib/mesa/mk/libloader/Makefile
index 813f759c1..1c945c33a 100644
--- a/lib/mesa/mk/libloader/Makefile
+++ b/lib/mesa/mk/libloader/Makefile
@@ -1,10 +1,11 @@
-#	$OpenBSD: Makefile,v 1.1 2020/08/26 06:02:40 jsg Exp $
+#	$OpenBSD: Makefile,v 1.2 2022/02/24 02:29:49 jsg Exp $
 
 LIB=	loader
 
 NOPROFILE=
 
-SRCS=	loader.c \
+SRCS=	loader_dri_helper.c \
+	loader.c \
 	pci_id_driver_map.c
 
 .include "../Makefile.inc"
diff --git a/lib/mesa/mk/libmesa_common/Makefile b/lib/mesa/mk/libmesa_common/Makefile
index 278e89e25..80442f852 100644
--- a/lib/mesa/mk/libmesa_common/Makefile
+++ b/lib/mesa/mk/libmesa_common/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.3 2021/07/22 11:10:12 jsg Exp $
+#	$OpenBSD: Makefile,v 1.4 2022/02/24 02:29:49 jsg Exp $
 
 LIB=	mesa_common
 
@@ -76,6 +76,7 @@ SRCS=	arbprogparse.c \
 	glthread_bufferobj.c \
 	glthread_draw.c \
 	glthread_get.c \
+	glthread_list.c \
 	glthread_shaderobj.c \
 	glthread_varray.c \
 	hash.c \
@@ -195,8 +196,6 @@ SRCS+=		sparc_clip.S \
 CPPFLAGS+=	-I${MESA_SRC}/src/mesa/sparc
 .endif
 
-SRCS+=	format_pack.c
-
 SRCS+=	lex.yy.c \
 	program_parse.tab.c \
 	api_exec.c \
@@ -219,6 +218,7 @@ CPPFLAGS+=	-I${MESA_SRC}/src/mesa \
 		-I${MESA_SRC}/src/mesa/x86 \
 		-I${MESA_SRC}/src/mapi \
 		-I${MESA_SRC}/src/gallium/include \
+		-I${MESA_SRC}/src/gallium/auxiliary \
 		-I${MESA_SRC}/generated/src \
 		-I${MESA_SRC}/generated/src/mesa \
 		-I${MESA_SRC}/generated/src/mesa/main \
diff --git a/lib/mesa/mk/libmesa_dri_drivers/Makefile b/lib/mesa/mk/libmesa_dri_drivers/Makefile
index 711ad46ed..754ec5e0c 100644
--- a/lib/mesa/mk/libmesa_dri_drivers/Makefile
+++ b/lib/mesa/mk/libmesa_dri_drivers/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.2 2021/07/22 11:10:12 jsg Exp $
+#	$OpenBSD: Makefile,v 1.3 2022/02/24 02:29:49 jsg Exp $
 
 .include "../Makefile.inc"
 
@@ -134,6 +134,10 @@ install: _SUBDIRUSE
 	ln -f ${DESTDIR}${X11BASE}/lib/modules/dri/lib${LIB}.so \
 	    ${DESTDIR}${X11BASE}/lib/modules/dri/${driver}_dri.so
 .endif
+.if "${driver}" == "i915"
+	ln -f ${DESTDIR}${X11BASE}/lib/modules/dri/lib${LIB}.so \
+	    ${DESTDIR}${X11BASE}/lib/modules/dri/i830_dri.so
+.endif
 .endfor
 	rm ${DESTDIR}${X11BASE}/lib/modules/dri/lib${LIB}.so
 
diff --git a/lib/mesa/mk/libmesa_format/Makefile b/lib/mesa/mk/libmesa_format/Makefile
index f60024cc0..181e70a8b 100644
--- a/lib/mesa/mk/libmesa_format/Makefile
+++ b/lib/mesa/mk/libmesa_format/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.2 2021/07/22 11:10:12 jsg Exp $
+#	$OpenBSD: Makefile,v 1.3 2022/02/24 02:29:49 jsg Exp $
 
 LIB=	mesa_format
 
@@ -13,6 +13,7 @@ SRCS=	u_format.c \
 	u_format_rgtc.c \
 	u_format_s3tc.c \
 	u_format_tests.c \
+	u_format_unpack_neon.c \
 	u_format_yuv.c \
 	u_format_zs.c
 
diff --git a/lib/mesa/mk/libmesa_util/Makefile b/lib/mesa/mk/libmesa_util/Makefile
index 1ec944392..b409bbbcc 100644
--- a/lib/mesa/mk/libmesa_util/Makefile
+++ b/lib/mesa/mk/libmesa_util/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.2 2021/07/22 11:10:12 jsg Exp $
+#	$OpenBSD: Makefile,v 1.3 2022/02/24 02:29:49 jsg Exp $
 
 LIB=	mesa_util
 
@@ -24,8 +24,10 @@ SRCS=	anon_file.c \
 	memstream.c \
 	mesa-sha1.c \
 	os_file.c \
+	os_memory_fd.c \
 	os_misc.c \
 	os_socket.c \
+	u_trace.c \
 	os_time.c \
 	ralloc.c \
 	rand_xor.c \
@@ -40,6 +42,8 @@ SRCS=	anon_file.c \
 	string_buffer.c \
 	strtod.c \
 	u_atomic.c \
+	u_debug_describe.c \
+	u_debug_refcnt.c \
 	u_cpu_detect.c \
 	u_printf.cpp \
 	u_debug.c \
@@ -47,6 +51,8 @@ SRCS=	anon_file.c \
 	u_math.c \
 	u_mm.c \
 	u_process.c \
+	u_qsort.cpp \
+	u_hash_table.c \
 	u_queue.c \
 	u_vector.c \
 	vma.c
@@ -59,6 +65,7 @@ SRCS+=	format_srgb.c
 .include "../Makefile.inc"
 
 CFLAGS+=	${C_VIS_ARGS}
+CXXFLAGS+=	${CXX_VIS_ARGS}
 CPPFLAGS+=	-I${MESA_SRC}/src/util \
 		-I${MESA_SRC}/src/mesa \
 		-I${MESA_SRC}/src/gallium/include \
@@ -72,5 +79,6 @@ obj: _xenocara_obj
 .include <bsd.xorg.mk>
 
 .PATH: ${MESA_SRC}/src/util
+.PATH: ${MESA_SRC}/src/util/perf
 .PATH: ${MESA_SRC}/src/util/sha1
 .PATH: ${MESA_SRC}/generated/src/util
diff --git a/lib/mesa/mk/libnir/Makefile b/lib/mesa/mk/libnir/Makefile
index 47542a5f3..9bb82613f 100644
--- a/lib/mesa/mk/libnir/Makefile
+++ b/lib/mesa/mk/libnir/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.3 2021/07/22 11:10:12 jsg Exp $
+#	$OpenBSD: Makefile,v 1.4 2022/02/24 02:29:49 jsg Exp $
 
 LIB=	nir
 
@@ -30,10 +30,10 @@ SRCS=	nir.c \
 	nir_lower_array_deref_of_vec.c \
 	nir_lower_atomics_to_ssbo.c \
 	nir_lower_bitmap.c \
+	nir_lower_blend.c \
 	nir_lower_bool_to_bitsize.c \
 	nir_lower_bool_to_float.c \
 	nir_lower_bool_to_int32.c \
-	nir_lower_cl_images_to_tex.c \
 	nir_lower_clamp_color_outputs.c \
 	nir_lower_clip.c \
 	nir_lower_clip_cull_distance_arrays.c \
@@ -57,6 +57,7 @@ SRCS=	nir.c \
 	nir_lower_load_const_to_scalar.c \
 	nir_lower_locals_to_regs.c \
 	nir_lower_idiv.c \
+	nir_lower_image.c \
 	nir_lower_indirect_derefs.c \
 	nir_lower_input_attachments.c \
 	nir_lower_int64.c \
@@ -67,6 +68,7 @@ SRCS=	nir.c \
 	nir_lower_io_to_temporaries.c \
 	nir_lower_io_to_scalar.c \
 	nir_lower_io_to_vector.c \
+	nir_lower_is_helper_invocation.c \
 	nir_lower_multiview.c \
 	nir_lower_mediump.c \
 	nir_lower_memcpy.c \
@@ -81,9 +83,11 @@ SRCS=	nir.c \
 	nir_lower_point_size_mov.c \
 	nir_lower_printf.c \
 	nir_lower_regs_to_ssa.c \
+	nir_lower_readonly_images_to_tex.c \
 	nir_lower_returns.c \
 	nir_lower_samplers.c \
 	nir_lower_scratch.c \
+	nir_lower_shader_calls.c \
 	nir_lower_ssbo.c \
 	nir_lower_subgroups.c \
 	nir_lower_system_values.c \
@@ -103,6 +107,7 @@ SRCS=	nir.c \
 	nir_lower_bit_size.c \
 	nir_lower_ubo_vec4.c \
 	nir_lower_uniforms_to_ubo.c \
+	nir_lower_sysvals_to_varyings.c \
 	nir_metadata.c \
 	nir_move_vec_src_uses_to_dest.c \
 	nir_normalize_cubemap_coords.c \
@@ -119,6 +124,7 @@ SRCS=	nir.c \
 	nir_opt_dead_cf.c \
 	nir_opt_dead_write_vars.c \
 	nir_opt_find_array_copies.c \
+	nir_opt_fragdepth.c \
 	nir_opt_gcm.c \
 	nir_opt_idiv_const.c \
 	nir_opt_if.c \
@@ -128,8 +134,10 @@ SRCS=	nir.c \
 	nir_opt_loop_unroll.c \
 	nir_opt_memcpy.c \
 	nir_opt_move.c \
+	nir_opt_move_discards_to_top.c \
 	nir_opt_offsets.c \
 	nir_opt_peephole_select.c \
+	nir_opt_phi_precision.c \
 	nir_opt_rematerialize_compares.c \
 	nir_opt_remove_phis.c \
 	nir_opt_shrink_vectors.c \
diff --git a/lib/mesa/mk/libr600/Makefile b/lib/mesa/mk/libr600/Makefile
index 78330071e..9d74c899d 100644
--- a/lib/mesa/mk/libr600/Makefile
+++ b/lib/mesa/mk/libr600/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.3 2021/07/22 11:10:12 jsg Exp $
+#	$OpenBSD: Makefile,v 1.4 2022/02/24 02:29:49 jsg Exp $
 
 LIB=	r600
 
@@ -81,7 +81,9 @@ SRCS=	compute_memory_pool.c \
 	sfn_ir_to_assembly.cpp \
 	sfn_liverange.cpp \
 	sfn_nir.cpp \
+	sfn_nir_legalize_image_load_store.cpp \
 	sfn_nir_lower_64bit.cpp \
+	sfn_nir_lower_alu.cpp \
 	sfn_nir_lower_fs_out_to_vector.cpp \
 	sfn_nir_lower_tess_io.cpp \
 	sfn_nir_vectorize_vs_inputs.c \
@@ -98,8 +100,6 @@ SRCS=	compute_memory_pool.c \
 	sfn_valuepool.cpp \
 	sfn_vertexstageexport.cpp
 
-SRCS+=	sfn_nir_algebraic.c
-
 .include "../Makefile.inc"
 
 CFLAGS+=	${C_VIS_ARGS}
diff --git a/lib/mesa/mk/libradeonsi/Makefile b/lib/mesa/mk/libradeonsi/Makefile
index 3e1cd6936..e8255d64a 100644
--- a/lib/mesa/mk/libradeonsi/Makefile
+++ b/lib/mesa/mk/libradeonsi/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.2 2021/07/22 11:10:12 jsg Exp $
+#	$OpenBSD: Makefile,v 1.3 2022/02/24 02:29:49 jsg Exp $
 
 LIB=	radeonsi
 
@@ -10,7 +10,6 @@ SRCS=	gfx10_query.c \
 	si_buffer.c \
 	si_clear.c \
 	si_compute.c \
-	si_compute_prim_discard.c \
 	si_compute_blit.c \
 	si_cp_dma.c \
 	si_cp_reg_shadowing.c \
@@ -24,6 +23,8 @@ SRCS=	gfx10_query.c \
 	si_pipe.c \
 	si_pm4.c \
 	si_query.c \
+	si_nir_optim.c \
+	si_sdma_copy_image.c \
 	si_shader.c \
 	si_shader_llvm.c \
 	si_shader_llvm_gs.c \
@@ -37,7 +38,6 @@ SRCS=	gfx10_query.c \
 	si_sqtt.c \
 	si_state.c \
 	si_state_binning.c \
-	si_state_draw.cpp \
 	si_state_msaa.c \
 	si_state_shaders.c \
 	si_state_streamout.c \
diff --git a/lib/mesa/mk/libvulkan_radeon/Makefile b/lib/mesa/mk/libvulkan_radeon/Makefile
index 1d6524faf..7dc767f12 100644
--- a/lib/mesa/mk/libvulkan_radeon/Makefile
+++ b/lib/mesa/mk/libvulkan_radeon/Makefile
@@ -1,13 +1,15 @@
-#	$OpenBSD: Makefile,v 1.5 2021/07/22 11:10:12 jsg Exp $
+#	$OpenBSD: Makefile,v 1.6 2022/02/24 02:29:49 jsg Exp $
 
 LIB=	vulkan_radeon
 
 NOPROFILE=
 
-SRCS=	radv_sqtt_layer.c \
+SRCS=	radv_metro_exodus.c \
+	radv_sqtt_layer.c \
 	radv_null_bo.c \
 	radv_null_cs.c \
 	radv_null_winsys.c \
+	radv_acceleration_structure.c \
 	radv_android.c \
 	radv_cmd_buffer.c \
 	radv_debug.c \
@@ -15,7 +17,6 @@ SRCS=	radv_sqtt_layer.c \
 	radv_descriptor_set.c \
 	radv_formats.c \
 	radv_image.c \
-	radv_llvm_helper.cpp \
 	radv_meta.c \
 	radv_meta_blit.c \
 	radv_meta_blit2d.c \
@@ -32,10 +33,10 @@ SRCS=	radv_sqtt_layer.c \
 	radv_meta_resolve_cs.c \
 	radv_meta_resolve_fs.c \
 	radv_nir_lower_ycbcr_textures.c \
-	radv_nir_to_llvm.c \
 	radv_pass.c \
 	radv_pipeline.c \
 	radv_pipeline_cache.c \
+	radv_pipeline_rt.c \
 	radv_shader.c \
 	radv_shader_args.c \
 	radv_shader_info.c \
@@ -50,6 +51,10 @@ SRCS+=	radv_amdgpu_bo.c \
 	radv_amdgpu_surface.c \
 	radv_amdgpu_winsys.c
 
+# with_llvm
+SRCS+=	radv_llvm_helper.cpp \
+	radv_nir_to_llvm.c
+
 SRCS+=	radv_entrypoints.c
 
 .include "../Makefile.inc"
diff --git a/lib/mesa/mk/libvulkan_util/Makefile b/lib/mesa/mk/libvulkan_util/Makefile
index 1dc6db823..ad010edda 100644
--- a/lib/mesa/mk/libvulkan_util/Makefile
+++ b/lib/mesa/mk/libvulkan_util/Makefile
@@ -1,33 +1,44 @@
-#	$OpenBSD: Makefile,v 1.2 2021/07/22 11:10:12 jsg Exp $
+#	$OpenBSD: Makefile,v 1.3 2022/02/24 02:29:49 jsg Exp $
 
 LIB=	vulkan_util
 
 NOPROFILE=
 
-SRCS=	vk_cmd_copy.c \
+SRCS=	vk_alloc.c \
+	vk_cmd_copy.c \
+	vk_command_buffer.c \
 	vk_debug_report.c \
+	vk_debug_utils.c \
 	vk_deferred_operation.c \
 	vk_descriptors.c \
 	vk_device.c \
 	vk_format.c \
+	vk_image.c \
 	vk_instance.c \
+	vk_log.c \
 	vk_object.c \
 	vk_physical_device.c \
+	vk_queue.c \
 	vk_render_pass.c \
 	vk_shader_module.c \
+	vk_synchronization2.c \
 	vk_util.c
 
-SRCS+=	vk_common_entrypoints.c \
+SRCS+=	vk_cmd_queue.c \
+	vk_common_entrypoints.c \
 	vk_dispatch_table.c \
 	vk_enum_to_str.c \
-	vk_extensions.c
+	vk_extensions.c \
+	vk_physical_device_features.c
 
 .include "../Makefile.inc"
 
 CFLAGS+=	${C_VIS_ARGS}
 CPPFLAGS+=	-I${MESA_SRC}/src/vulkan/util \
 		-I${MESA_SRC}/src/gallium/include \
+		-I${MESA_SRC}/src/util \
 		-I${MESA_SRC}/generated/src/vulkan/util \
+		-I${MESA_SRC}/generated/src/compiler/nir \
 		-DVK_USE_PLATFORM_XCB_KHR \
 		-DVK_USE_PLATFORM_XLIB_KHR \
 		-DVK_USE_PLATFORM_DISPLAY_KHR \
diff --git a/lib/mesa/mk/libvulkan_wsi/Makefile b/lib/mesa/mk/libvulkan_wsi/Makefile
index b6be79818..63615a23f 100644
--- a/lib/mesa/mk/libvulkan_wsi/Makefile
+++ b/lib/mesa/mk/libvulkan_wsi/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.2 2021/07/22 11:10:12 jsg Exp $
+#	$OpenBSD: Makefile,v 1.3 2022/02/24 02:29:49 jsg Exp $
 
 LIB=	vulkan_wsi
 
@@ -9,12 +9,15 @@ SRCS=	wsi_common.c \
 	wsi_common_x11.c \
 	wsi_common_display.c
 
+SRCS+=	wsi_common_entrypoints.c
+
 .include "../Makefile.inc"
 
 CFLAGS+=	${C_VIS_ARGS}
 CPPFLAGS+=	-I${MESA_SRC}/src/vulkan/wsi \
 		-I${MESA_SRC}/src/vulkan/util \
 		-I${MESA_SRC}/generated/src/vulkan/util \
+		-I${MESA_SRC}/generated/src/vulkan/wsi \
 		-DVK_USE_PLATFORM_XCB_KHR \
 		-DVK_USE_PLATFORM_XLIB_KHR \
 		-DVK_USE_PLATFORM_DISPLAY_KHR \
@@ -28,3 +31,4 @@ obj: _xenocara_obj
 .include <bsd.xorg.mk>
 
 .PATH: ${MESA_SRC}/src/vulkan/wsi
+.PATH: ${MESA_SRC}/generated/src/vulkan/wsi