Merge Mesa 20.1.6

114 files changed, 5891 insertions, 0 deletions

diff --git a/lib/mesa/mk/Makefile b/lib/mesa/mk/Makefile
new file mode 100644
index 000000000..34f6db5d0
--- /dev/null
+++ b/lib/mesa/mk/Makefile
@@ -0,0 +1,107 @@
+#	$OpenBSD: Makefile,v 1.1 2020/08/26 06:02:36 jsg Exp $
+
+.include "config.mk"
+
+SUBDIR=		include pkgconfig \
+		libcompiler libdri libdricommon \
+		libgallium libgalliumvl \
+		libglapi_static libglcpp libglsl \
+		libloader libmegadriver_stub \
+		libmesa_classic libmesa_common libmesa_format \
+		libmesa_gallium libmesa_util \
+		libnir libpipe_loader_static libsoftpipe \
+		libswdri libswkmsdri \
+		libws_null libwsw libxmlconfig
+
+.if ${XENOCARA_BUILD_DRI3:L} == "yes" || make(obj)
+SUBDIR+=	libloader_dri3_helper
+.endif
+
+.if ${WITH_SSE41} == "yes" || make(obj)
+SUBDIR+=	libmesa_sse41
+.endif
+
+.if ${WITH_AMD_VK} == "yes" || ${WITH_GALLIUM_RADEONSI} == "yes" || make(obj)
+SUBDIR+=	libaddrlib libamd_common libamd_common_llvm libamdgpuwinsys
+.endif
+
+.if ${WITH_DRI_I965} == "yes" || ${WITH_GALLIUM_IRIS} == "yes" || \
+    ${WITH_INTEL_VK} == "yes" || make(obj)
+SUBDIR+=	libblorp libintel_common libintel_compiler libintel_dev \
+		libintel_perf libisl libisl_tiled_memcpy \
+		libisl_tiled_memcpy_sse41
+.for GEN in 40 50 60 70 75 80 90 100 110 120
+SUBDIR+=	libisl_gen${GEN}
+.endfor
+.endif
+
+.if ${WITH_GALLIUM_R300} == "yes" || ${WITH_GALLIUM_R600} == "yes" || \
+    ${WITH_GALLIUM_RADEONSI} == "yes" || make(obj)
+SUBDIR+=	libradeonwinsys
+.endif
+
+.if ${WITH_AMD_VK} == "yes" || ${WITH_INTEL_VK} == "yes" || make(obj)
+SUBDIR+=	libvulkan_util libvulkan_wsi
+.endif
+
+.if ${WITH_LLVM} == "yes" || make(obj)
+SUBDIR+=	libllvmpipe
+.endif
+
+.if ${WITH_AMD_VK} == "yes" || make(obj)
+SUBDIR+=	libaco
+SUBDIR+=	libvulkan_radeon
+.endif
+
+.if ${WITH_INTEL_VK} == "yes" || make(obj)
+SUBDIR+=	libanv_common 
+.for GEN in 70 75 80 90 100 110 120
+SUBDIR+=	libanv_gen${GEN}
+.endfor
+SUBDIR+=	libvulkan_intel
+.endif
+
+.if ${WITH_GALLIUM_IRIS} == "yes" || make(obj)
+SUBDIR+=	libiris libiriswinsys
+.for GEN in 80 90 100 110 120
+SUBDIR+=	libiris_gen${GEN}
+.endfor
+.endif
+
+.if ${WITH_DRI_I915} == "yes" || make(obj)
+SUBDIR+=	libi915
+.endif
+
+.if ${WITH_DRI_I965} == "yes" || make(obj)
+SUBDIR+=	libi965
+.for GEN in 40 45 50 60 70 75 80 90 100 110
+SUBDIR+=	libi965_gen${GEN}
+.endfor
+.endif
+
+.if ${WITH_DRI_R100} == "yes" || make(obj)
+SUBDIR+=	libr100
+.endif
+
+.if ${WITH_DRI_R200} == "yes" || make(obj)
+SUBDIR+=	libr200
+.endif
+
+.if ${WITH_GALLIUM_R300} == "yes" || make(obj)
+SUBDIR+=	libr300
+.endif
+
+.if ${WITH_GALLIUM_R600} == "yes" || make(obj)
+SUBDIR+=	libr600
+.endif
+
+.if ${WITH_GALLIUM_RADEONSI} == "yes" || make(obj)
+SUBDIR+=	libradeonsi
+.endif
+
+# installed libs
+SUBDIR+=	libglapi libgbm libEGL libGL libGLESv1_CM libGLESv2 libOSMesa
+
+SUBDIR+=	libmesa_dri_drivers libgallium_dri
+
+.include <bsd.subdir.mk>
diff --git a/lib/mesa/mk/Makefile.inc b/lib/mesa/mk/Makefile.inc
new file mode 100644
index 000000000..6f8113ff3
--- /dev/null
+++ b/lib/mesa/mk/Makefile.inc
@@ -0,0 +1,19 @@
+#	$OpenBSD: Makefile.inc,v 1.1 2020/08/26 06:02:36 jsg Exp $
+
+# bsd.lib.mk and bsd.xorg.mk both include Makefile.inc
+.if !defined(MESA_MK_INC)
+
+MESA_SRC?=	${.CURDIR}/../..
+
+MESA_V!=	cat ${MESA_SRC}/VERSION
+
+CPPFLAGS+=	-I${MESA_SRC}/include \
+		-I${MESA_SRC}/src \
+		-I${X11BASE}/include \
+		-I${X11BASE}/include/libdrm \
+		-DPACKAGE_VERSION=\"${MESA_V}\"
+
+.include "config.mk"
+
+.endif
+MESA_MK_INC=Done
diff --git a/lib/mesa/mk/config.mk b/lib/mesa/mk/config.mk
new file mode 100644
index 000000000..a52866e3b
--- /dev/null
+++ b/lib/mesa/mk/config.mk
@@ -0,0 +1,190 @@
+.include <bsd.xconf.mk>
+.include <bsd.own.mk>
+
+CFLAGS+= \
+	-std=c99 \
+	-Wall \
+	-Winvalid-pch \
+	-Werror=empty-body \
+	-Werror=implicit-function-declaration \
+	-Werror=incompatible-pointer-types \
+	-Werror=int-conversion \
+	-Werror=missing-prototypes \
+	-Werror=return-type \
+	-Wno-missing-field-initializers \
+	-fno-math-errno \
+	-fno-trapping-math \
+	-fno-common \
+	-Werror=format \
+	-Wformat-security \
+	-Qunused-arguments
+
+CXXFLAGS+= \
+	-std=c++14 \
+	-Wall \
+	-Winvalid-pch \
+	-Werror=empty-body \
+	-Werror=format \
+	-Werror=return-type \
+	-Wno-missing-field-initializers \
+	-Wno-non-virtual-dtor \
+	-fno-math-errno \
+	-fno-trapping-math \
+	-Wformat-security \
+	-Qunused-arguments
+
+.if ${COMPILER_VERSION:L} != "clang"
+CC=	clang
+CXX=	clang++
+.endif
+
+NO_OVERRIDE_INIT_ARGS= -Wno-override-init -Wno-initializer-overrides
+C_VIS_ARGS= -fvisibility=hidden
+CXX_VIS_ARGS= -fvisibility=hidden
+
+C_SSE2_ARGS= -msse2 -mstackrealign
+
+.if ${MACHINE_ARCH} == "i386"
+SSE41_ARGS= -msse4.1 -mstackrealign
+.elif ${MACHINE_ARCH} == "amd64"
+SSE41_ARGS= -msse4.1
+.endif
+
+CPPFLAGS+= \
+	-DENABLE_SHADER_CACHE \
+	-DENABLE_ST_OMX_BELLAGIO=0 \
+	-DENABLE_ST_OMX_TIZONIA=0 \
+	-DETIME=ETIMEDOUT \
+	-DGLX_DIRECT_RENDERING \
+	-DGLX_INDIRECT_RENDERING \
+	-DGLX_USE_DRM \
+	-DHAVE_ARC4RANDOM_BUF \
+	-DHAVE_DIRENT_D_TYPE \
+	-DHAVE_DLADDR \
+	-DHAVE_DLFCN_H \
+	-DHAVE_DL_ITERATE_PHDR \
+	-DHAVE_DRM_PLATFORM \
+	-DHAVE_ENDIAN_H \
+	-DHAVE_FLOCK \
+	-DHAVE_FUNC_ATTRIBUTE_ALIAS \
+	-DHAVE_FUNC_ATTRIBUTE_CONST \
+	-DHAVE_FUNC_ATTRIBUTE_FLATTEN \
+	-DHAVE_FUNC_ATTRIBUTE_FORMAT \
+	-DHAVE_FUNC_ATTRIBUTE_MALLOC \
+	-DHAVE_FUNC_ATTRIBUTE_NORETURN \
+	-DHAVE_FUNC_ATTRIBUTE_PACKED \
+	-DHAVE_FUNC_ATTRIBUTE_PURE \
+	-DHAVE_FUNC_ATTRIBUTE_RETURNS_NONNULL \
+	-DHAVE_FUNC_ATTRIBUTE_UNUSED \
+	-DHAVE_FUNC_ATTRIBUTE_VISIBILITY \
+	-DHAVE_FUNC_ATTRIBUTE_WARN_UNUSED_RESULT \
+	-DHAVE_FUNC_ATTRIBUTE_WEAK \
+	-DHAVE_LIBDRM \
+	-DHAVE_MKOSTEMP \
+	-DHAVE_POSIX_MEMALIGN \
+	-DHAVE_PTHREAD \
+	-DHAVE_STRTOF \
+	-DHAVE_STRTOK_R \
+	-DHAVE_SYS_SHM_H \
+	-DHAVE_SYS_SYSCTL_H \
+	-DHAVE_TIMESPEC_GET \
+	-DHAVE_X11_PLATFORM \
+	-DHAVE_ZLIB \
+	-DHAVE___BUILTIN_BSWAP32 \
+	-DHAVE___BUILTIN_BSWAP64 \
+	-DHAVE___BUILTIN_CLZ \
+	-DHAVE___BUILTIN_CLZLL \
+	-DHAVE___BUILTIN_CTZ \
+	-DHAVE___BUILTIN_EXPECT \
+	-DHAVE___BUILTIN_FFS \
+	-DHAVE___BUILTIN_FFSLL \
+	-DHAVE___BUILTIN_POPCOUNT \
+	-DHAVE___BUILTIN_POPCOUNTLL \
+	-DHAVE___BUILTIN_UNREACHABLE \
+	-DUSE_GCC_ATOMIC_BUILTINS \
+	-DPACKAGE_BUGREPORT=\"bugs@openbsd.org\" \
+	-D_FILE_OFFSET_BITS=64 \
+	-D_ISOC11_SOURCE \
+	-D__STDC_CONSTANT_MACROS \
+	-D__STDC_FORMAT_MACROS \
+	-D__STDC_LIMIT_MACROS
+
+.if ${XENOCARA_BUILD_DRI3:L} == "yes"
+CPPFLAGS+= \
+	-DHAVE_DRI3 \
+	-DHAVE_DRI3_MODIFIERS
+.endif
+
+.if ${LINKER_VERSION} == "lld"
+CPPFLAGS+= \
+	-DHAVE_LD_BUILD_ID
+WITH_LD_DYNAMIC_LIST=yes
+BUILD_ID_SHA1= -Wl,--build-id=sha1
+.else
+WITH_LD_DYNAMIC_LIST=no
+BUILD_ID_SHA1=
+.endif
+
+# __uint128_t only on LP64 archs
+.if ${MACHINE_ARCH} != "arm" && ${MACHINE_ARCH} != "i386" && \
+    ${MACHINE_ARCH} != "powerpc"
+CPPFLAGS+=	-DHAVE_UINT128
+.endif
+
+.if ${MACHINE_ARCH} == "i386"
+CPPFLAGS+=	-DUSE_X86_ASM -DUSE_MMX_ASM -DUSE_3DNOW_ASM -DUSE_SSE_ASM \
+		-DUSE_SSE41
+.elif ${MACHINE_ARCH} == "amd64"
+CPPFLAGS+=	-DUSE_X86_64_ASM -DUSE_SSE41
+.elif ${MACHINE_ARCH} == "arm"
+CPPFLAGS+=	-DUSE_ARM_ASM
+.elif ${MACHINE_ARCH} == "aarch64"
+CPPFLAGS+=	-DUSE_AARCH64_ASM
+.elif ${MACHINE_ARCH} == "sparc64"
+CPPFLAGS+=	-DUSE_SPARC_ASM
+.endif
+
+WITH_DRI_R100=no
+WITH_DRI_R200=no
+WITH_DRI_I915=no
+WITH_DRI_I965=no
+WITH_GALLIUM_R300=no
+WITH_GALLIUM_R600=no
+WITH_GALLIUM_RADEONSI=no
+WITH_GALLIUM_IRIS=no
+WITH_AMD_VK=no
+WITH_INTEL_VK=no
+WITH_SSE41=no
+
+WITH_DRI=yes
+WITH_GALLIUM_DRISW_KMS=yes
+WITH_GALLIUM_SOFTPIPE=yes
+
+WITH_LLVM=yes
+LLVM_V!=	llvm-config --version
+CPPFLAGS+=	-DLLVM_AVAILABLE \
+		-DMESA_LLVM_VERSION_STRING=\"${LLVM_V}\"
+
+.if ${MACHINE_ARCH} == "amd64" || ${MACHINE_ARCH} == "i386"
+WITH_SSE41=yes
+.endif
+
+.if ${MACHINE} == amd64 || ${MACHINE} == arm64 || ${MACHINE} == i386 || \
+    ${MACHINE} == loongson || ${MACHINE} == macppc || ${MACHINE} == sparc64
+WITH_DRI_R100=yes
+WITH_DRI_R200=yes
+WITH_GALLIUM_R300=yes
+WITH_GALLIUM_R600=yes
+.endif
+
+.if ${MACHINE} == "amd64" || ${MACHINE} == arm64 || ${MACHINE} == "i386"
+WITH_GALLIUM_RADEONSI=yes
+WITH_AMD_VK=yes
+.endif
+
+.if ${MACHINE} == "amd64" || ${MACHINE} == "i386"
+WITH_DRI_I915=yes
+WITH_DRI_I965=yes
+WITH_GALLIUM_IRIS=yes
+WITH_INTEL_VK=yes
+.endif
diff --git a/lib/mesa/mk/include/Makefile b/lib/mesa/mk/include/Makefile
new file mode 100644
index 000000000..204894d32
--- /dev/null
+++ b/lib/mesa/mk/include/Makefile
@@ -0,0 +1,74 @@
+#	$OpenBSD: Makefile,v 1.1 2020/08/26 06:02:36 jsg Exp $
+
+.include "../Makefile.inc"
+
+KHR_FILES=	khrplatform.h
+GLES_FILES=	egl.h \
+		gl.h \
+		glext.h \
+		glplatform.h
+GLES2_FILES=	gl2.h \
+		gl2ext.h \
+		gl2platform.h
+GLES3_FILES=	gl3.h \
+		gl31.h \
+		gl32.h \
+		gl3ext.h \
+		gl3platform.h
+GL_FILES=	gl.h \
+		glcorearb.h \
+		glext.h \
+		glx.h \
+		glxext.h \
+		osmesa.h \
+		internal/dri_interface.h
+EGL_FILES=	egl.h \
+		eglext.h \
+		eglplatform.h \
+		eglmesaext.h \
+		eglextchromium.h
+VULKAN_FILES=	vulkan_intel.h
+GBM_FILES=	gbm.h
+
+includes:
+	cd ${MESA_SRC}/include/KHR && for i in ${KHR_FILES}; do \
+	    cmp -s $$i ${DESTDIR}${X11BASE}/include/KHR/$$i || \
+	    ${INSTALL} ${INSTALL_COPY} -m 444 $$i ${DESTDIR}${X11BASE}/include/KHR/$$i; \
+	done
+	cd ${MESA_SRC}/include/GLES && for i in ${GLES_FILES}; do \
+	    cmp -s $$i ${DESTDIR}${X11BASE}/include/GLES/$$i || \
+	    ${INSTALL} ${INSTALL_COPY} -m 444 $$i ${DESTDIR}${X11BASE}/include/GLES/$$i; \
+	done
+	cd ${MESA_SRC}/include/GLES2 && for i in ${GLES2_FILES}; do \
+	    cmp -s $$i ${DESTDIR}${X11BASE}/include/GLES2/$$i || \
+	    ${INSTALL} ${INSTALL_COPY} -m 444 $$i ${DESTDIR}${X11BASE}/include/GLES2/$$i; \
+	done
+	cd ${MESA_SRC}/include/GLES3 && for i in ${GLES3_FILES}; do \
+	    cmp -s $$i ${DESTDIR}${X11BASE}/include/GLES3/$$i || \
+	    ${INSTALL} ${INSTALL_COPY} -m 444 $$i ${DESTDIR}${X11BASE}/include/GLES3/$$i; \
+	done
+	cd ${MESA_SRC}/include/GL && for i in ${GL_FILES}; do \
+	    cmp -s $$i ${DESTDIR}${X11BASE}/include/GL/$$i || \
+	    ${INSTALL} ${INSTALL_COPY} -m 444 $$i ${DESTDIR}${X11BASE}/include/GL/$$i; \
+	done
+	cd ${MESA_SRC}/include/EGL && for i in ${EGL_FILES}; do \
+	    cmp -s $$i ${DESTDIR}${X11BASE}/include/EGL/$$i || \
+	    ${INSTALL} ${INSTALL_COPY} -m 444 $$i ${DESTDIR}${X11BASE}/include/EGL/$$i; \
+	done
+.if ${WITH_INTEL_VK} == "yes"
+	cd ${MESA_SRC}/include/vulkan && for i in ${VULKAN_FILES}; do \
+	    cmp -s $$i ${DESTDIR}${X11BASE}/include/vulkan/$$i || \
+	    ${INSTALL} ${INSTALL_COPY} -m 444 $$i ${DESTDIR}${X11BASE}/include/vulkan/$$i; \
+	done
+.endif
+	cd ${MESA_SRC}/src/gbm/main && for i in ${GBM_FILES}; do \
+	    cmp -s $$i ${DESTDIR}${X11BASE}/include/$$i || \
+	    ${INSTALL} ${INSTALL_COPY} -m 444 $$i ${DESTDIR}${X11BASE}/include/$$i; \
+	done
+
+beforeinstall: includes
+
+obj: _xenocara_obj
+
+.include <bsd.prog.mk>
+.include <bsd.xorg.mk>
diff --git a/lib/mesa/mk/libEGL/Makefile b/lib/mesa/mk/libEGL/Makefile
new file mode 100644
index 000000000..a72dcbf72
--- /dev/null
+++ b/lib/mesa/mk/libEGL/Makefile
@@ -0,0 +1,66 @@
+#	$OpenBSD: Makefile,v 1.1 2020/08/26 06:02:36 jsg Exp $
+
+.include <bsd.xconf.mk>
+
+LIB=	EGL
+
+SRCS=	eglapi.c \
+	eglarray.c \
+	eglconfig.c \
+	eglcontext.c \
+	eglcurrent.c \
+	egldevice.c \
+	egldisplay.c \
+	egldriver.c \
+	eglglobals.c \
+	eglimage.c \
+	egllog.c \
+	eglsurface.c \
+	eglsync.c 
+
+.if ${XENOCARA_BUILD_DRI:L} == "yes"
+SRCS+=	egl_dri2.c \
+	platform_device.c \
+	platform_drm.c \
+	platform_x11.c
+.endif
+
+.if ${XENOCARA_BUILD_DRI3:L} == "yes"
+SRCS+=	platform_x11_dri3.c
+.endif
+
+.include "../Makefile.inc"
+
+CFLAGS+=	${C_VIS_ARGS}
+CPPFLAGS+=	-I${MESA_SRC}/src/egl/main \
+		-I${MESA_SRC}/src/loader \
+		-I${MESA_SRC}/src/gbm/main \
+		-I${MESA_SRC}/src/gbm/backends/dri \
+		-D_EGL_NATIVE_PLATFORM=_EGL_PLATFORM_X11
+
+LDADD+= ${.CURDIR}/../libmesa_util/${__objdir}/libmesa_util.a \
+	${.CURDIR}/../libmesa_format/${__objdir}/libmesa_format.a \
+	-lz -lm \
+	-L${X11BASE}/lib -lX11-xcb -lX11 -lxcb -lxcb-xfixes
+
+.if ${XENOCARA_BUILD_DRI:L} == "yes"
+LDADD+= ${.CURDIR}/../libloader/${__objdir}/libloader.a \
+	${.CURDIR}/../libxmlconfig/${__objdir}/libxmlconfig.a \
+	-ldrm -lxcb-dri2 -lexpat
+.endif
+
+.if ${XENOCARA_BUILD_DRI3:L} == "yes"
+LDADD+= ${.CURDIR}/../libloader_dri3_helper/${__objdir}/libloader_dri3_helper.a \
+	-lxcb-dri3 -lxcb-present -lxcb-sync -lxshmfence
+.endif
+
+LDADD+= -L${.CURDIR}/../libgbm/${__objdir} -lgbm \
+	-L${.CURDIR}/../libglapi/${__objdir} -lglapi
+
+obj: _xenocara_obj
+
+.include <bsd.lib.mk>
+.include <bsd.xorg.mk>
+
+.PATH:	${MESA_SRC}/src/egl/main
+.PATH:	${MESA_SRC}/src/egl/drivers/dri2
diff --git a/lib/mesa/mk/libEGL/shlib_version b/lib/mesa/mk/libEGL/shlib_version
new file mode 100644
index 000000000..893819d18
--- /dev/null
+++ b/lib/mesa/mk/libEGL/shlib_version
@@ -0,0 +1,2 @@
+major=1
+minor=1
diff --git a/lib/mesa/mk/libGL/Makefile b/lib/mesa/mk/libGL/Makefile
new file mode 100644
index 000000000..c5f6deee6
--- /dev/null
+++ b/lib/mesa/mk/libGL/Makefile
@@ -0,0 +1,89 @@
+#	$OpenBSD: Makefile,v 1.1 2020/08/26 06:02:36 jsg Exp $
+
+.include <bsd.xconf.mk>
+
+LIB=	GL
+
+SRCS=	clientattrib.c \
+	clientinfo.c \
+	compsize.c \
+	create_context.c \
+	dri_common.c \
+	dri_common_interop.c \
+	dri_common_query_renderer.c \
+	drisw_glx.c \
+	eval.c \
+	glx_error.c \
+	glx_pbuffer.c \
+	glx_query.c \
+	glxcmds.c \
+	glxconfig.c \
+	glxcurrent.c \
+	glxext.c \
+	glxextensions.c \
+	glxhash.c \
+	indirect_glx.c \
+	indirect_texture_compression.c \
+	indirect_transpose_matrix.c \
+	indirect_vertex_array.c \
+	indirect_vertex_program.c \
+	indirect_window_pos.c \
+	pixel.c \
+	pixelstore.c \
+	query_renderer.c \
+	render2.c \
+	renderpix.c \
+	single2.c \
+	singlepix.c \
+	vertarr.c \
+	xfont.c
+
+# generated
+SRCS+=	indirect.c \
+	indirect_init.c \
+	indirect_size.c
+
+.if ${XENOCARA_BUILD_DRI:L} == "yes"
+SRCS+=	dri2.c \
+	dri2_glx.c \
+	dri_glx.c \
+	XF86dri.c
+.endif
+
+.if ${XENOCARA_BUILD_DRI3:L} == "yes"
+SRCS+=	dri3_glx.c
+.endif
+
+.include "../Makefile.inc"
+
+CFLAGS+=	${C_VIS_ARGS}
+CPPFLAGS+=	-I${MESA_SRC}/src/glx \
+		-I${MESA_SRC}/src/loader \
+		-I${MESA_SRC}/src/mapi/glapi \
+		-I${MESA_SRC}/generated/src/mapi/glapi/gen
+
+LDADD+=	-L${X11BASE}/lib -lz -lexpat -lXdamage -lXfixes -lX11-xcb -lxcb-glx \
+	-lxcb-dri2 -lXxf86vm -lXext -lX11 -lxcb \
+	-ldrm -lm -lpthread -lXau -lXdmcp
+
+.if ${XENOCARA_BUILD_DRI3:L} == "yes"
+LDADD+=	-lxcb-dri3 -lxcb-xfixes -lxcb-present -lxcb-sync -lxshmfence
+.endif
+
+LDADD+=	-L${.CURDIR}/../libglapi/${__objdir} -lglapi \
+	${.CURDIR}/../libglapi_static/${__objdir}/libglapi_static.a \
+	${.CURDIR}/../libloader/${__objdir}/libloader.a \
+	${.CURDIR}/../libxmlconfig/${__objdir}/libxmlconfig.a \
+	${.CURDIR}/../libmesa_util/${__objdir}/libmesa_util.a
+
+.if ${XENOCARA_BUILD_DRI3:L} == "yes"
+LDADD+=	${.CURDIR}/../libloader_dri3_helper/${__objdir}/libloader_dri3_helper.a
+.endif
+
+obj: _xenocara_obj
+
+.include <bsd.lib.mk>
+.include <bsd.xorg.mk>
+
+.PATH:	${MESA_SRC}/src/glx
+.PATH:	${MESA_SRC}/generated/src/mapi/glapi/gen
diff --git a/lib/mesa/mk/libGL/shlib_version b/lib/mesa/mk/libGL/shlib_version
new file mode 100644
index 000000000..730231c38
--- /dev/null
+++ b/lib/mesa/mk/libGL/shlib_version
@@ -0,0 +1,2 @@
+major=17
+minor=1
diff --git a/lib/mesa/mk/libGLESv1_CM/Makefile b/lib/mesa/mk/libGLESv1_CM/Makefile
new file mode 100644
index 000000000..d85586b22
--- /dev/null
+++ b/lib/mesa/mk/libGLESv1_CM/Makefile
@@ -0,0 +1,21 @@
+#	$OpenBSD: Makefile,v 1.1 2020/08/26 06:02:36 jsg Exp $
+
+LIB=	GLESv1_CM
+
+SRCS=	entry.c
+
+.include "../Makefile.inc"
+
+CFLAGS+=	${C_VIS_ARGS}
+CPPFLAGS+=	-DMAPI_MODE_BRIDGE \
+		-DMAPI_ABI_HEADER=\"${MESA_SRC}/generated/src/mapi/es1api/glapi_mapi_tmp.h\"
+
+LDADD+= -L${.CURDIR}/../libglapi/${__objdir} -lglapi \
+	-L${X11BASE}/lib -ldrm -lm
+
+obj: _xenocara_obj
+
+.include <bsd.lib.mk>
+.include <bsd.xorg.mk>
+
+.PATH: ${MESA_SRC}/src/mapi
diff --git a/lib/mesa/mk/libGLESv1_CM/shlib_version b/lib/mesa/mk/libGLESv1_CM/shlib_version
new file mode 100644
index 000000000..b52599a16
--- /dev/null
+++ b/lib/mesa/mk/libGLESv1_CM/shlib_version
@@ -0,0 +1,2 @@
+major=2
+minor=0
diff --git a/lib/mesa/mk/libGLESv2/Makefile b/lib/mesa/mk/libGLESv2/Makefile
new file mode 100644
index 000000000..407b5122d
--- /dev/null
+++ b/lib/mesa/mk/libGLESv2/Makefile
@@ -0,0 +1,21 @@
+#	$OpenBSD: Makefile,v 1.1 2020/08/26 06:02:36 jsg Exp $
+
+LIB=	GLESv2
+
+SRCS=	entry.c
+
+.include "../Makefile.inc"
+
+CFLAGS+=	${C_VIS_ARGS}
+CPPFLAGS+=	-DMAPI_MODE_BRIDGE \
+		-DMAPI_ABI_HEADER=\"${MESA_SRC}/generated/src/mapi/es2api/glapi_mapi_tmp.h\"
+
+LDADD+= -L${.CURDIR}/../libglapi/${__objdir} -lglapi \
+	-L${X11BASE}/lib -ldrm -lm
+
+obj: _xenocara_obj
+
+.include <bsd.lib.mk>
+.include <bsd.xorg.mk>
+
+.PATH: ${MESA_SRC}/src/mapi
diff --git a/lib/mesa/mk/libGLESv2/shlib_version b/lib/mesa/mk/libGLESv2/shlib_version
new file mode 100644
index 000000000..b52599a16
--- /dev/null
+++ b/lib/mesa/mk/libGLESv2/shlib_version
@@ -0,0 +1,2 @@
+major=2
+minor=0
diff --git a/lib/mesa/mk/libOSMesa/Makefile b/lib/mesa/mk/libOSMesa/Makefile
new file mode 100644
index 000000000..971002918
--- /dev/null
+++ b/lib/mesa/mk/libOSMesa/Makefile
@@ -0,0 +1,26 @@
+#	$OpenBSD: Makefile,v 1.1 2020/08/26 06:02:36 jsg Exp $
+
+LIB=	OSMesa
+
+SRCS=	osmesa.c
+
+LDADD+=	${.CURDIR}/../libmesa_classic/${__objdir}/libmesa_classic.a \
+	-Wl,--whole-archive ${.CURDIR}/../libglapi_static/${__objdir}/libglapi_static.a \
+	-Wl,--no-whole-archive
+LDADD+= -L${.CURDIR}/../libglapi/${__objdir} -lglapi \
+	-lm -lz
+
+.include "../Makefile.inc"
+
+CFLAGS+=	${C_VIS_ARGS}
+CXXFLAGS+=	${CXX_VIS_ARGS}
+CPPFLAGS+=	-I${MESA_SRC}/src/mesa \
+		-I${MESA_SRC}/src/mapi \
+		-I${MESA_SRC}/generated/src/mapi/glapi
+
+obj: _xenocara_obj
+
+.include <bsd.lib.mk>
+.include <bsd.xorg.mk>
+
+.PATH:	${MESA_SRC}/src/mesa/drivers/osmesa
diff --git a/lib/mesa/mk/libOSMesa/shlib_version b/lib/mesa/mk/libOSMesa/shlib_version
new file mode 100644
index 000000000..f461c5339
--- /dev/null
+++ b/lib/mesa/mk/libOSMesa/shlib_version
@@ -0,0 +1,2 @@
+major=11
+minor=0
diff --git a/lib/mesa/mk/libaco/Makefile b/lib/mesa/mk/libaco/Makefile
new file mode 100644
index 000000000..bf5c771ac
--- /dev/null
+++ b/lib/mesa/mk/libaco/Makefile
@@ -0,0 +1,63 @@
+#	$OpenBSD: Makefile,v 1.1 2020/08/26 06:02:36 jsg Exp $
+
+LIB=	aco
+
+NOPROFILE=
+
+SRCS=	aco_dead_code_analysis.cpp \
+	aco_dominance.cpp \
+	aco_instruction_selection.cpp \
+	aco_instruction_selection_setup.cpp \
+	aco_interface.cpp \
+	aco_assembler.cpp \
+	aco_insert_exec_mask.cpp \
+	aco_insert_NOPs.cpp \
+	aco_insert_waitcnt.cpp \
+	aco_reduce_assign.cpp \
+	aco_register_allocation.cpp \
+	aco_live_var_analysis.cpp \
+	aco_lower_phis.cpp \
+	aco_lower_to_cssa.cpp \
+	aco_lower_to_hw_instr.cpp \
+	aco_optimizer.cpp \
+	aco_opt_value_numbering.cpp \
+	aco_print_asm.cpp \
+	aco_print_ir.cpp \
+	aco_scheduler.cpp \
+	aco_spill.cpp \
+	aco_ssa_elimination.cpp \
+	aco_statistics.cpp \
+	aco_validate.cpp
+
+SRCS+=	aco_opcodes.cpp
+
+.include "../Makefile.inc"
+
+CFLAGS+=	${C_VIS_ARGS}
+CXXFLAGS+=	${CXX_VIS_ARGS} ${PICFLAG}
+
+LLVM_CXXFLAGS!= llvm-config --cxxflags
+CXXFLAGS+=	${LLVM_CXXFLAGS}
+
+CPPFLAGS+=	-I${MESA_SRC}/src/gallium/include \
+		-I${MESA_SRC}/src/gallium/auxiliary \
+		-I${MESA_SRC}/src/amd \
+		-I${MESA_SRC}/src/amd/common \
+		-I${MESA_SRC}/src/amd/compiler \
+		-I${MESA_SRC}/src/amd/llvm \
+		-I${MESA_SRC}/src/compiler \
+		-I${MESA_SRC}/src/compiler/nir \
+		-I${MESA_SRC}/src/mesa \
+		-I${MESA_SRC}/generated/src/amd/common \
+		-I${MESA_SRC}/generated/src/amd/compiler \
+		-I${MESA_SRC}/generated/src/compiler/nir
+
+install:
+
+obj: _xenocara_obj
+
+.include <bsd.lib.mk>
+.include <bsd.xorg.mk>
+
+.PATH: ${MESA_SRC}/src/amd/compiler
+.PATH: ${MESA_SRC}/generated/src/amd/compiler
diff --git a/lib/mesa/mk/libaddrlib/Makefile b/lib/mesa/mk/libaddrlib/Makefile
new file mode 100644
index 000000000..467709bec
--- /dev/null
+++ b/lib/mesa/mk/libaddrlib/Makefile
@@ -0,0 +1,46 @@
+#	$OpenBSD: Makefile,v 1.1 2020/08/26 06:02:36 jsg Exp $
+
+LIB=	addrlib
+
+NOPROFILE=
+
+SRCS=	addrinterface.cpp \
+	addrelemlib.cpp \
+	addrlib.cpp \
+	addrlib1.cpp \
+	addrlib2.cpp \
+	addrobject.cpp \
+	coord.cpp \
+	gfx9addrlib.cpp \
+	gfx10addrlib.cpp \
+	ciaddrlib.cpp \
+	egbaddrlib.cpp \
+	siaddrlib.cpp
+
+.include "../Makefile.inc"
+
+CXXFLAGS+=	${CXX_VIS_ARGS}
+CPPFLAGS+=	-I${MESA_SRC}/src/gallium/include \
+		-I${MESA_SRC}/src/gallium/auxiliary \
+		-I${MESA_SRC}/src/amd/addrlib/inc \
+		-I${MESA_SRC}/src/amd/addrlib/src \
+		-I${MESA_SRC}/src/amd/addrlib/src/core \
+		-I${MESA_SRC}/src/amd/addrlib/src/gfx9 \
+		-I${MESA_SRC}/src/amd/addrlib/src/gfx10 \
+		-I${MESA_SRC}/src/amd/addrlib/src/r800 \
+		-I${MESA_SRC}/src/amd/addrlib/src/chip/gfx9 \
+		-I${MESA_SRC}/src/amd/addrlib/src/chip/gfx10 \
+		-I${MESA_SRC}/src/amd/addrlib/src/chip/r800
+
+install:
+
+obj: _xenocara_obj
+
+.include <bsd.lib.mk>
+.include <bsd.xorg.mk>
+
+.PATH: ${MESA_SRC}/src/amd/addrlib/src
+.PATH: ${MESA_SRC}/src/amd/addrlib/src/core
+.PATH: ${MESA_SRC}/src/amd/addrlib/src/gfx9
+.PATH: ${MESA_SRC}/src/amd/addrlib/src/gfx10
+.PATH: ${MESA_SRC}/src/amd/addrlib/src/r800
diff --git a/lib/mesa/mk/libamd_common/Makefile b/lib/mesa/mk/libamd_common/Makefile
new file mode 100644
index 000000000..dbaa0834f
--- /dev/null
+++ b/lib/mesa/mk/libamd_common/Makefile
@@ -0,0 +1,34 @@
+#	$OpenBSD: Makefile,v 1.1 2020/08/26 06:02:36 jsg Exp $
+
+LIB=	amd_common
+
+NOPROFILE=
+
+SRCS=	ac_binary.c \
+	ac_debug.c \
+	ac_gpu_info.c \
+	ac_rtld.c \
+	ac_shader_args.c \
+	ac_shader_util.c \
+	ac_surface.c
+
+.include "../Makefile.inc"
+
+CFLAGS+=	${C_VIS_ARGS}
+CXXFLAGS+=	${CXX_VIS_ARGS}
+CPPFLAGS+=	-I${MESA_SRC}/src/gallium/include \
+		-I${MESA_SRC}/src/gallium/auxiliary \
+		-I${MESA_SRC}/src/amd \
+		-I${MESA_SRC}/src/amd/common \
+		-I${MESA_SRC}/src/compiler \
+		-I${MESA_SRC}/generated/src/amd/common \
+		-I${MESA_SRC}/generated/src/compiler/nir
+
+install:
+
+obj: _xenocara_obj
+
+.include <bsd.lib.mk>
+.include <bsd.xorg.mk>
+
+.PATH: ${MESA_SRC}/src/amd/common
diff --git a/lib/mesa/mk/libamd_common_llvm/Makefile b/lib/mesa/mk/libamd_common_llvm/Makefile
new file mode 100644
index 000000000..0b22f825a
--- /dev/null
+++ b/lib/mesa/mk/libamd_common_llvm/Makefile
@@ -0,0 +1,37 @@
+#	$OpenBSD: Makefile,v 1.1 2020/08/26 06:02:36 jsg Exp $
+
+LIB=	amd_common_llvm
+
+NOPROFILE=
+
+SRCS=	ac_llvm_build.c \
+	ac_llvm_cull.c \
+	ac_llvm_helper.cpp \
+	ac_llvm_util.c \
+	ac_nir_to_llvm.c
+
+.include "../Makefile.inc"
+
+CFLAGS+=	${C_VIS_ARGS}
+CXXFLAGS+=	${CXX_VIS_ARGS}
+CPPFLAGS+=	-I${MESA_SRC}/src/gallium/include \
+		-I${MESA_SRC}/src/gallium/auxiliary \
+		-I${MESA_SRC}/src/amd \
+		-I${MESA_SRC}/src/amd/llvm \
+		-I${MESA_SRC}/src/amd/common \
+		-I${MESA_SRC}/src/mesa \
+		-I${MESA_SRC}/src/compiler \
+		-I${MESA_SRC}/generated/src/compiler/nir \
+		-I${MESA_SRC}/generated/src/amd/common
+
+LLVM_CXXFLAGS!= llvm-config --cxxflags
+CXXFLAGS+= ${LLVM_CXXFLAGS}
+
+install:
+
+obj: _xenocara_obj
+
+.include <bsd.lib.mk>
+.include <bsd.xorg.mk>
+
+.PATH: ${MESA_SRC}/src/amd/llvm
diff --git a/lib/mesa/mk/libamdgpuwinsys/Makefile b/lib/mesa/mk/libamdgpuwinsys/Makefile
new file mode 100644
index 000000000..9edcb9d6f
--- /dev/null
+++ b/lib/mesa/mk/libamdgpuwinsys/Makefile
@@ -0,0 +1,29 @@
+#	$OpenBSD: Makefile,v 1.1 2020/08/26 06:02:36 jsg Exp $
+
+LIB=	amdgpuwinsys
+
+NOPROFILE=
+
+SRCS=	amdgpu_bo.c \
+	amdgpu_cs.c \
+	amdgpu_surface.c \
+	amdgpu_winsys.c
+
+.include "../Makefile.inc"
+
+CFLAGS+=	${C_VIS_ARGS}
+CPPFLAGS+=	-I${MESA_SRC}/src/gallium/include \
+		-I${MESA_SRC}/src/gallium/auxiliary \
+		-I${MESA_SRC}/src/gallium/winsys/amdgpu/drm \
+		-I${MESA_SRC}/src/amd/common \
+		-I${MESA_SRC}/src/amd/llvm \
+		-I${MESA_SRC}/generated/src/amd/common
+
+install:
+
+obj: _xenocara_obj
+
+.include <bsd.lib.mk>
+.include <bsd.xorg.mk>
+
+.PATH: ${MESA_SRC}/src/gallium/winsys/amdgpu/drm
diff --git a/lib/mesa/mk/libanv_common/Makefile b/lib/mesa/mk/libanv_common/Makefile
new file mode 100644
index 000000000..118107973
--- /dev/null
+++ b/lib/mesa/mk/libanv_common/Makefile
@@ -0,0 +1,64 @@
+#	$OpenBSD: Makefile,v 1.1 2020/08/26 06:02:37 jsg Exp $
+
+LIB=	anv_common
+
+NOPROFILE=
+
+SRCS=	anv_allocator.c \
+	anv_batch_chain.c \
+	anv_blorp.c \
+	anv_cmd_buffer.c \
+	anv_descriptor_set.c \
+	anv_device.c \
+	anv_dump.c \
+	anv_formats.c \
+	anv_image.c \
+	anv_intel.c \
+	anv_nir_add_base_work_group_id.c \
+	anv_nir_apply_pipeline_layout.c \
+	anv_nir_compute_push_layout.c \
+	anv_nir_lower_multiview.c \
+	anv_nir_lower_ycbcr_textures.c \
+	anv_pass.c \
+	anv_perf.c \
+	anv_pipeline.c \
+	anv_pipeline_cache.c \
+	anv_queue.c \
+	anv_util.c \
+	anv_wsi.c
+
+SRCS+=	anv_entrypoints.c \
+	anv_extensions.c
+
+.include "../Makefile.inc"
+
+CFLAGS+=	${C_VIS_ARGS} ${NO_OVERRIDE_INIT_ARGS} ${C_SSE2_ARGS}
+CPPFLAGS+=	-I${MESA_SRC}/src/intel \
+		-I${MESA_SRC}/src/intel/vulkan \
+		-I${MESA_SRC}/src/mesa \
+		-I${MESA_SRC}/src/mapi \
+		-I${MESA_SRC}/src/gallium/include \
+		-I${MESA_SRC}/src/vulkan/util \
+		-I${MESA_SRC}/src/vulkan/wsi \
+		-I${MESA_SRC}/src/compiler \
+		-I${MESA_SRC}/src/compiler/nir \
+		-I${MESA_SRC}/generated/src \
+		-I${MESA_SRC}/generated/src/intel \
+		-I${MESA_SRC}/generated/src/intel/vulkan \
+		-I${MESA_SRC}/generated/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 \
+		-DVK_USE_PLATFORM_XLIB_XRANDR_EXT
+
+install:
+
+obj: _xenocara_obj
+
+.include <bsd.lib.mk>
+.include <bsd.xorg.mk>
+
+.PATH: ${MESA_SRC}/src/intel/vulkan
+.PATH: ${MESA_SRC}/generated/src/intel/vulkan
diff --git a/lib/mesa/mk/libanv_gen100/Makefile b/lib/mesa/mk/libanv_gen100/Makefile
new file mode 100644
index 000000000..7b16ad5cc
--- /dev/null
+++ b/lib/mesa/mk/libanv_gen100/Makefile
@@ -0,0 +1,49 @@
+#	$OpenBSD: Makefile,v 1.1 2020/08/26 06:02:37 jsg Exp $
+
+GEN=	100
+LIB=	anv_gen${GEN}
+
+NOPROFILE=
+
+SRCS=	genX_blorp_exec.c \
+	genX_cmd_buffer.c \
+	genX_gpu_memcpy.c \
+	genX_pipeline.c \
+	genX_query.c \
+	genX_state.c \
+
+SRCS+=	gen8_cmd_buffer.c
+
+.include "../Makefile.inc"
+
+CFLAGS+=	${C_VIS_ARGS} ${NO_OVERRIDE_INIT_ARGS} ${C_SSE2_ARGS}
+CPPFLAGS+=	-I${MESA_SRC}/src/intel \
+		-I${MESA_SRC}/src/intel/vulkan \
+		-I${MESA_SRC}/src/mesa \
+		-I${MESA_SRC}/src/mapi \
+		-I${MESA_SRC}/src/gallium/include \
+		-I${MESA_SRC}/src/vulkan/util \
+		-I${MESA_SRC}/src/vulkan/wsi \
+		-I${MESA_SRC}/src/compiler \
+		-I${MESA_SRC}/src/compiler/nir \
+		-I${MESA_SRC}/generated/src \
+		-I${MESA_SRC}/generated/src/intel \
+		-I${MESA_SRC}/generated/src/intel/vulkan \
+		-I${MESA_SRC}/generated/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 \
+		-DVK_USE_PLATFORM_XLIB_XRANDR_EXT \
+		-DGEN_VERSIONx10=${GEN}
+
+install:
+
+obj: _xenocara_obj
+
+.include <bsd.lib.mk>
+.include <bsd.xorg.mk>
+
+.PATH: ${MESA_SRC}/src/intel/vulkan
+.PATH: ${MESA_SRC}/generated/src/intel/vulkan
diff --git a/lib/mesa/mk/libanv_gen110/Makefile b/lib/mesa/mk/libanv_gen110/Makefile
new file mode 100644
index 000000000..8478ee122
--- /dev/null
+++ b/lib/mesa/mk/libanv_gen110/Makefile
@@ -0,0 +1,49 @@
+#	$OpenBSD: Makefile,v 1.1 2020/08/26 06:02:37 jsg Exp $
+
+GEN=	110
+LIB=	anv_gen${GEN}
+
+NOPROFILE=
+
+SRCS=	genX_blorp_exec.c \
+	genX_cmd_buffer.c \
+	genX_gpu_memcpy.c \
+	genX_pipeline.c \
+	genX_query.c \
+	genX_state.c \
+
+SRCS+=	gen8_cmd_buffer.c
+
+.include "../Makefile.inc"
+
+CFLAGS+=	${C_VIS_ARGS} ${NO_OVERRIDE_INIT_ARGS} ${C_SSE2_ARGS}
+CPPFLAGS+=	-I${MESA_SRC}/src/intel \
+		-I${MESA_SRC}/src/intel/vulkan \
+		-I${MESA_SRC}/src/mesa \
+		-I${MESA_SRC}/src/mapi \
+		-I${MESA_SRC}/src/gallium/include \
+		-I${MESA_SRC}/src/vulkan/util \
+		-I${MESA_SRC}/src/vulkan/wsi \
+		-I${MESA_SRC}/src/compiler \
+		-I${MESA_SRC}/src/compiler/nir \
+		-I${MESA_SRC}/generated/src \
+		-I${MESA_SRC}/generated/src/intel \
+		-I${MESA_SRC}/generated/src/intel/vulkan \
+		-I${MESA_SRC}/generated/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 \
+		-DVK_USE_PLATFORM_XLIB_XRANDR_EXT \
+		-DGEN_VERSIONx10=${GEN}
+
+install:
+
+obj: _xenocara_obj
+
+.include <bsd.lib.mk>
+.include <bsd.xorg.mk>
+
+.PATH: ${MESA_SRC}/src/intel/vulkan
+.PATH: ${MESA_SRC}/generated/src/intel/vulkan
diff --git a/lib/mesa/mk/libanv_gen120/Makefile b/lib/mesa/mk/libanv_gen120/Makefile
new file mode 100644
index 000000000..a2fc3a786
--- /dev/null
+++ b/lib/mesa/mk/libanv_gen120/Makefile
@@ -0,0 +1,49 @@
+#	$OpenBSD: Makefile,v 1.1 2020/08/26 06:02:37 jsg Exp $
+
+GEN=	120
+LIB=	anv_gen${GEN}
+
+NOPROFILE=
+
+SRCS=	genX_blorp_exec.c \
+	genX_cmd_buffer.c \
+	genX_gpu_memcpy.c \
+	genX_pipeline.c \
+	genX_query.c \
+	genX_state.c \
+
+SRCS+=	gen8_cmd_buffer.c
+
+.include "../Makefile.inc"
+
+CFLAGS+=	${C_VIS_ARGS} ${NO_OVERRIDE_INIT_ARGS} ${C_SSE2_ARGS}
+CPPFLAGS+=	-I${MESA_SRC}/src/intel \
+		-I${MESA_SRC}/src/intel/vulkan \
+		-I${MESA_SRC}/src/mesa \
+		-I${MESA_SRC}/src/mapi \
+		-I${MESA_SRC}/src/gallium/include \
+		-I${MESA_SRC}/src/vulkan/util \
+		-I${MESA_SRC}/src/vulkan/wsi \
+		-I${MESA_SRC}/src/compiler \
+		-I${MESA_SRC}/src/compiler/nir \
+		-I${MESA_SRC}/generated/src \
+		-I${MESA_SRC}/generated/src/intel \
+		-I${MESA_SRC}/generated/src/intel/vulkan \
+		-I${MESA_SRC}/generated/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 \
+		-DVK_USE_PLATFORM_XLIB_XRANDR_EXT \
+		-DGEN_VERSIONx10=${GEN}
+
+install:
+
+obj: _xenocara_obj
+
+.include <bsd.lib.mk>
+.include <bsd.xorg.mk>
+
+.PATH: ${MESA_SRC}/src/intel/vulkan
+.PATH: ${MESA_SRC}/generated/src/intel/vulkan
diff --git a/lib/mesa/mk/libanv_gen70/Makefile b/lib/mesa/mk/libanv_gen70/Makefile
new file mode 100644
index 000000000..5038fe9c0
--- /dev/null
+++ b/lib/mesa/mk/libanv_gen70/Makefile
@@ -0,0 +1,49 @@
+#	$OpenBSD: Makefile,v 1.1 2020/08/26 06:02:37 jsg Exp $
+
+GEN=	70
+LIB=	anv_gen${GEN}
+
+NOPROFILE=
+
+SRCS=	genX_blorp_exec.c \
+	genX_cmd_buffer.c \
+	genX_gpu_memcpy.c \
+	genX_pipeline.c \
+	genX_query.c \
+	genX_state.c \
+
+SRCS+=	gen7_cmd_buffer.c
+
+.include "../Makefile.inc"
+
+CFLAGS+=	${C_VIS_ARGS} ${NO_OVERRIDE_INIT_ARGS} ${C_SSE2_ARGS}
+CPPFLAGS+=	-I${MESA_SRC}/src/intel \
+		-I${MESA_SRC}/src/intel/vulkan \
+		-I${MESA_SRC}/src/mesa \
+		-I${MESA_SRC}/src/mapi \
+		-I${MESA_SRC}/src/gallium/include \
+		-I${MESA_SRC}/src/vulkan/util \
+		-I${MESA_SRC}/src/vulkan/wsi \
+		-I${MESA_SRC}/src/compiler \
+		-I${MESA_SRC}/src/compiler/nir \
+		-I${MESA_SRC}/generated/src \
+		-I${MESA_SRC}/generated/src/intel \
+		-I${MESA_SRC}/generated/src/intel/vulkan \
+		-I${MESA_SRC}/generated/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 \
+		-DVK_USE_PLATFORM_XLIB_XRANDR_EXT \
+		-DGEN_VERSIONx10=${GEN}
+
+install:
+
+obj: _xenocara_obj
+
+.include <bsd.lib.mk>
+.include <bsd.xorg.mk>
+
+.PATH: ${MESA_SRC}/src/intel/vulkan
+.PATH: ${MESA_SRC}/generated/src/intel/vulkan
diff --git a/lib/mesa/mk/libanv_gen75/Makefile b/lib/mesa/mk/libanv_gen75/Makefile
new file mode 100644
index 000000000..ac03111a0
--- /dev/null
+++ b/lib/mesa/mk/libanv_gen75/Makefile
@@ -0,0 +1,49 @@
+#	$OpenBSD: Makefile,v 1.1 2020/08/26 06:02:37 jsg Exp $
+
+GEN=	75
+LIB=	anv_gen${GEN}
+
+NOPROFILE=
+
+SRCS=	genX_blorp_exec.c \
+	genX_cmd_buffer.c \
+	genX_gpu_memcpy.c \
+	genX_pipeline.c \
+	genX_query.c \
+	genX_state.c \
+
+SRCS+=	gen7_cmd_buffer.c
+
+.include "../Makefile.inc"
+
+CFLAGS+=	${C_VIS_ARGS} ${NO_OVERRIDE_INIT_ARGS} ${C_SSE2_ARGS}
+CPPFLAGS+=	-I${MESA_SRC}/src/intel \
+		-I${MESA_SRC}/src/intel/vulkan \
+		-I${MESA_SRC}/src/mesa \
+		-I${MESA_SRC}/src/mapi \
+		-I${MESA_SRC}/src/gallium/include \
+		-I${MESA_SRC}/src/vulkan/util \
+		-I${MESA_SRC}/src/vulkan/wsi \
+		-I${MESA_SRC}/src/compiler \
+		-I${MESA_SRC}/src/compiler/nir \
+		-I${MESA_SRC}/generated/src \
+		-I${MESA_SRC}/generated/src/intel \
+		-I${MESA_SRC}/generated/src/intel/vulkan \
+		-I${MESA_SRC}/generated/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 \
+		-DVK_USE_PLATFORM_XLIB_XRANDR_EXT \
+		-DGEN_VERSIONx10=${GEN}
+
+install:
+
+obj: _xenocara_obj
+
+.include <bsd.lib.mk>
+.include <bsd.xorg.mk>
+
+.PATH: ${MESA_SRC}/src/intel/vulkan
+.PATH: ${MESA_SRC}/generated/src/intel/vulkan
diff --git a/lib/mesa/mk/libanv_gen80/Makefile b/lib/mesa/mk/libanv_gen80/Makefile
new file mode 100644
index 000000000..9048f76ce
--- /dev/null
+++ b/lib/mesa/mk/libanv_gen80/Makefile
@@ -0,0 +1,49 @@
+#	$OpenBSD: Makefile,v 1.1 2020/08/26 06:02:37 jsg Exp $
+
+GEN=	80
+LIB=	anv_gen${GEN}
+
+NOPROFILE=
+
+SRCS=	genX_blorp_exec.c \
+	genX_cmd_buffer.c \
+	genX_gpu_memcpy.c \
+	genX_pipeline.c \
+	genX_query.c \
+	genX_state.c \
+
+SRCS+=	gen8_cmd_buffer.c
+
+.include "../Makefile.inc"
+
+CFLAGS+=	${C_VIS_ARGS} ${NO_OVERRIDE_INIT_ARGS} ${C_SSE2_ARGS}
+CPPFLAGS+=	-I${MESA_SRC}/src/intel \
+		-I${MESA_SRC}/src/intel/vulkan \
+		-I${MESA_SRC}/src/mesa \
+		-I${MESA_SRC}/src/mapi \
+		-I${MESA_SRC}/src/gallium/include \
+		-I${MESA_SRC}/src/vulkan/util \
+		-I${MESA_SRC}/src/vulkan/wsi \
+		-I${MESA_SRC}/src/compiler \
+		-I${MESA_SRC}/src/compiler/nir \
+		-I${MESA_SRC}/generated/src \
+		-I${MESA_SRC}/generated/src/intel \
+		-I${MESA_SRC}/generated/src/intel/vulkan \
+		-I${MESA_SRC}/generated/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 \
+		-DVK_USE_PLATFORM_XLIB_XRANDR_EXT \
+		-DGEN_VERSIONx10=${GEN}
+
+install:
+
+obj: _xenocara_obj
+
+.include <bsd.lib.mk>
+.include <bsd.xorg.mk>
+
+.PATH: ${MESA_SRC}/src/intel/vulkan
+.PATH: ${MESA_SRC}/generated/src/intel/vulkan
diff --git a/lib/mesa/mk/libanv_gen90/Makefile b/lib/mesa/mk/libanv_gen90/Makefile
new file mode 100644
index 000000000..6626cb7c3
--- /dev/null
+++ b/lib/mesa/mk/libanv_gen90/Makefile
@@ -0,0 +1,49 @@
+#	$OpenBSD: Makefile,v 1.1 2020/08/26 06:02:37 jsg Exp $
+
+GEN=	90
+LIB=	anv_gen${GEN}
+
+NOPROFILE=
+
+SRCS=	genX_blorp_exec.c \
+	genX_cmd_buffer.c \
+	genX_gpu_memcpy.c \
+	genX_pipeline.c \
+	genX_query.c \
+	genX_state.c \
+
+SRCS+=	gen8_cmd_buffer.c
+
+.include "../Makefile.inc"
+
+CFLAGS+=	${C_VIS_ARGS} ${NO_OVERRIDE_INIT_ARGS} ${C_SSE2_ARGS}
+CPPFLAGS+=	-I${MESA_SRC}/src/intel \
+		-I${MESA_SRC}/src/intel/vulkan \
+		-I${MESA_SRC}/src/mesa \
+		-I${MESA_SRC}/src/mapi \
+		-I${MESA_SRC}/src/gallium/include \
+		-I${MESA_SRC}/src/vulkan/util \
+		-I${MESA_SRC}/src/vulkan/wsi \
+		-I${MESA_SRC}/src/compiler \
+		-I${MESA_SRC}/src/compiler/nir \
+		-I${MESA_SRC}/generated/src \
+		-I${MESA_SRC}/generated/src/intel \
+		-I${MESA_SRC}/generated/src/intel/vulkan \
+		-I${MESA_SRC}/generated/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 \
+		-DVK_USE_PLATFORM_XLIB_XRANDR_EXT \
+		-DGEN_VERSIONx10=${GEN}
+
+install:
+
+obj: _xenocara_obj
+
+.include <bsd.lib.mk>
+.include <bsd.xorg.mk>
+
+.PATH: ${MESA_SRC}/src/intel/vulkan
+.PATH: ${MESA_SRC}/generated/src/intel/vulkan
diff --git a/lib/mesa/mk/libblorp/Makefile b/lib/mesa/mk/libblorp/Makefile
new file mode 100644
index 000000000..d7f64fb0a
--- /dev/null
+++ b/lib/mesa/mk/libblorp/Makefile
@@ -0,0 +1,28 @@
+#	$OpenBSD: Makefile,v 1.1 2020/08/26 06:02:37 jsg Exp $
+
+LIB=	blorp
+
+NOPROFILE=
+
+SRCS=	blorp.c \
+	blorp_blit.c \
+	blorp_clear.c
+
+.include "../Makefile.inc"
+
+CFLAGS+=	${C_VIS_ARGS} ${NO_OVERRIDE_INIT_ARGS}
+CPPFLAGS+=	-I${MESA_SRC}/src/intel \
+		-I${MESA_SRC}/src/mesa \
+		-I${MESA_SRC}/src/mapi \
+		-I${MESA_SRC}/src/gallium/include \
+		-I${MESA_SRC}/generated/src/intel \
+		-I${MESA_SRC}/generated/src/compiler/nir
+
+install:
+
+obj: _xenocara_obj
+
+.include <bsd.lib.mk>
+.include <bsd.xorg.mk>
+
+.PATH: ${MESA_SRC}/src/intel/blorp
diff --git a/lib/mesa/mk/libcompiler/Makefile b/lib/mesa/mk/libcompiler/Makefile
new file mode 100644
index 000000000..7515c1cb7
--- /dev/null
+++ b/lib/mesa/mk/libcompiler/Makefile
@@ -0,0 +1,27 @@
+#	$OpenBSD: Makefile,v 1.1 2020/08/26 06:02:37 jsg Exp $
+
+LIB=	compiler
+
+NOPROFILE=
+
+SRCS=	glsl_types.cpp \
+	nir_types.cpp \
+	shader_enums.c
+
+.include "../Makefile.inc"
+
+CFLAGS+=	${C_VIS_ARGS} ${NO_OVERRIDE_INIT_ARGS}
+CXXFLAGS+=	${CXX_VIS_ARGS}
+CPPFLAGS+=	-I${MESA_SRC}/src/compiler \
+		-I${MESA_SRC}/src/mesa \
+		-I${MESA_SRC}/src/gallium/include \
+		-I${MESA_SRC}/generated/src/compiler
+
+install:
+
+obj: _xenocara_obj
+
+.include <bsd.lib.mk>
+.include <bsd.xorg.mk>
+
+.PATH:	${MESA_SRC}/src/compiler
diff --git a/lib/mesa/mk/libdri/Makefile b/lib/mesa/mk/libdri/Makefile
new file mode 100644
index 000000000..d525cc07e
--- /dev/null
+++ b/lib/mesa/mk/libdri/Makefile
@@ -0,0 +1,38 @@
+#	$OpenBSD: Makefile,v 1.1 2020/08/26 06:02:37 jsg Exp $
+
+.include <bsd.xconf.mk>
+
+LIB=	dri
+
+NOPROFILE=
+
+SRCS=	dri_context.c \
+	dri_drawable.c \
+	dri_helpers.c \
+	dri_query_renderer.c \
+	dri_screen.c
+
+.if ${XENOCARA_BUILD_DRI:L} == "yes"
+SRCS+=	drisw.c \
+	dri2.c
+.endif
+
+.include "../Makefile.inc"
+
+CFLAGS+=	${C_VIS_ARGS}
+CPPFLAGS+=	-DGALLIUM_SOFTPIPE \
+		-I${MESA_SRC}/src/gallium/state_trackers/dri \
+		-I${MESA_SRC}/src/mapi \
+		-I${MESA_SRC}/src/mesa \
+		-I${MESA_SRC}/src/mesa/drivers/dri/common \
+		-I${MESA_SRC}/src/gallium/include \
+		-I${MESA_SRC}/src/gallium/auxiliary
+
+install:
+
+obj: _xenocara_obj
+
+.include <bsd.lib.mk>
+.include <bsd.xorg.mk>
+
+.PATH: ${MESA_SRC}/src/gallium/state_trackers/dri
diff --git a/lib/mesa/mk/libdricommon/Makefile b/lib/mesa/mk/libdricommon/Makefile
new file mode 100644
index 000000000..328a37f4c
--- /dev/null
+++ b/lib/mesa/mk/libdricommon/Makefile
@@ -0,0 +1,25 @@
+#	$OpenBSD: Makefile,v 1.1 2020/08/26 06:02:37 jsg Exp $
+
+LIB=	dricommon
+
+NOPROFILE=
+
+SRCS=	utils.c \
+	dri_util.c
+
+.include "../Makefile.inc"
+
+CFLAGS+=	${C_VIS_ARGS}
+CPPFLAGS+=	-I${MESA_SRC}/src/mesa/drivers/dri/common \
+		-I${MESA_SRC}/src/mesa \
+		-I${MESA_SRC}/src/mapi \
+		-I${MESA_SRC}/generated/src/util
+
+install:
+
+obj: _xenocara_obj
+
+.include <bsd.lib.mk>
+.include <bsd.xorg.mk>
+
+.PATH:	${MESA_SRC}/src/mesa/drivers/dri/common
diff --git a/lib/mesa/mk/libgallium/Makefile b/lib/mesa/mk/libgallium/Makefile
new file mode 100644
index 000000000..70f66b1ba
--- /dev/null
+++ b/lib/mesa/mk/libgallium/Makefile
@@ -0,0 +1,290 @@
+#	$OpenBSD: Makefile,v 1.1 2020/08/26 06:02:37 jsg Exp $
+
+.include "../Makefile.inc"
+
+LIB=	gallium
+
+NOPROFILE=
+
+SRCS=	cso_cache.c \
+	cso_context.c \
+	cso_hash.c \
+	draw_context.c \
+	draw_fs.c \
+	draw_gs.c \
+	draw_pipe_aaline.c \
+	draw_pipe_aapoint.c \
+	draw_pipe.c \
+	draw_pipe_clip.c \
+	draw_pipe_cull.c \
+	draw_pipe_flatshade.c \
+	draw_pipe_offset.c \
+	draw_pipe_pstipple.c \
+	draw_pipe_stipple.c \
+	draw_pipe_twoside.c \
+	draw_pipe_unfilled.c \
+	draw_pipe_user_cull.c \
+	draw_pipe_util.c \
+	draw_pipe_validate.c \
+	draw_pipe_vbuf.c \
+	draw_pipe_wide_line.c \
+	draw_pipe_wide_point.c \
+	draw_prim_assembler.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 \
+	draw_pt_so_emit.c \
+	draw_pt_util.c \
+	draw_pt_vsplit.c \
+	draw_tess.c \
+	draw_vertex.c \
+	draw_vs.c \
+	draw_vs_exec.c \
+	draw_vs_variant.c \
+	dd_context.c \
+	dd_draw.c \
+	dd_screen.c \
+	noop_pipe.c \
+	noop_state.c \
+	driver_rbug_context.c \
+	driver_rbug_core.c \
+	rbug_objects.c \
+	rbug_screen.c \
+	tr_context.c \
+	tr_dump.c \
+	tr_dump_state.c \
+	tr_screen.c \
+	tr_texture.c \
+	font.c \
+	hud_context.c \
+	hud_cpu.c \
+	hud_nic.c \
+	hud_cpufreq.c \
+	hud_diskstat.c \
+	hud_sensors_temp.c \
+	hud_driver_query.c \
+	hud_fps.c \
+	u_primconvert.c \
+	os_process.c \
+	pb_buffer_fenced.c \
+	pb_bufmgr_cache.c \
+	pb_bufmgr_debug.c \
+	pb_bufmgr_mm.c \
+	pb_bufmgr_slab.c \
+	pb_cache.c \
+	pb_slab.c \
+	pb_validate.c \
+	pp_celshade.c \
+	pp_colors.c \
+	pp_init.c \
+	pp_mlaa.c \
+	pp_program.c \
+	pp_run.c \
+	rbug_connection.c \
+	rbug_context.c \
+	rbug_core.c \
+	rbug_demarshal.c \
+	rbug_shader.c \
+	rbug_texture.c \
+	rtasm_cpu.c \
+	rtasm_execmem.c \
+	rtasm_x86sse.c \
+	tgsi_aa_point.c \
+	tgsi_build.c \
+	tgsi_dump.c \
+	tgsi_exec.c \
+	tgsi_emulate.c \
+	tgsi_from_mesa.c \
+	tgsi_info.c \
+	tgsi_iterate.c \
+	tgsi_lowering.c \
+	tgsi_parse.c \
+	tgsi_point_sprite.c \
+	tgsi_sanity.c \
+	tgsi_scan.c \
+	tgsi_strings.c \
+	tgsi_text.c \
+	tgsi_transform.c \
+	tgsi_two_side.c \
+	tgsi_ureg.c \
+	tgsi_util.c \
+	translate.c \
+	translate_cache.c \
+	translate_generic.c \
+	translate_sse.c \
+	u_async_debug.c \
+	u_bitmask.c \
+	u_blit.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_debug_symbol.c \
+	u_dl.c \
+	u_draw.c \
+	u_draw_quad.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_idalloc.c \
+	u_index_modify.c \
+	u_linear.c \
+	u_live_shader_cache.c \
+	u_log.c \
+	u_network.c \
+	u_prim.c \
+	u_prim_restart.c \
+	u_pstipple.c \
+	u_resource.c \
+	u_sampler.c \
+	u_screen.c \
+	u_simple_shaders.c \
+	u_split_draw.c \
+	u_suballoc.c \
+	u_surface.c \
+	u_tests.c \
+	u_texture.c \
+	u_tile.c \
+	u_transfer.c \
+	u_transfer_helper.c \
+	u_threaded_context.c \
+	u_upload_mgr.c \
+	u_vbuf.c \
+	tgsi_to_nir.c \
+	nir_draw_helpers.c
+
+SRCS+=	u_debug_stack.c \
+	renderonly.c
+
+SRCS+=	u_indices_gen.c \
+	u_unfilled_gen.c
+
+.if ${WITH_LLVM} == "yes"
+SRCS+=	lp_bld_arit.c \
+	lp_bld_arit_overflow.c \
+	lp_bld_assert.c \
+	lp_bld_bitarit.c \
+	lp_bld_const.c \
+	lp_bld_conv.c \
+	lp_bld_coro.c \
+	lp_bld_debug.cpp \
+	lp_bld_flow.c \
+	lp_bld_format_aos_array.c \
+	lp_bld_format_aos.c \
+	lp_bld_format_float.c \
+	lp_bld_format_s3tc.c \
+	lp_bld_format.c \
+	lp_bld_format_soa.c \
+	lp_bld_format_srgb.c \
+	lp_bld_format_yuv.c \
+	lp_bld_gather.c \
+	lp_bld_init.c \
+	lp_bld_intr.c \
+	lp_bld_ir_common.c \
+	lp_bld_logic.c \
+	lp_bld_misc.cpp \
+	lp_bld_nir.c \
+	lp_bld_nir_soa.c \
+	lp_bld_pack.c \
+	lp_bld_printf.c \
+	lp_bld_quad.c \
+	lp_bld_sample_aos.c \
+	lp_bld_sample.c \
+	lp_bld_sample_soa.c \
+	lp_bld_struct.c \
+	lp_bld_swizzle.c \
+	lp_bld_tgsi_action.c \
+	lp_bld_tgsi_aos.c \
+	lp_bld_tgsi.c \
+	lp_bld_tgsi_info.c \
+	lp_bld_tgsi_soa.c \
+	lp_bld_type.c \
+	draw_llvm.c \
+	draw_llvm_sample.c \
+	draw_pt_fetch_shade_pipeline_llvm.c \
+	draw_vs_llvm.c \
+	tessellator.cpp \
+	p_tessellator.cpp \
+	nir_to_tgsi_info.c
+
+LLVM_CXXFLAGS!=	llvm-config --cxxflags
+CXXFLAGS+= ${LLVM_CXXFLAGS}
+
+.endif
+
+driver_rbug_context.c:
+	ln -s ${MESA_SRC}/src/gallium/auxiliary/driver_rbug/rbug_context.c $@
+
+driver_rbug_core.c:
+	ln -s ${MESA_SRC}/src/gallium/auxiliary/driver_rbug/rbug_core.c $@
+
+CLEANFILES+= driver_rbug_context.c driver_rbug_core.c
+
+CFLAGS+=	${C_VIS_ARGS}
+CXXFLAGS+=	${CXX_VIS_ARGS}
+CPPFLAGS+=	-I${MESA_SRC}/src/gallium/include \
+		-I${MESA_SRC}/src/gallium/auxiliary \
+		-I${MESA_SRC}/src/gallium/auxiliary/cso_cache \
+		-I${MESA_SRC}/src/gallium/auxiliary/draw \
+		-I${MESA_SRC}/src/gallium/auxiliary/driver_ddebug \
+		-I${MESA_SRC}/src/gallium/auxiliary/driver_noop \
+		-I${MESA_SRC}/src/gallium/auxiliary/driver_rbug \
+		-I${MESA_SRC}/src/gallium/auxiliary/driver_trace \
+		-I${MESA_SRC}/src/gallium/auxiliary/hud \
+		-I${MESA_SRC}/src/gallium/auxiliary/indices \
+		-I${MESA_SRC}/src/gallium/auxiliary/os \
+		-I${MESA_SRC}/src/gallium/auxiliary/pipebuffer \
+		-I${MESA_SRC}/src/gallium/auxiliary/postprocess \
+		-I${MESA_SRC}/src/gallium/auxiliary/rbug \
+		-I${MESA_SRC}/src/gallium/auxiliary/renderonly \
+		-I${MESA_SRC}/src/gallium/auxiliary/rtasm \
+		-I${MESA_SRC}/src/gallium/auxiliary/tgsi \
+		-I${MESA_SRC}/src/gallium/auxiliary/translate \
+		-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/compiler/nir
+#llvm
+CPPFLAGS+=	-I${MESA_SRC}/src/gallium/auxiliary/gallivm \
+		-I${MESA_SRC}/src/gallium/auxiliary/tessellator
+
+install:
+
+obj: _xenocara_obj
+
+.include <bsd.lib.mk>
+.include <bsd.xorg.mk>
+
+.PATH:	${MESA_SRC}/src/gallium/auxiliary/cso_cache
+.PATH:	${MESA_SRC}/src/gallium/auxiliary/draw
+.PATH:	${MESA_SRC}/src/gallium/auxiliary/rbug
+.PATH:	${MESA_SRC}/src/gallium/auxiliary/driver_ddebug
+.PATH:	${MESA_SRC}/src/gallium/auxiliary/driver_noop
+.PATH:	${MESA_SRC}/src/gallium/auxiliary/driver_rbug
+.PATH:	${MESA_SRC}/src/gallium/auxiliary/driver_trace
+.PATH:	${MESA_SRC}/src/gallium/auxiliary/hud
+.PATH:	${MESA_SRC}/src/gallium/auxiliary/indices
+.PATH:	${MESA_SRC}/src/gallium/auxiliary/os
+.PATH:	${MESA_SRC}/src/gallium/auxiliary/pipebuffer
+.PATH:	${MESA_SRC}/src/gallium/auxiliary/postprocess
+.PATH:	${MESA_SRC}/src/gallium/auxiliary/renderonly
+.PATH:	${MESA_SRC}/src/gallium/auxiliary/rtasm
+.PATH:	${MESA_SRC}/src/gallium/auxiliary/tgsi
+.PATH:	${MESA_SRC}/src/gallium/auxiliary/translate
+.PATH:	${MESA_SRC}/src/gallium/auxiliary/util
+.PATH:	${MESA_SRC}/src/gallium/auxiliary/nir
+.PATH:	${MESA_SRC}/generated/src/gallium/auxiliary
+# llvm
+.PATH:	${MESA_SRC}/src/gallium/auxiliary/gallivm
+.PATH:	${MESA_SRC}/src/gallium/auxiliary/tessellator
diff --git a/lib/mesa/mk/libgallium_dri/Makefile b/lib/mesa/mk/libgallium_dri/Makefile
new file mode 100644
index 000000000..ab2ca6376
--- /dev/null
+++ b/lib/mesa/mk/libgallium_dri/Makefile
@@ -0,0 +1,176 @@
+#	$OpenBSD: Makefile,v 1.1 2020/08/26 06:02:37 jsg Exp $
+
+LIB=	gallium_dri
+
+NOPROFILE=
+
+SRCS=	target.c
+
+GALLIUM_DRIVERS=	swrast kms_swrast
+
+.include "../Makefile.inc"
+
+CFLAGS+=	${C_VIS_ARGS}
+CXXFLAGS+=	${CXX_VIS_ARGS}
+CPPFLAGS+=	-I${MESA_SRC}/src/gallium/include \
+		-I${MESA_SRC}/src/gallium/auxiliary \
+		-I${MESA_SRC}/src/gallium/state_trackers/dri \
+		-I${MESA_SRC}/src/gallium/drivers \
+		-I${MESA_SRC}/src/gallium/winsys \
+		-I${MESA_SRC}/src/mesa \
+		-I${MESA_SRC}/src/mesa/drivers/dri/common \
+		-I${MESA_SRC}/generated/src/util \
+		-I${MESA_SRC}/generated/src/gallium/drivers \
+		-DGALLIUM_SOFTPIPE
+
+.if ${WITH_GALLIUM_R300} == "yes"
+GALLIUM_DRIVERS+=	r300
+CPPFLAGS+=	-DGALLIUM_R300
+.endif
+
+.if ${WITH_GALLIUM_R600} == "yes"
+GALLIUM_DRIVERS+=	r600
+CPPFLAGS+=	-DGALLIUM_R600
+.endif
+
+.if ${WITH_GALLIUM_RADEONSI} == "yes"
+GALLIUM_DRIVERS+=	radeonsi
+CPPFLAGS+=	-DGALLIUM_RADEONSI
+.endif
+
+.if ${WITH_GALLIUM_IRIS} == "yes"
+GALLIUM_DRIVERS+=	iris
+CPPFLAGS+=	-DGALLIUM_IRIS
+.endif
+
+.if ${WITH_LLVM} == "yes"
+CPPFLAGS+=	-DGALLIUM_LLVMPIPE
+.endif
+
+install:
+	${INSTALL} ${INSTALL_COPY} ${INSTALL_STRIP} \
+	    -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \
+	    lib${LIB}.so ${DESTDIR}${X11BASE}/lib/modules/dri
+.for driver in ${GALLIUM_DRIVERS}
+	ln -f ${DESTDIR}${X11BASE}/lib/modules/dri/lib${LIB}.so \
+	    ${DESTDIR}${X11BASE}/lib/modules/dri/${driver}_dri.so
+.endfor
+	rm ${DESTDIR}${X11BASE}/lib/modules/dri/lib${LIB}.so
+
+obj: _xenocara_obj
+
+.include <bsd.lib.mk>
+.include <bsd.xorg.mk>
+
+SLIBS=	libdri \
+	libmesa_gallium \
+	libmesa_common \
+	libglsl \
+	libglcpp \
+	libmesa_util \
+	libmesa_format \
+	libnir \
+	libcompiler \
+	libdricommon \
+	libmegadriver_stub \
+	libgalliumvl \
+	libgallium \
+	libpipe_loader_static \
+	libloader \
+	libxmlconfig \
+	libws_null \
+	libwsw \
+	libswdri \
+	libswkmsdri \
+	libsoftpipe
+
+.if ${WITH_SSE41} == "yes"
+SLIBS+=	libmesa_sse41
+.endif
+
+.if ${WITH_GALLIUM_R300} == "yes" || ${WITH_GALLIUM_R600} == "yes" || \
+    ${WITH_GALLIUM_RADEONSI} == "yes"
+SLIBS+=	libradeonwinsys
+.endif
+
+.if ${WITH_GALLIUM_R300} == "yes"
+SLIBS+=	libr300
+.endif
+
+.if ${WITH_GALLIUM_R600} == "yes"
+SLIBS+=	libr600
+.endif
+
+.if ${WITH_GALLIUM_RADEONSI} == "yes"
+SLIBS+= libamdgpuwinsys \
+	libaddrlib \
+	libamd_common \
+	libamd_common_llvm \
+	libradeonsi
+.endif
+
+.if ${WITH_GALLIUM_IRIS} == "yes"
+SLIBS+= libiris_gen80 \
+	libiris_gen90 \
+	libiris_gen100 \
+	libiris_gen110 \
+	libiris_gen120 \
+	libintel_compiler \
+	libintel_dev \
+	libisl \
+	libisl_gen40 \
+	libisl_gen50 \
+	libisl_gen60 \
+	libisl_gen70 \
+	libisl_gen75 \
+	libisl_gen80 \
+	libisl_gen90 \
+	libisl_gen100 \
+	libisl_gen110 \
+	libisl_gen120 \
+	libisl_tiled_memcpy \
+	libisl_tiled_memcpy_sse41 \
+	libblorp \
+	libintel_perf \
+	libintel_common \
+	libiris \
+	libiriswinsys
+.endif
+
+.if ${WITH_LLVM} == "yes"
+SLIBS+=	libllvmpipe
+.endif
+
+LDADD+=		-Wl,--as-needed -Wl,--allow-shlib-undefined -Wl,--start-group
+.for slib in ${SLIBS}
+LDADD+=		${.CURDIR}/../${slib}/${__objdir}/${slib}.a
+.endfor
+
+LDADD+=		-L${.CURDIR}/../libglapi/${__objdir} -lglapi
+LDADD+=		-lelf -lLLVM -lexpat -lz -lm
+LDADD+=		-L${X11BASE}/lib -ldrm
+
+.if ${WITH_GALLIUM_R300} == "yes" || ${WITH_GALLIUM_R600} == "yes"
+LDADD+=		-ldrm_radeon
+.endif
+
+.if ${WITH_GALLIUM_RADEONSI} == "yes"
+LDADD+=		-ldrm_amdgpu
+.endif
+
+LDADD+=		${BUILD_ID_SHA1} -Wl,--gc-sections \
+		-Wl,--version-script ${MESA_SRC}/src/gallium/targets/dri/dri.sym
+.if ${WITH_LD_DYNAMIC_LIST} == "yes"
+LDADD+=		-Wl,--dynamic-list ${MESA_SRC}/src/gallium/targets/dri-vdpau.dyn
+.endif
+LDADD+=		-Wl,--end-group
+
+all:	lib${LIB}.so
+
+lib${LIB}.so: ${SOBJS} ${DPADD}
+	${CXX} -shared -Wl,-soname,lib${LIB}.so ${PICFLAG} -o ${.TARGET} \
+	    `echo ${SOBJS} | tr ' ' '\n' | sort -R` ${LDADD}
+
+CLEANFILES+= lib${LIB}.so
+
+.PATH: ${MESA_SRC}/src/gallium/targets/dri
diff --git a/lib/mesa/mk/libgalliumvl/Makefile b/lib/mesa/mk/libgalliumvl/Makefile
new file mode 100644
index 000000000..c0267bd55
--- /dev/null
+++ b/lib/mesa/mk/libgalliumvl/Makefile
@@ -0,0 +1,39 @@
+#	$OpenBSD: Makefile,v 1.1 2020/08/26 06:02:37 jsg Exp $
+
+LIB=	galliumvl
+
+NOPROFILE=
+
+SRCS=	vl_bicubic_filter.c \
+	vl_compositor.c \
+	vl_compositor_cs.c \
+	vl_compositor_gfx.c \
+	vl_csc.c \
+	vl_decoder.c \
+	vl_deint_filter.c \
+	vl_idct.c \
+	vl_matrix_filter.c \
+	vl_mc.c \
+	vl_median_filter.c \
+	vl_mpeg12_bitstream.c \
+	vl_mpeg12_decoder.c \
+	vl_vertex_buffers.c \
+	vl_video_buffer.c \
+	vl_zscan.c
+
+.include "../Makefile.inc"
+
+CFLAGS+=	${C_VIS_ARGS}
+CXXFLAGS+=	${CXX_VIS_ARGS}
+CPPFLAGS+=	-I${MESA_SRC}/src/gallium/auxiliary/vl \
+		-I${MESA_SRC}/src/gallium/include \
+		-I${MESA_SRC}/src/gallium/auxiliary
+
+install:
+
+obj: _xenocara_obj
+
+.include <bsd.lib.mk>
+.include <bsd.xorg.mk>
+
+.PATH:	${MESA_SRC}/src/gallium/auxiliary/vl
diff --git a/lib/mesa/mk/libgbm/Makefile b/lib/mesa/mk/libgbm/Makefile
new file mode 100644
index 000000000..417af8ebb
--- /dev/null
+++ b/lib/mesa/mk/libgbm/Makefile
@@ -0,0 +1,36 @@
+#	$OpenBSD: Makefile,v 1.1 2020/08/26 06:02:37 jsg Exp $
+
+.include <bsd.xconf.mk>
+
+LIB=	gbm
+
+SRCS=	backend.c \
+	gbm.c
+
+.if ${XENOCARA_BUILD_DRI:L} == "yes"
+SRCS+=	gbm_dri.c
+.endif
+
+.include "../Makefile.inc"
+
+CFLAGS+=	${C_VIS_ARGS}
+CPPFLAGS+=	-I${MESA_SRC}/src/gbm/main \
+		-I${MESA_SRC}/src/gbm/backends/dri \
+		-I${MESA_SRC}/src/loader
+
+LDADD+= ${.CURDIR}/../libmesa_util/${__objdir}/libmesa_util.a \
+	${.CURDIR}/../libxmlconfig/${__objdir}/libxmlconfig.a \
+	${.CURDIR}/../libloader/${__objdir}/libloader.a \
+	-lz -lm -lexpat
+
+.if ${XENOCARA_BUILD_DRI:L} == "yes"
+LDADD+= -L${X11BASE}/lib -ldrm
+.endif
+
+obj: _xenocara_obj
+
+.include <bsd.lib.mk>
+.include <bsd.xorg.mk>
+
+.PATH:	${MESA_SRC}/src/gbm/main
+.PATH:	${MESA_SRC}/src/gbm/backends/dri
diff --git a/lib/mesa/mk/libgbm/shlib_version b/lib/mesa/mk/libgbm/shlib_version
new file mode 100644
index 000000000..a4a51c946
--- /dev/null
+++ b/lib/mesa/mk/libgbm/shlib_version
@@ -0,0 +1,2 @@
+major=0
+minor=4
diff --git a/lib/mesa/mk/libglapi/Makefile b/lib/mesa/mk/libglapi/Makefile
new file mode 100644
index 000000000..0fa0e1d3f
--- /dev/null
+++ b/lib/mesa/mk/libglapi/Makefile
@@ -0,0 +1,24 @@
+#	$OpenBSD: Makefile,v 1.1 2020/08/26 06:02:37 jsg Exp $
+
+LIB=	glapi
+
+SRCS=	entry.c \
+	mapi_glapi.c \
+	stub.c \
+	table.c
+
+SRCS+=	u_current.c \
+	u_execmem.c
+
+.include "../Makefile.inc"
+
+CFLAGS+=	${C_VIS_ARGS}
+CPPFLAGS+=	-DMAPI_MODE_GLAPI \
+		-DMAPI_ABI_HEADER=\"${MESA_SRC}/generated/src/mapi/shared-glapi/glapi_mapi_tmp.h\"
+
+obj: _xenocara_obj
+
+.include <bsd.lib.mk>
+.include <bsd.xorg.mk>
+
+.PATH: ${MESA_SRC}/src/mapi
diff --git a/lib/mesa/mk/libglapi/shlib_version b/lib/mesa/mk/libglapi/shlib_version
new file mode 100644
index 000000000..dea2b62ca
--- /dev/null
+++ b/lib/mesa/mk/libglapi/shlib_version
@@ -0,0 +1,2 @@
+major=0
+minor=2
diff --git a/lib/mesa/mk/libglapi_static/Makefile b/lib/mesa/mk/libglapi_static/Makefile
new file mode 100644
index 000000000..3b1ec8a5b
--- /dev/null
+++ b/lib/mesa/mk/libglapi_static/Makefile
@@ -0,0 +1,21 @@
+#	$OpenBSD: Makefile,v 1.1 2020/08/26 06:02:37 jsg Exp $
+
+LIB=	glapi_static
+
+NOPROFILE=
+
+SRCS=	entry.c
+
+.include "../Makefile.inc"
+
+CPPFLAGS+=	-DMAPI_MODE_BRIDGE \
+		-DMAPI_ABI_HEADER=\"${MESA_SRC}/generated/src/mapi/glapi/gen/glapi_mapi_tmp.h\"
+
+install:
+
+obj: _xenocara_obj
+
+.include <bsd.lib.mk>
+.include <bsd.xorg.mk>
+
+.PATH: ${MESA_SRC}/src/mapi
diff --git a/lib/mesa/mk/libglcpp/Makefile b/lib/mesa/mk/libglcpp/Makefile
new file mode 100644
index 000000000..835fdab63
--- /dev/null
+++ b/lib/mesa/mk/libglcpp/Makefile
@@ -0,0 +1,31 @@
+#	$OpenBSD: Makefile,v 1.1 2020/08/26 06:02:38 jsg Exp $
+
+LIB=	glcpp
+
+NOPROFILE=
+
+SRCS=	glcpp-lex.c \
+	glcpp-parse.c \
+	pp.c
+
+.include "../Makefile.inc"
+
+CFLAGS+=	${C_VIS_ARGS} ${NO_OVERRIDE_INIT_ARGS}
+CXXFLAGS+=	${CXX_VIS_FLAGS}
+CPPFLAGS+=	-I${MESA_SRC}/src/compiler/glsl/glcpp \
+		-I${MESA_SRC}/src/mesa \
+		-I${MESA_SRC}/src/mapi \
+		-I${MESA_SRC}/generated/src/compiler/glsl/glcpp
+
+install:
+
+obj: _xenocara_obj
+
+.include <bsd.lib.mk>
+.include <bsd.xorg.mk>
+
+.PATH:	${MESA_SRC}/src/compiler/glsl/glcpp
+.PATH:	${MESA_SRC}/generated/src/compiler/glsl/glcpp
+
+.SUFFIXES:
+.SUFFIXES: .o .c
diff --git a/lib/mesa/mk/libglsl/Makefile b/lib/mesa/mk/libglsl/Makefile
new file mode 100644
index 000000000..deeb803dd
--- /dev/null
+++ b/lib/mesa/mk/libglsl/Makefile
@@ -0,0 +1,152 @@
+#	$OpenBSD: Makefile,v 1.1 2020/08/26 06:02:38 jsg Exp $
+
+.include <bsd.xconf.mk>
+
+LIB=	glsl
+
+NOPROFILE=
+
+# files_libglsl
+SRCS=	ast_array_index.cpp \
+	ast_expr.cpp \
+	ast_function.cpp \
+	ast_to_hir.cpp \
+	ast_type.cpp \
+	builtin_functions.cpp \
+	builtin_types.cpp \
+	builtin_variables.cpp \
+	generate_ir.cpp \
+	gl_nir_lower_atomics.c \
+	gl_nir_lower_images.c \
+	gl_nir_lower_buffers.c \
+	gl_nir_lower_samplers.c \
+	gl_nir_lower_samplers_as_deref.c \
+	gl_nir_link_atomics.c \
+	gl_nir_link_uniform_blocks.c \
+	gl_nir_link_uniform_initializers.c \
+	gl_nir_link_uniforms.c \
+	gl_nir_link_xfb.c \
+	gl_nir_linker.c \
+	glsl_parser_extras.cpp \
+	glsl_symbol_table.cpp \
+	glsl_to_nir.cpp \
+	hir_field_selection.cpp \
+	ir_array_refcount.cpp \
+	ir_basic_block.cpp \
+	ir_builder.cpp \
+	ir_clone.cpp \
+	ir_constant_expression.cpp \
+	ir.cpp \
+	ir_equals.cpp \
+	ir_expression_flattening.cpp \
+	ir_function_can_inline.cpp \
+	ir_function_detect_recursion.cpp \
+	ir_function.cpp \
+	ir_hierarchical_visitor.cpp \
+	ir_hv_accept.cpp \
+	ir_print_visitor.cpp \
+	ir_reader.cpp \
+	ir_rvalue_visitor.cpp \
+	ir_set_program_inouts.cpp \
+	ir_validate.cpp \
+	ir_variable_refcount.cpp \
+	linker.cpp \
+	linker_util.cpp \
+	link_atomics.cpp \
+	link_functions.cpp \
+	link_interface_blocks.cpp \
+	link_uniforms.cpp \
+	link_uniform_initializers.cpp \
+	link_uniform_block_active_visitor.cpp \
+	link_uniform_blocks.cpp \
+	link_varyings.cpp \
+	loop_analysis.cpp \
+	loop_unroll.cpp \
+	lower_blend_equation_advanced.cpp \
+	lower_buffer_access.cpp \
+	lower_builtins.cpp \
+	lower_const_arrays_to_uniforms.cpp \
+	lower_cs_derived.cpp \
+	lower_discard.cpp \
+	lower_discard_flow.cpp \
+	lower_distance.cpp \
+	lower_if_to_cond_assign.cpp \
+	lower_instructions.cpp \
+	lower_int64.cpp \
+	lower_jumps.cpp \
+	lower_mat_op_to_vec.cpp \
+	lower_offset_array.cpp \
+	lower_packed_varyings.cpp \
+	lower_named_interface_blocks.cpp \
+	lower_packing_builtins.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 \
+	lower_vector.cpp \
+	lower_vector_derefs.cpp \
+	lower_vector_insert.cpp \
+	lower_vertex_id.cpp \
+	lower_output_reads.cpp \
+	lower_shared_reference.cpp \
+	lower_ubo_reference.cpp \
+	lower_xfb_varying.cpp \
+	opt_algebraic.cpp \
+	opt_array_splitting.cpp \
+	opt_conditional_discard.cpp \
+	opt_constant_folding.cpp \
+	opt_constant_propagation.cpp \
+	opt_constant_variable.cpp \
+	opt_copy_propagation_elements.cpp \
+	opt_dead_builtin_variables.cpp \
+	opt_dead_builtin_varyings.cpp \
+	opt_dead_code.cpp \
+	opt_dead_code_local.cpp \
+	opt_dead_functions.cpp \
+	opt_flatten_nested_if_blocks.cpp \
+	opt_flip_matrices.cpp \
+	opt_function_inlining.cpp \
+	opt_if_simplification.cpp \
+	opt_minmax.cpp \
+	opt_rebalance_tree.cpp \
+	opt_redundant_jumps.cpp \
+	opt_structure_splitting.cpp \
+	opt_swizzle.cpp \
+	opt_tree_grafting.cpp \
+	opt_vectorize.cpp \
+	propagate_invariance.cpp \
+	s_expression.cpp \
+	string_to_uint_map.cpp \
+	serialize.cpp \
+	shader_cache.cpp
+
+# glsl_parser, glsl_lexer_cpp
+SRCS+=	glsl_parser.cpp \
+	glsl_lexer.cpp
+
+.include "../Makefile.inc"
+
+CFLAGS+=	${C_VIS_ARGS} ${NO_OVERRIDE_INIT_ARGS}
+CXXFLAGS+=	${CXX_VIS_ARGS}
+CPPFLAGS+=	-I${MESA_SRC}/src/compiler \
+		-I${MESA_SRC}/src/compiler/glsl \
+		-I${MESA_SRC}/src/compiler/nir \
+		-I${MESA_SRC}/src/mesa \
+		-I${MESA_SRC}/src/gallium/include \
+		-I${MESA_SRC}/src/mapi \
+		-I${MESA_SRC}/generated/src/compiler \
+		-I${MESA_SRC}/generated/src/compiler/glsl \
+		-I${MESA_SRC}/generated/src/compiler/nir
+
+install:
+
+obj: _xenocara_obj
+
+.include <bsd.lib.mk>
+.include <bsd.xorg.mk>
+
+.PATH:	${MESA_SRC}/src/compiler/glsl
+.PATH:	${MESA_SRC}/generated/src/compiler/glsl
diff --git a/lib/mesa/mk/libi915/Makefile b/lib/mesa/mk/libi915/Makefile
new file mode 100644
index 000000000..e50485f7e
--- /dev/null
+++ b/lib/mesa/mk/libi915/Makefile
@@ -0,0 +1,64 @@
+#	$OpenBSD: Makefile,v 1.1 2020/08/26 06:02:38 jsg Exp $
+
+LIB=	i915
+
+NOPROFILE=
+
+SRCS=	i830_context.c \
+	i830_state.c \
+	i830_texblend.c \
+	i830_texstate.c \
+	i830_vtbl.c \
+	i915_context.c \
+	i915_debug_fp.c \
+	i915_fragprog.c \
+	i915_program.c \
+	i915_state.c \
+	i915_tex_layout.c \
+	i915_texstate.c \
+	i915_vtbl.c \
+	intel_batchbuffer.c \
+	intel_blit.c \
+	intel_buffer_objects.c \
+	intel_buffers.c \
+	intel_clear.c \
+	intel_context.c \
+	intel_extensions.c \
+	intel_fbo.c \
+	intel_mipmap_tree.c \
+	intel_pixel.c \
+	intel_pixel_bitmap.c \
+	intel_pixel_copy.c \
+	intel_pixel_draw.c \
+	intel_pixel_read.c \
+	intel_regions.c \
+	intel_render.c \
+	intel_screen.c \
+	intel_state.c \
+	intel_syncobj.c \
+	intel_tex.c \
+	intel_tex_copy.c \
+	intel_tex_image.c \
+	intel_tex_layout.c \
+	intel_tex_subimage.c \
+	intel_tex_validate.c \
+	intel_tris.c
+
+.include "../Makefile.inc"
+
+CFLAGS+=	${C_VIS_ARGS} ${NO_OVERRIDE_INIT_ARGS}
+CXXFLAGS+=	${CXX_VIS_ARGS}
+CPPFLAGS+=	-I${MESA_SRC}/src/mesa/drivers/dri/i915 \
+		-I${MESA_SRC}/src/mesa/drivers/dri/common \
+		-I${MESA_SRC}/src/mesa \
+		-I${MESA_SRC}/src/mapi \
+		-I${MESA_SRC}/generated/src/util
+
+install:
+
+obj: _xenocara_obj
+
+.include <bsd.lib.mk>
+.include <bsd.xorg.mk>
+
+.PATH: ${MESA_SRC}/src/mesa/drivers/dri/i915
diff --git a/lib/mesa/mk/libi965/Makefile b/lib/mesa/mk/libi965/Makefile
new file mode 100644
index 000000000..96d839cc9
--- /dev/null
+++ b/lib/mesa/mk/libi965/Makefile
@@ -0,0 +1,111 @@
+#	$OpenBSD: Makefile,v 1.1 2020/08/26 06:02:38 jsg Exp $
+
+LIB=	i965
+
+NOPROFILE=
+
+SRCS=	brw_binding_tables.c \
+	brw_blorp.c \
+	brw_bufmgr.c \
+	brw_clear.c \
+	brw_clip.c \
+	brw_compute.c \
+	brw_conditional_render.c \
+	brw_context.c \
+	brw_cs.c \
+	brw_curbe.c \
+	brw_disk_cache.c \
+	brw_draw.c \
+	brw_draw_upload.c \
+	brw_ff_gs.c \
+	brw_ff_gs_emit.c \
+	brw_formatquery.c \
+	brw_generate_mipmap.c \
+	brw_gs.c \
+	brw_gs_surface_state.c \
+	brw_link.cpp \
+	brw_meta_util.c \
+	brw_misc_state.c \
+	brw_nir_uniforms.cpp \
+	brw_object_purgeable.c \
+	brw_pipe_control.c \
+	brw_performance_query.c \
+	brw_program.c \
+	brw_program_binary.c \
+	brw_program_cache.c \
+	brw_primitive_restart.c \
+	brw_queryobj.c \
+	brw_reset.c \
+	brw_sf.c \
+	brw_state_upload.c \
+	brw_surface_formats.c \
+	brw_sync.c \
+	brw_tcs.c \
+	brw_tcs_surface_state.c \
+	brw_tes.c \
+	brw_tes_surface_state.c \
+	brw_urb.c \
+	brw_util.c \
+	brw_vs.c \
+	brw_vs_surface_state.c \
+	brw_wm.c \
+	brw_wm_surface_state.c \
+	gen6_clip_state.c \
+	gen6_constant_state.c \
+	gen6_multisample_state.c \
+	gen6_queryobj.c \
+	gen6_sampler_state.c \
+	gen6_sol.c \
+	gen6_urb.c \
+	gen7_l3_state.c \
+	gen7_sol_state.c \
+	gen7_urb.c \
+	gen8_depth_state.c \
+	gen8_multisample_state.c \
+	hsw_queryobj.c \
+	hsw_sol.c \
+	intel_batchbuffer.c \
+	intel_blit.c \
+	intel_buffer_objects.c \
+	intel_buffers.c \
+	intel_copy_image.c \
+	intel_extensions.c \
+	intel_fbo.c \
+	intel_mipmap_tree.c \
+	intel_pixel_bitmap.c \
+	intel_pixel.c \
+	intel_pixel_copy.c \
+	intel_pixel_draw.c \
+	intel_pixel_read.c \
+	intel_screen.c \
+	intel_state.c \
+	intel_tex.c \
+	intel_tex_copy.c \
+	intel_tex_image.c \
+	intel_tex_validate.c \
+	intel_upload.c
+
+.include "../Makefile.inc"
+
+CFLAGS+=	${C_VIS_ARGS} ${NO_OVERRIDE_INIT_ARGS} ${C_SSE2_ARGS}
+CXXFLAGS+=	${CXX_VIS_ARGS} ${C_SSE2_ARGS}
+CPPFLAGS+=	-I${MESA_SRC}/src/mesa/drivers/dri/i965 \
+		-I${MESA_SRC}/src/mesa/drivers/dri/common \
+		-I${MESA_SRC}/src/mesa \
+		-I${MESA_SRC}/src/mapi \
+		-I${MESA_SRC}/src/intel \
+		-I${MESA_SRC}/src/gallium/include \
+		-I${MESA_SRC}/src/compiler/nir \
+		-I${MESA_SRC}/generated/src/util \
+		-I${MESA_SRC}/generated/src/compiler \
+		-I${MESA_SRC}/generated/src/compiler/nir \
+		-I${MESA_SRC}/generated/src/intel
+
+install:
+
+obj: _xenocara_obj
+
+.include <bsd.lib.mk>
+.include <bsd.xorg.mk>
+
+.PATH: ${MESA_SRC}/src/mesa/drivers/dri/i965
diff --git a/lib/mesa/mk/libi965_gen100/Makefile b/lib/mesa/mk/libi965_gen100/Makefile
new file mode 100644
index 000000000..8844787d7
--- /dev/null
+++ b/lib/mesa/mk/libi965_gen100/Makefile
@@ -0,0 +1,32 @@
+#	$OpenBSD: Makefile,v 1.1 2020/08/26 06:02:38 jsg Exp $
+
+GEN=	100
+LIB=	i965_gen${GEN}
+
+NOPROFILE=
+
+SRCS=	genX_blorp_exec.c \
+	genX_pipe_control.c \
+	genX_state_upload.c
+
+.include "../Makefile.inc"
+
+CFLAGS+=	${C_VIS_ARGS} ${NO_OVERRIDE_INIT_ARGS} ${C_SSE2_ARGS}
+CPPFLAGS+=	-I${MESA_SRC}/src/mesa/drivers/dri/i965 \
+		-I${MESA_SRC}/src/mesa/drivers/dri/common \
+		-I${MESA_SRC}/src/mesa \
+		-I${MESA_SRC}/src/mapi \
+		-I${MESA_SRC}/src/intel \
+		-I${MESA_SRC}/src/gallium/include \
+		-I${MESA_SRC}/generated/src/compiler/nir \
+		-I${MESA_SRC}/generated/src/intel \
+		-DGEN_VERSIONx10=${GEN}
+
+install:
+
+obj: _xenocara_obj
+
+.include <bsd.lib.mk>
+.include <bsd.xorg.mk>
+
+.PATH: ${MESA_SRC}/src/mesa/drivers/dri/i965
diff --git a/lib/mesa/mk/libi965_gen110/Makefile b/lib/mesa/mk/libi965_gen110/Makefile
new file mode 100644
index 000000000..513a2400b
--- /dev/null
+++ b/lib/mesa/mk/libi965_gen110/Makefile
@@ -0,0 +1,32 @@
+#	$OpenBSD: Makefile,v 1.1 2020/08/26 06:02:38 jsg Exp $
+
+GEN=	110
+LIB=	i965_gen${GEN}
+
+NOPROFILE=
+
+SRCS=	genX_blorp_exec.c \
+	genX_pipe_control.c \
+	genX_state_upload.c
+
+.include "../Makefile.inc"
+
+CFLAGS+=	${C_VIS_ARGS} ${NO_OVERRIDE_INIT_ARGS} ${C_SSE2_ARGS}
+CPPFLAGS+=	-I${MESA_SRC}/src/mesa/drivers/dri/i965 \
+		-I${MESA_SRC}/src/mesa/drivers/dri/common \
+		-I${MESA_SRC}/src/mesa \
+		-I${MESA_SRC}/src/mapi \
+		-I${MESA_SRC}/src/intel \
+		-I${MESA_SRC}/src/gallium/include \
+		-I${MESA_SRC}/generated/src/compiler/nir \
+		-I${MESA_SRC}/generated/src/intel \
+		-DGEN_VERSIONx10=${GEN}
+
+install:
+
+obj: _xenocara_obj
+
+.include <bsd.lib.mk>
+.include <bsd.xorg.mk>
+
+.PATH: ${MESA_SRC}/src/mesa/drivers/dri/i965
diff --git a/lib/mesa/mk/libi965_gen40/Makefile b/lib/mesa/mk/libi965_gen40/Makefile
new file mode 100644
index 000000000..4fe5d7ce4
--- /dev/null
+++ b/lib/mesa/mk/libi965_gen40/Makefile
@@ -0,0 +1,32 @@
+#	$OpenBSD: Makefile,v 1.1 2020/08/26 06:02:38 jsg Exp $
+
+GEN=	40
+LIB=	i965_gen${GEN}
+
+NOPROFILE=
+
+SRCS=	genX_blorp_exec.c \
+	genX_pipe_control.c \
+	genX_state_upload.c
+
+.include "../Makefile.inc"
+
+CFLAGS+=	${C_VIS_ARGS} ${NO_OVERRIDE_INIT_ARGS} ${C_SSE2_ARGS}
+CPPFLAGS+=	-I${MESA_SRC}/src/mesa/drivers/dri/i965 \
+		-I${MESA_SRC}/src/mesa/drivers/dri/common \
+		-I${MESA_SRC}/src/mesa \
+		-I${MESA_SRC}/src/mapi \
+		-I${MESA_SRC}/src/intel \
+		-I${MESA_SRC}/src/gallium/include \
+		-I${MESA_SRC}/generated/src/compiler/nir \
+		-I${MESA_SRC}/generated/src/intel \
+		-DGEN_VERSIONx10=${GEN}
+
+install:
+
+obj: _xenocara_obj
+
+.include <bsd.lib.mk>
+.include <bsd.xorg.mk>
+
+.PATH: ${MESA_SRC}/src/mesa/drivers/dri/i965
diff --git a/lib/mesa/mk/libi965_gen45/Makefile b/lib/mesa/mk/libi965_gen45/Makefile
new file mode 100644
index 000000000..9318cf6ba
--- /dev/null
+++ b/lib/mesa/mk/libi965_gen45/Makefile
@@ -0,0 +1,32 @@
+#	$OpenBSD: Makefile,v 1.1 2020/08/26 06:02:38 jsg Exp $
+
+GEN=	45
+LIB=	i965_gen${GEN}
+
+NOPROFILE=
+
+SRCS=	genX_blorp_exec.c \
+	genX_pipe_control.c \
+	genX_state_upload.c
+
+.include "../Makefile.inc"
+
+CFLAGS+=	${C_VIS_ARGS} ${NO_OVERRIDE_INIT_ARGS} ${C_SSE2_ARGS}
+CPPFLAGS+=	-I${MESA_SRC}/src/mesa/drivers/dri/i965 \
+		-I${MESA_SRC}/src/mesa/drivers/dri/common \
+		-I${MESA_SRC}/src/mesa \
+		-I${MESA_SRC}/src/mapi \
+		-I${MESA_SRC}/src/intel \
+		-I${MESA_SRC}/src/gallium/include \
+		-I${MESA_SRC}/generated/src/compiler/nir \
+		-I${MESA_SRC}/generated/src/intel \
+		-DGEN_VERSIONx10=${GEN}
+
+install:
+
+obj: _xenocara_obj
+
+.include <bsd.lib.mk>
+.include <bsd.xorg.mk>
+
+.PATH: ${MESA_SRC}/src/mesa/drivers/dri/i965
diff --git a/lib/mesa/mk/libi965_gen50/Makefile b/lib/mesa/mk/libi965_gen50/Makefile
new file mode 100644
index 000000000..187f310cc
--- /dev/null
+++ b/lib/mesa/mk/libi965_gen50/Makefile
@@ -0,0 +1,32 @@
+#	$OpenBSD: Makefile,v 1.1 2020/08/26 06:02:38 jsg Exp $
+
+GEN=	50
+LIB=	i965_gen${GEN}
+
+NOPROFILE=
+
+SRCS=	genX_blorp_exec.c \
+	genX_pipe_control.c \
+	genX_state_upload.c
+
+.include "../Makefile.inc"
+
+CFLAGS+=	${C_VIS_ARGS} ${NO_OVERRIDE_INIT_ARGS} ${C_SSE2_ARGS}
+CPPFLAGS+=	-I${MESA_SRC}/src/mesa/drivers/dri/i965 \
+		-I${MESA_SRC}/src/mesa/drivers/dri/common \
+		-I${MESA_SRC}/src/mesa \
+		-I${MESA_SRC}/src/mapi \
+		-I${MESA_SRC}/src/intel \
+		-I${MESA_SRC}/src/gallium/include \
+		-I${MESA_SRC}/generated/src/compiler/nir \
+		-I${MESA_SRC}/generated/src/intel \
+		-DGEN_VERSIONx10=${GEN}
+
+install:
+
+obj: _xenocara_obj
+
+.include <bsd.lib.mk>
+.include <bsd.xorg.mk>
+
+.PATH: ${MESA_SRC}/src/mesa/drivers/dri/i965
diff --git a/lib/mesa/mk/libi965_gen60/Makefile b/lib/mesa/mk/libi965_gen60/Makefile
new file mode 100644
index 000000000..cab28461b
--- /dev/null
+++ b/lib/mesa/mk/libi965_gen60/Makefile
@@ -0,0 +1,32 @@
+#	$OpenBSD: Makefile,v 1.1 2020/08/26 06:02:38 jsg Exp $
+
+GEN=	60
+LIB=	i965_gen${GEN}
+
+NOPROFILE=
+
+SRCS=	genX_blorp_exec.c \
+	genX_pipe_control.c \
+	genX_state_upload.c
+
+.include "../Makefile.inc"
+
+CFLAGS+=	${C_VIS_ARGS} ${NO_OVERRIDE_INIT_ARGS} ${C_SSE2_ARGS}
+CPPFLAGS+=	-I${MESA_SRC}/src/mesa/drivers/dri/i965 \
+		-I${MESA_SRC}/src/mesa/drivers/dri/common \
+		-I${MESA_SRC}/src/mesa \
+		-I${MESA_SRC}/src/mapi \
+		-I${MESA_SRC}/src/intel \
+		-I${MESA_SRC}/src/gallium/include \
+		-I${MESA_SRC}/generated/src/compiler/nir \
+		-I${MESA_SRC}/generated/src/intel \
+		-DGEN_VERSIONx10=${GEN}
+
+install:
+
+obj: _xenocara_obj
+
+.include <bsd.lib.mk>
+.include <bsd.xorg.mk>
+
+.PATH: ${MESA_SRC}/src/mesa/drivers/dri/i965
diff --git a/lib/mesa/mk/libi965_gen70/Makefile b/lib/mesa/mk/libi965_gen70/Makefile
new file mode 100644
index 000000000..010628750
--- /dev/null
+++ b/lib/mesa/mk/libi965_gen70/Makefile
@@ -0,0 +1,32 @@
+#	$OpenBSD: Makefile,v 1.1 2020/08/26 06:02:38 jsg Exp $
+
+GEN=	70
+LIB=	i965_gen${GEN}
+
+NOPROFILE=
+
+SRCS=	genX_blorp_exec.c \
+	genX_pipe_control.c \
+	genX_state_upload.c
+
+.include "../Makefile.inc"
+
+CFLAGS+=	${C_VIS_ARGS} ${NO_OVERRIDE_INIT_ARGS} ${C_SSE2_ARGS}
+CPPFLAGS+=	-I${MESA_SRC}/src/mesa/drivers/dri/i965 \
+		-I${MESA_SRC}/src/mesa/drivers/dri/common \
+		-I${MESA_SRC}/src/mesa \
+		-I${MESA_SRC}/src/mapi \
+		-I${MESA_SRC}/src/intel \
+		-I${MESA_SRC}/src/gallium/include \
+		-I${MESA_SRC}/generated/src/compiler/nir \
+		-I${MESA_SRC}/generated/src/intel \
+		-DGEN_VERSIONx10=${GEN}
+
+install:
+
+obj: _xenocara_obj
+
+.include <bsd.lib.mk>
+.include <bsd.xorg.mk>
+
+.PATH: ${MESA_SRC}/src/mesa/drivers/dri/i965
diff --git a/lib/mesa/mk/libi965_gen75/Makefile b/lib/mesa/mk/libi965_gen75/Makefile
new file mode 100644
index 000000000..39de8fb9b
--- /dev/null
+++ b/lib/mesa/mk/libi965_gen75/Makefile
@@ -0,0 +1,32 @@
+#	$OpenBSD: Makefile,v 1.1 2020/08/26 06:02:38 jsg Exp $
+
+GEN=	75
+LIB=	i965_gen${GEN}
+
+NOPROFILE=
+
+SRCS=	genX_blorp_exec.c \
+	genX_pipe_control.c \
+	genX_state_upload.c
+
+.include "../Makefile.inc"
+
+CFLAGS+=	${C_VIS_ARGS} ${NO_OVERRIDE_INIT_ARGS} ${C_SSE2_ARGS}
+CPPFLAGS+=	-I${MESA_SRC}/src/mesa/drivers/dri/i965 \
+		-I${MESA_SRC}/src/mesa/drivers/dri/common \
+		-I${MESA_SRC}/src/mesa \
+		-I${MESA_SRC}/src/mapi \
+		-I${MESA_SRC}/src/intel \
+		-I${MESA_SRC}/src/gallium/include \
+		-I${MESA_SRC}/generated/src/compiler/nir \
+		-I${MESA_SRC}/generated/src/intel \
+		-DGEN_VERSIONx10=${GEN}
+
+install:
+
+obj: _xenocara_obj
+
+.include <bsd.lib.mk>
+.include <bsd.xorg.mk>
+
+.PATH: ${MESA_SRC}/src/mesa/drivers/dri/i965
diff --git a/lib/mesa/mk/libi965_gen80/Makefile b/lib/mesa/mk/libi965_gen80/Makefile
new file mode 100644
index 000000000..4b0bd0b75
--- /dev/null
+++ b/lib/mesa/mk/libi965_gen80/Makefile
@@ -0,0 +1,32 @@
+#	$OpenBSD: Makefile,v 1.1 2020/08/26 06:02:38 jsg Exp $
+
+GEN=	80
+LIB=	i965_gen${GEN}
+
+NOPROFILE=
+
+SRCS=	genX_blorp_exec.c \
+	genX_pipe_control.c \
+	genX_state_upload.c
+
+.include "../Makefile.inc"
+
+CFLAGS+=	${C_VIS_ARGS} ${NO_OVERRIDE_INIT_ARGS} ${C_SSE2_ARGS}
+CPPFLAGS+=	-I${MESA_SRC}/src/mesa/drivers/dri/i965 \
+		-I${MESA_SRC}/src/mesa/drivers/dri/common \
+		-I${MESA_SRC}/src/mesa \
+		-I${MESA_SRC}/src/mapi \
+		-I${MESA_SRC}/src/intel \
+		-I${MESA_SRC}/src/gallium/include \
+		-I${MESA_SRC}/generated/src/compiler/nir \
+		-I${MESA_SRC}/generated/src/intel \
+		-DGEN_VERSIONx10=${GEN}
+
+install:
+
+obj: _xenocara_obj
+
+.include <bsd.lib.mk>
+.include <bsd.xorg.mk>
+
+.PATH: ${MESA_SRC}/src/mesa/drivers/dri/i965
diff --git a/lib/mesa/mk/libi965_gen90/Makefile b/lib/mesa/mk/libi965_gen90/Makefile
new file mode 100644
index 000000000..3ba2e136c
--- /dev/null
+++ b/lib/mesa/mk/libi965_gen90/Makefile
@@ -0,0 +1,32 @@
+#	$OpenBSD: Makefile,v 1.1 2020/08/26 06:02:38 jsg Exp $
+
+GEN=	90
+LIB=	i965_gen${GEN}
+
+NOPROFILE=
+
+SRCS=	genX_blorp_exec.c \
+	genX_pipe_control.c \
+	genX_state_upload.c
+
+.include "../Makefile.inc"
+
+CFLAGS+=	${C_VIS_ARGS} ${NO_OVERRIDE_INIT_ARGS} ${C_SSE2_ARGS}
+CPPFLAGS+=	-I${MESA_SRC}/src/mesa/drivers/dri/i965 \
+		-I${MESA_SRC}/src/mesa/drivers/dri/common \
+		-I${MESA_SRC}/src/mesa \
+		-I${MESA_SRC}/src/mapi \
+		-I${MESA_SRC}/src/intel \
+		-I${MESA_SRC}/src/gallium/include \
+		-I${MESA_SRC}/generated/src/compiler/nir \
+		-I${MESA_SRC}/generated/src/intel \
+		-DGEN_VERSIONx10=${GEN}
+
+install:
+
+obj: _xenocara_obj
+
+.include <bsd.lib.mk>
+.include <bsd.xorg.mk>
+
+.PATH: ${MESA_SRC}/src/mesa/drivers/dri/i965
diff --git a/lib/mesa/mk/libintel_common/Makefile b/lib/mesa/mk/libintel_common/Makefile
new file mode 100644
index 000000000..edc4e5940
--- /dev/null
+++ b/lib/mesa/mk/libintel_common/Makefile
@@ -0,0 +1,30 @@
+#	$OpenBSD: Makefile,v 1.1 2020/08/26 06:02:38 jsg Exp $
+
+LIB=	intel_common
+
+NOPROFILE=
+
+SRCS=	gen_aux_map.c \
+	gen_batch_decoder.c \
+	gen_decoder.c \
+	gen_disasm.c \
+	gen_l3_config.c \
+	gen_urb_config.c \
+	intel_log.c
+
+.include "../Makefile.inc"
+
+CFLAGS+=	${C_VIS_ARGS} ${NO_OVERRIDE_INIT_ARGS}
+CPPFLAGS+=	-I${MESA_SRC}/src/intel \
+		-I${MESA_SRC}/src/mesa \
+		-I${MESA_SRC}/src/gallium/include \
+		-I${MESA_SRC}/generated/src/intel
+
+install:
+
+obj: _xenocara_obj
+
+.include <bsd.lib.mk>
+.include <bsd.xorg.mk>
+
+.PATH: ${MESA_SRC}/src/intel/common
diff --git a/lib/mesa/mk/libintel_compiler/Makefile b/lib/mesa/mk/libintel_compiler/Makefile
new file mode 100644
index 000000000..62d29ed67
--- /dev/null
+++ b/lib/mesa/mk/libintel_compiler/Makefile
@@ -0,0 +1,107 @@
+#	$OpenBSD: Makefile,v 1.1 2020/08/26 06:02:38 jsg Exp $
+
+LIB=	intel_compiler
+
+NOPROFILE=
+
+SRCS=	brw_cfg.cpp \
+	brw_clip_line.c \
+	brw_clip_point.c \
+	brw_clip_tri.c \
+	brw_clip_unfilled.c \
+	brw_clip_util.c \
+	brw_compile_clip.c \
+	brw_compile_sf.c \
+	brw_compiler.c \
+	brw_dead_control_flow.cpp \
+	brw_debug_recompile.c \
+	brw_disasm.c \
+	brw_disasm_info.c \
+	brw_eu.cpp \
+	brw_eu_compact.c \
+	brw_eu_emit.c \
+	brw_eu_util.c \
+	brw_eu_validate.c \
+	brw_fs_bank_conflicts.cpp \
+	brw_fs_cmod_propagation.cpp \
+	brw_fs_combine_constants.cpp \
+	brw_fs_copy_propagation.cpp \
+	brw_fs.cpp \
+	brw_fs_cse.cpp \
+	brw_fs_dead_code_eliminate.cpp \
+	brw_fs_generator.cpp \
+	brw_fs_live_variables.cpp \
+	brw_fs_lower_pack.cpp \
+	brw_fs_lower_regioning.cpp \
+	brw_fs_nir.cpp \
+	brw_fs_reg_allocate.cpp \
+	brw_fs_register_coalesce.cpp \
+	brw_fs_saturate_propagation.cpp \
+	brw_fs_scoreboard.cpp \
+	brw_fs_sel_peephole.cpp \
+	brw_fs_validate.cpp \
+	brw_fs_visitor.cpp \
+	brw_interpolation_map.c \
+	brw_ir_performance.cpp \
+	brw_nir.c \
+	brw_nir_analyze_boolean_resolves.c \
+	brw_nir_analyze_ubo_ranges.c \
+	brw_nir_attribute_workarounds.c \
+	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_mem_access_bit_sizes.c \
+	brw_nir_opt_peephole_ffma.c \
+	brw_nir_tcs_workarounds.c \
+	brw_nir_clamp_image_1d_2d_array_sizes.c \
+	brw_packed_float.c \
+	brw_predicated_break.cpp \
+	brw_reg_type.c \
+	brw_schedule_instructions.cpp \
+	brw_shader.cpp \
+	brw_vec4_cmod_propagation.cpp \
+	brw_vec4_copy_propagation.cpp \
+	brw_vec4.cpp \
+	brw_vec4_cse.cpp \
+	brw_vec4_dead_code_eliminate.cpp \
+	brw_vec4_generator.cpp \
+	brw_vec4_gs_visitor.cpp \
+	brw_vec4_live_variables.cpp \
+	brw_vec4_nir.cpp \
+	brw_vec4_gs_nir.cpp \
+	brw_vec4_reg_allocate.cpp \
+	brw_vec4_surface_builder.cpp \
+	brw_vec4_tcs.cpp \
+	brw_vec4_tes.cpp \
+	brw_vec4_visitor.cpp \
+	brw_vec4_vs_visitor.cpp \
+	brw_vue_map.c \
+	brw_wm_iz.cpp \
+	gen6_gs_visitor.cpp
+
+SRCS+=	brw_nir_trig_workarounds.c
+
+.include "../Makefile.inc"
+
+CFLAGS+=	${C_VIS_ARGS} ${NO_OVERRIDE_INIT_ARGS}
+CXXFLAGS+=	${CXX_VIS_ARGS}
+CPPFLAGS+=	-I${MESA_SRC}/src/intel \
+		-I${MESA_SRC}/src/intel/compiler \
+		-I${MESA_SRC}/src/mesa \
+		-I${MESA_SRC}/src/mapi \
+		-I${MESA_SRC}/src/gallium/include \
+		-I${MESA_SRC}/src/compiler/nir \
+		-I${MESA_SRC}/generated/src/intel \
+		-I${MESA_SRC}/generated/src/compiler \
+		-I${MESA_SRC}/generated/src/compiler/nir
+
+install:
+
+obj: _xenocara_obj
+
+.include <bsd.lib.mk>
+.include <bsd.xorg.mk>
+
+.PATH: ${MESA_SRC}/src/intel/compiler
+.PATH: ${MESA_SRC}/generated/src/intel/compiler
diff --git a/lib/mesa/mk/libintel_dev/Makefile b/lib/mesa/mk/libintel_dev/Makefile
new file mode 100644
index 000000000..894bdfa47
--- /dev/null
+++ b/lib/mesa/mk/libintel_dev/Makefile
@@ -0,0 +1,22 @@
+#	$OpenBSD: Makefile,v 1.1 2020/08/26 06:02:38 jsg Exp $
+
+LIB=	intel_dev
+
+NOPROFILE=
+
+SRCS=	gen_debug.c \
+	gen_device_info.c
+
+.include "../Makefile.inc"
+
+CFLAGS+=	${C_VIS_ARGS} ${NO_OVERRIDE_INIT_ARGS}
+CPPFLAGS+=	-I${MESA_SRC}/src/intel
+
+install:
+
+obj: _xenocara_obj
+
+.include <bsd.lib.mk>
+.include <bsd.xorg.mk>
+
+.PATH: ${MESA_SRC}/src/intel/dev
diff --git a/lib/mesa/mk/libintel_perf/Makefile b/lib/mesa/mk/libintel_perf/Makefile
new file mode 100644
index 000000000..565e86788
--- /dev/null
+++ b/lib/mesa/mk/libintel_perf/Makefile
@@ -0,0 +1,27 @@
+#	$OpenBSD: Makefile,v 1.1 2020/08/26 06:02:38 jsg Exp $
+
+LIB=	intel_perf
+
+NOPROFILE=
+
+SRCS=	gen_perf.c \
+	gen_perf_query.c \
+	gen_perf_mdapi.c
+
+SRCS+=	gen_perf_metrics.c
+
+.include "../Makefile.inc"
+
+CFLAGS+=	${C_VIS_ARGS} ${NO_OVERRIDE_INIT_ARGS} -msse2
+CPPFLAGS+=	-I${MESA_SRC}/src/intel \
+		-I${MESA_SRC}/generated/src/intel
+
+install:
+
+obj: _xenocara_obj
+
+.include <bsd.lib.mk>
+.include <bsd.xorg.mk>
+
+.PATH: ${MESA_SRC}/src/intel/perf/
+.PATH: ${MESA_SRC}/generated/src/intel/perf
diff --git a/lib/mesa/mk/libiris/Makefile b/lib/mesa/mk/libiris/Makefile
new file mode 100644
index 000000000..cdcd04646
--- /dev/null
+++ b/lib/mesa/mk/libiris/Makefile
@@ -0,0 +1,48 @@
+#	$OpenBSD: Makefile,v 1.1 2020/08/26 06:02:38 jsg Exp $
+
+LIB=	iris
+
+NOPROFILE=
+
+SRCS=	iris_batch.c \
+	iris_binder.c \
+	iris_blit.c \
+	iris_border_color.c \
+	iris_bufmgr.c \
+	iris_clear.c \
+	iris_context.c \
+	iris_draw.c \
+	iris_fence.c \
+	iris_formats.c \
+	iris_monitor.c \
+	iris_perf.c \
+	iris_performance_query.c \
+	iris_pipe_control.c \
+	iris_program.c \
+	iris_program_cache.c \
+	iris_resolve.c \
+	iris_resource.c \
+	iris_screen.c \
+	iris_disk_cache.c
+
+.include "../Makefile.inc"
+
+CFLAGS+=	${C_VIS_ARGS} ${C_SSE2_ARGS}
+CPPFLAGS+=	-DGALLIUM_IRIS \
+		-I${MESA_SRC}/src/gallium/drivers/iris \
+		-I${MESA_SRC}/src/gallium/include \
+		-I${MESA_SRC}/src/gallium/auxiliary \
+		-I${MESA_SRC}/src/gallium/drivers \
+		-I${MESA_SRC}/src/mesa \
+		-I${MESA_SRC}/src/mapi \
+		-I${MESA_SRC}/src/intel \
+		-I${MESA_SRC}/generated/src/compiler/nir
+
+install:
+
+obj: _xenocara_obj
+
+.include <bsd.lib.mk>
+.include <bsd.xorg.mk>
+
+.PATH: ${MESA_SRC}/src/gallium/drivers/iris
diff --git a/lib/mesa/mk/libiris_gen100/Makefile b/lib/mesa/mk/libiris_gen100/Makefile
new file mode 100644
index 000000000..e6031ece5
--- /dev/null
+++ b/lib/mesa/mk/libiris_gen100/Makefile
@@ -0,0 +1,32 @@
+#	$OpenBSD: Makefile,v 1.1 2020/08/26 06:02:39 jsg Exp $
+
+GEN=	100
+LIB=	iris_gen${GEN}
+
+NOPROFILE=
+
+SRCS=	iris_blorp.c \
+	iris_query.c \
+	iris_state.c
+
+.include "../Makefile.inc"
+
+CFLAGS+=	${C_VIS_ARGS} ${NO_OVERRIDE_INIT_ARGS} ${C_SSE2_ARGS}
+CPPFLAGS+=	-I${MESA_SRC}/src/intel \
+		-I${MESA_SRC}/src/mesa \
+		-I${MESA_SRC}/src/mapi \
+		-I${MESA_SRC}/src/gallium/include \
+		-I${MESA_SRC}/src/gallium/auxiliary \
+		-I${MESA_SRC}/src/compiler/nir \
+		-I${MESA_SRC}/generated/src/intel \
+		-I${MESA_SRC}/generated/src/compiler/nir \
+		-DGEN_VERSIONx10=${GEN}
+
+install:
+
+obj: _xenocara_obj
+
+.include <bsd.lib.mk>
+.include <bsd.xorg.mk>
+
+.PATH: ${MESA_SRC}/src/gallium/drivers/iris
diff --git a/lib/mesa/mk/libiris_gen110/Makefile b/lib/mesa/mk/libiris_gen110/Makefile
new file mode 100644
index 000000000..5a157944b
--- /dev/null
+++ b/lib/mesa/mk/libiris_gen110/Makefile
@@ -0,0 +1,32 @@
+#	$OpenBSD: Makefile,v 1.1 2020/08/26 06:02:39 jsg Exp $
+
+GEN=	110
+LIB=	iris_gen${GEN}
+
+NOPROFILE=
+
+SRCS=	iris_blorp.c \
+	iris_query.c \
+	iris_state.c
+
+.include "../Makefile.inc"
+
+CFLAGS+=	${C_VIS_ARGS} ${NO_OVERRIDE_INIT_ARGS} ${C_SSE2_ARGS}
+CPPFLAGS+=	-I${MESA_SRC}/src/intel \
+		-I${MESA_SRC}/src/mesa \
+		-I${MESA_SRC}/src/mapi \
+		-I${MESA_SRC}/src/gallium/include \
+		-I${MESA_SRC}/src/gallium/auxiliary \
+		-I${MESA_SRC}/src/compiler/nir \
+		-I${MESA_SRC}/generated/src/intel \
+		-I${MESA_SRC}/generated/src/compiler/nir \
+		-DGEN_VERSIONx10=${GEN}
+
+install:
+
+obj: _xenocara_obj
+
+.include <bsd.lib.mk>
+.include <bsd.xorg.mk>
+
+.PATH: ${MESA_SRC}/src/gallium/drivers/iris
diff --git a/lib/mesa/mk/libiris_gen120/Makefile b/lib/mesa/mk/libiris_gen120/Makefile
new file mode 100644
index 000000000..2a36cf094
--- /dev/null
+++ b/lib/mesa/mk/libiris_gen120/Makefile
@@ -0,0 +1,32 @@
+#	$OpenBSD: Makefile,v 1.1 2020/08/26 06:02:39 jsg Exp $
+
+GEN=	120
+LIB=	iris_gen${GEN}
+
+NOPROFILE=
+
+SRCS=	iris_blorp.c \
+	iris_query.c \
+	iris_state.c
+
+.include "../Makefile.inc"
+
+CFLAGS+=	${C_VIS_ARGS} ${NO_OVERRIDE_INIT_ARGS} ${C_SSE2_ARGS}
+CPPFLAGS+=	-I${MESA_SRC}/src/intel \
+		-I${MESA_SRC}/src/mesa \
+		-I${MESA_SRC}/src/mapi \
+		-I${MESA_SRC}/src/gallium/include \
+		-I${MESA_SRC}/src/gallium/auxiliary \
+		-I${MESA_SRC}/src/compiler/nir \
+		-I${MESA_SRC}/generated/src/intel \
+		-I${MESA_SRC}/generated/src/compiler/nir \
+		-DGEN_VERSIONx10=${GEN}
+
+install:
+
+obj: _xenocara_obj
+
+.include <bsd.lib.mk>
+.include <bsd.xorg.mk>
+
+.PATH: ${MESA_SRC}/src/gallium/drivers/iris
diff --git a/lib/mesa/mk/libiris_gen80/Makefile b/lib/mesa/mk/libiris_gen80/Makefile
new file mode 100644
index 000000000..05f59cd89
--- /dev/null
+++ b/lib/mesa/mk/libiris_gen80/Makefile
@@ -0,0 +1,32 @@
+#	$OpenBSD: Makefile,v 1.1 2020/08/26 06:02:39 jsg Exp $
+
+GEN=	80
+LIB=	iris_gen${GEN}
+
+NOPROFILE=
+
+SRCS=	iris_blorp.c \
+	iris_query.c \
+	iris_state.c
+
+.include "../Makefile.inc"
+
+CFLAGS+=	${C_VIS_ARGS} ${NO_OVERRIDE_INIT_ARGS} ${C_SSE2_ARGS}
+CPPFLAGS+=	-I${MESA_SRC}/src/intel \
+		-I${MESA_SRC}/src/mesa \
+		-I${MESA_SRC}/src/mapi \
+		-I${MESA_SRC}/src/gallium/include \
+		-I${MESA_SRC}/src/gallium/auxiliary \
+		-I${MESA_SRC}/src/compiler/nir \
+		-I${MESA_SRC}/generated/src/intel \
+		-I${MESA_SRC}/generated/src/compiler/nir \
+		-DGEN_VERSIONx10=${GEN}
+
+install:
+
+obj: _xenocara_obj
+
+.include <bsd.lib.mk>
+.include <bsd.xorg.mk>
+
+.PATH: ${MESA_SRC}/src/gallium/drivers/iris
diff --git a/lib/mesa/mk/libiris_gen90/Makefile b/lib/mesa/mk/libiris_gen90/Makefile
new file mode 100644
index 000000000..632712f1f
--- /dev/null
+++ b/lib/mesa/mk/libiris_gen90/Makefile
@@ -0,0 +1,32 @@
+#	$OpenBSD: Makefile,v 1.1 2020/08/26 06:02:39 jsg Exp $
+
+GEN=	90
+LIB=	iris_gen${GEN}
+
+NOPROFILE=
+
+SRCS=	iris_blorp.c \
+	iris_query.c \
+	iris_state.c
+
+.include "../Makefile.inc"
+
+CFLAGS+=	${C_VIS_ARGS} ${NO_OVERRIDE_INIT_ARGS} ${C_SSE2_ARGS}
+CPPFLAGS+=	-I${MESA_SRC}/src/intel \
+		-I${MESA_SRC}/src/mesa \
+		-I${MESA_SRC}/src/mapi \
+		-I${MESA_SRC}/src/gallium/include \
+		-I${MESA_SRC}/src/gallium/auxiliary \
+		-I${MESA_SRC}/src/compiler/nir \
+		-I${MESA_SRC}/generated/src/intel \
+		-I${MESA_SRC}/generated/src/compiler/nir \
+		-DGEN_VERSIONx10=${GEN}
+
+install:
+
+obj: _xenocara_obj
+
+.include <bsd.lib.mk>
+.include <bsd.xorg.mk>
+
+.PATH: ${MESA_SRC}/src/gallium/drivers/iris
diff --git a/lib/mesa/mk/libiriswinsys/Makefile b/lib/mesa/mk/libiriswinsys/Makefile
new file mode 100644
index 000000000..5be96533d
--- /dev/null
+++ b/lib/mesa/mk/libiriswinsys/Makefile
@@ -0,0 +1,23 @@
+#	$OpenBSD: Makefile,v 1.1 2020/08/26 06:02:39 jsg Exp $
+
+LIB=	iriswinsys
+
+NOPROFILE=
+
+SRCS=	iris_drm_winsys.c
+
+.include "../Makefile.inc"
+
+CFLAGS+=	${C_VIS_ARGS}
+CPPFLAGS+=	-I${MESA_SRC}/src/gallium/include \
+		-I${MESA_SRC}/src/gallium/auxiliary \
+		-I${MESA_SRC}/src/gallium/winsys/iris/drm
+
+install:
+
+obj: _xenocara_obj
+
+.include <bsd.lib.mk>
+.include <bsd.xorg.mk>
+
+.PATH: ${MESA_SRC}/src/gallium/winsys/iris/drm
diff --git a/lib/mesa/mk/libisl/Makefile b/lib/mesa/mk/libisl/Makefile
new file mode 100644
index 000000000..4ec19a57e
--- /dev/null
+++ b/lib/mesa/mk/libisl/Makefile
@@ -0,0 +1,32 @@
+#	$OpenBSD: Makefile,v 1.1 2020/08/26 06:02:39 jsg Exp $
+
+LIB=	isl
+
+NOPROFILE=
+
+SRCS=	isl.c \
+	isl_aux_info.c \
+	isl_drm.c \
+	isl_format.c \
+	isl_storage_image.c
+
+SRCS+=	isl_format_layout.c
+
+.include "../Makefile.inc"
+
+CFLAGS+=	${C_VIS_ARGS} ${NO_OVERRIDE_INIT_ARGS}
+CPPFLAGS+=	-I${MESA_SRC}/src/intel \
+		-I${MESA_SRC}/src/mesa \
+		-I${MESA_SRC}/src/mapi \
+		-I${MESA_SRC}/src/gallium/include \
+		-I${MESA_SRC}/generated/src/intel
+
+install:
+
+obj: _xenocara_obj
+
+.include <bsd.lib.mk>
+.include <bsd.xorg.mk>
+
+.PATH: ${MESA_SRC}/src/intel/isl
+.PATH: ${MESA_SRC}/generated/src/intel/isl
diff --git a/lib/mesa/mk/libisl_gen100/Makefile b/lib/mesa/mk/libisl_gen100/Makefile
new file mode 100644
index 000000000..45c5eb9d1
--- /dev/null
+++ b/lib/mesa/mk/libisl_gen100/Makefile
@@ -0,0 +1,26 @@
+#	$OpenBSD: Makefile,v 1.1 2020/08/26 06:02:39 jsg Exp $
+
+GEN=	100
+LIB=	isl_gen${GEN}
+
+NOPROFILE=
+
+SRCS=	isl_emit_depth_stencil.c \
+	isl_surface_state.c
+
+.include "../Makefile.inc"
+
+CFLAGS+=	${C_VIS_ARGS} ${NO_OVERRIDE_INIT_ARGS}
+CPPFLAGS+=	-I${MESA_SRC}/src/intel \
+		-I${MESA_SRC}/src/gallium/include \
+		-I${MESA_SRC}/generated/src/intel \
+		-DGEN_VERSIONx10=${GEN}
+
+install:
+
+obj: _xenocara_obj
+
+.include <bsd.lib.mk>
+.include <bsd.xorg.mk>
+
+.PATH: ${MESA_SRC}/src/intel/isl
diff --git a/lib/mesa/mk/libisl_gen110/Makefile b/lib/mesa/mk/libisl_gen110/Makefile
new file mode 100644
index 000000000..09ff379f4
--- /dev/null
+++ b/lib/mesa/mk/libisl_gen110/Makefile
@@ -0,0 +1,26 @@
+#	$OpenBSD: Makefile,v 1.1 2020/08/26 06:02:39 jsg Exp $
+
+GEN=	110
+LIB=	isl_gen${GEN}
+
+NOPROFILE=
+
+SRCS=	isl_emit_depth_stencil.c \
+	isl_surface_state.c
+
+.include "../Makefile.inc"
+
+CFLAGS+=	${C_VIS_ARGS} ${NO_OVERRIDE_INIT_ARGS}
+CPPFLAGS+=	-I${MESA_SRC}/src/intel \
+		-I${MESA_SRC}/src/gallium/include \
+		-I${MESA_SRC}/generated/src/intel \
+		-DGEN_VERSIONx10=${GEN}
+
+install:
+
+obj: _xenocara_obj
+
+.include <bsd.lib.mk>
+.include <bsd.xorg.mk>
+
+.PATH: ${MESA_SRC}/src/intel/isl
diff --git a/lib/mesa/mk/libisl_gen120/Makefile b/lib/mesa/mk/libisl_gen120/Makefile
new file mode 100644
index 000000000..7b8996f88
--- /dev/null
+++ b/lib/mesa/mk/libisl_gen120/Makefile
@@ -0,0 +1,27 @@
+#	$OpenBSD: Makefile,v 1.1 2020/08/26 06:02:39 jsg Exp $
+
+GEN=	120
+LIB=	isl_gen${GEN}
+
+NOPROFILE=
+
+SRCS=	isl_emit_depth_stencil.c \
+	isl_surface_state.c \
+	isl_gen12.c
+
+.include "../Makefile.inc"
+
+CFLAGS+=	${C_VIS_ARGS} ${NO_OVERRIDE_INIT_ARGS}
+CPPFLAGS+=	-I${MESA_SRC}/src/intel \
+		-I${MESA_SRC}/src/gallium/include \
+		-I${MESA_SRC}/generated/src/intel \
+		-DGEN_VERSIONx10=${GEN}
+
+install:
+
+obj: _xenocara_obj
+
+.include <bsd.lib.mk>
+.include <bsd.xorg.mk>
+
+.PATH: ${MESA_SRC}/src/intel/isl
diff --git a/lib/mesa/mk/libisl_gen40/Makefile b/lib/mesa/mk/libisl_gen40/Makefile
new file mode 100644
index 000000000..da767963d
--- /dev/null
+++ b/lib/mesa/mk/libisl_gen40/Makefile
@@ -0,0 +1,27 @@
+#	$OpenBSD: Makefile,v 1.1 2020/08/26 06:02:39 jsg Exp $
+
+GEN=	40
+LIB=	isl_gen${GEN}
+
+NOPROFILE=
+
+SRCS=	isl_emit_depth_stencil.c \
+	isl_surface_state.c \
+	isl_gen4.c
+
+.include "../Makefile.inc"
+
+CFLAGS+=	${C_VIS_ARGS} ${NO_OVERRIDE_INIT_ARGS}
+CPPFLAGS+=	-I${MESA_SRC}/src/intel \
+		-I${MESA_SRC}/src/gallium/include \
+		-I${MESA_SRC}/generated/src/intel \
+		-DGEN_VERSIONx10=${GEN}
+
+install:
+
+obj: _xenocara_obj
+
+.include <bsd.lib.mk>
+.include <bsd.xorg.mk>
+
+.PATH: ${MESA_SRC}/src/intel/isl
diff --git a/lib/mesa/mk/libisl_gen50/Makefile b/lib/mesa/mk/libisl_gen50/Makefile
new file mode 100644
index 000000000..5d1385ae1
--- /dev/null
+++ b/lib/mesa/mk/libisl_gen50/Makefile
@@ -0,0 +1,26 @@
+#	$OpenBSD: Makefile,v 1.1 2020/08/26 06:02:39 jsg Exp $
+
+GEN=	50
+LIB=	isl_gen${GEN}
+
+NOPROFILE=
+
+SRCS=	isl_emit_depth_stencil.c \
+	isl_surface_state.c
+
+.include "../Makefile.inc"
+
+CFLAGS+=	${C_VIS_ARGS} ${NO_OVERRIDE_INIT_ARGS}
+CPPFLAGS+=	-I${MESA_SRC}/src/intel \
+		-I${MESA_SRC}/src/gallium/include \
+		-I${MESA_SRC}/generated/src/intel \
+		-DGEN_VERSIONx10=${GEN}
+
+install:
+
+obj: _xenocara_obj
+
+.include <bsd.lib.mk>
+.include <bsd.xorg.mk>
+
+.PATH: ${MESA_SRC}/src/intel/isl
diff --git a/lib/mesa/mk/libisl_gen60/Makefile b/lib/mesa/mk/libisl_gen60/Makefile
new file mode 100644
index 000000000..d2b6e2882
--- /dev/null
+++ b/lib/mesa/mk/libisl_gen60/Makefile
@@ -0,0 +1,27 @@
+#	$OpenBSD: Makefile,v 1.1 2020/08/26 06:02:39 jsg Exp $
+
+GEN=	60
+LIB=	isl_gen${GEN}
+
+NOPROFILE=
+
+SRCS=	isl_emit_depth_stencil.c \
+	isl_surface_state.c \
+	isl_gen6.c
+
+.include "../Makefile.inc"
+
+CFLAGS+=	${C_VIS_ARGS} ${NO_OVERRIDE_INIT_ARGS}
+CPPFLAGS+=	-I${MESA_SRC}/src/intel \
+		-I${MESA_SRC}/src/gallium/include \
+		-I${MESA_SRC}/generated/src/intel \
+		-DGEN_VERSIONx10=${GEN}
+
+install:
+
+obj: _xenocara_obj
+
+.include <bsd.lib.mk>
+.include <bsd.xorg.mk>
+
+.PATH: ${MESA_SRC}/src/intel/isl
diff --git a/lib/mesa/mk/libisl_gen70/Makefile b/lib/mesa/mk/libisl_gen70/Makefile
new file mode 100644
index 000000000..59c6fca03
--- /dev/null
+++ b/lib/mesa/mk/libisl_gen70/Makefile
@@ -0,0 +1,27 @@
+#	$OpenBSD: Makefile,v 1.1 2020/08/26 06:02:39 jsg Exp $
+
+GEN=	70
+LIB=	isl_gen${GEN}
+
+NOPROFILE=
+
+SRCS=	isl_emit_depth_stencil.c \
+	isl_surface_state.c \
+	isl_gen7.c
+
+.include "../Makefile.inc"
+
+CFLAGS+=	${C_VIS_ARGS} ${NO_OVERRIDE_INIT_ARGS}
+CPPFLAGS+=	-I${MESA_SRC}/src/intel \
+		-I${MESA_SRC}/src/gallium/include \
+		-I${MESA_SRC}/generated/src/intel \
+		-DGEN_VERSIONx10=${GEN}
+
+install:
+
+obj: _xenocara_obj
+
+.include <bsd.lib.mk>
+.include <bsd.xorg.mk>
+
+.PATH: ${MESA_SRC}/src/intel/isl
diff --git a/lib/mesa/mk/libisl_gen75/Makefile b/lib/mesa/mk/libisl_gen75/Makefile
new file mode 100644
index 000000000..fe1b9998e
--- /dev/null
+++ b/lib/mesa/mk/libisl_gen75/Makefile
@@ -0,0 +1,26 @@
+#	$OpenBSD: Makefile,v 1.1 2020/08/26 06:02:39 jsg Exp $
+
+GEN=	75
+LIB=	isl_gen${GEN}
+
+NOPROFILE=
+
+SRCS=	isl_emit_depth_stencil.c \
+	isl_surface_state.c
+
+.include "../Makefile.inc"
+
+CFLAGS+=	${C_VIS_ARGS} ${NO_OVERRIDE_INIT_ARGS}
+CPPFLAGS+=	-I${MESA_SRC}/src/intel \
+		-I${MESA_SRC}/src/gallium/include \
+		-I${MESA_SRC}/generated/src/intel \
+		-DGEN_VERSIONx10=${GEN}
+
+install:
+
+obj: _xenocara_obj
+
+.include <bsd.lib.mk>
+.include <bsd.xorg.mk>
+
+.PATH: ${MESA_SRC}/src/intel/isl
diff --git a/lib/mesa/mk/libisl_gen80/Makefile b/lib/mesa/mk/libisl_gen80/Makefile
new file mode 100644
index 000000000..0135c8c46
--- /dev/null
+++ b/lib/mesa/mk/libisl_gen80/Makefile
@@ -0,0 +1,27 @@
+#	$OpenBSD: Makefile,v 1.1 2020/08/26 06:02:39 jsg Exp $
+
+GEN=	80
+LIB=	isl_gen${GEN}
+
+NOPROFILE=
+
+SRCS=	isl_emit_depth_stencil.c \
+	isl_surface_state.c \
+	isl_gen8.c
+
+.include "../Makefile.inc"
+
+CFLAGS+=	${C_VIS_ARGS} ${NO_OVERRIDE_INIT_ARGS}
+CPPFLAGS+=	-I${MESA_SRC}/src/intel \
+		-I${MESA_SRC}/src/gallium/include \
+		-I${MESA_SRC}/generated/src/intel \
+		-DGEN_VERSIONx10=${GEN}
+
+install:
+
+obj: _xenocara_obj
+
+.include <bsd.lib.mk>
+.include <bsd.xorg.mk>
+
+.PATH: ${MESA_SRC}/src/intel/isl
diff --git a/lib/mesa/mk/libisl_gen90/Makefile b/lib/mesa/mk/libisl_gen90/Makefile
new file mode 100644
index 000000000..fe07231cf
--- /dev/null
+++ b/lib/mesa/mk/libisl_gen90/Makefile
@@ -0,0 +1,27 @@
+#	$OpenBSD: Makefile,v 1.1 2020/08/26 06:02:39 jsg Exp $
+
+GEN=	90
+LIB=	isl_gen${GEN}
+
+NOPROFILE=
+
+SRCS=	isl_emit_depth_stencil.c \
+	isl_surface_state.c \
+	isl_gen9.c
+
+.include "../Makefile.inc"
+
+CFLAGS+=	${C_VIS_ARGS} ${NO_OVERRIDE_INIT_ARGS}
+CPPFLAGS+=	-I${MESA_SRC}/src/intel \
+		-I${MESA_SRC}/src/gallium/include \
+		-I${MESA_SRC}/generated/src/intel \
+		-DGEN_VERSIONx10=${GEN}
+
+install:
+
+obj: _xenocara_obj
+
+.include <bsd.lib.mk>
+.include <bsd.xorg.mk>
+
+.PATH: ${MESA_SRC}/src/intel/isl
diff --git a/lib/mesa/mk/libisl_tiled_memcpy/Makefile b/lib/mesa/mk/libisl_tiled_memcpy/Makefile
new file mode 100644
index 000000000..d8db30bb7
--- /dev/null
+++ b/lib/mesa/mk/libisl_tiled_memcpy/Makefile
@@ -0,0 +1,24 @@
+#	$OpenBSD: Makefile,v 1.1 2020/08/26 06:02:39 jsg Exp $
+
+LIB=	isl_tiled_memcpy
+
+NOPROFILE=
+
+SRCS=	isl_tiled_memcpy_normal.c
+
+.include "../Makefile.inc"
+
+CFLAGS+=	${C_VIS_ARGS} ${NO_OVERRIDE_INIT_ARGS} -msse2
+CPPFLAGS+=	-I${MESA_SRC}/src/intel \
+		-I${MESA_SRC}/src/mesa \
+		-I${MESA_SRC}/src/gallium/include \
+		-I${MESA_SRC}/generated/src/intel
+
+install:
+
+obj: _xenocara_obj
+
+.include <bsd.lib.mk>
+.include <bsd.xorg.mk>
+
+.PATH: ${MESA_SRC}/src/intel/isl
diff --git a/lib/mesa/mk/libisl_tiled_memcpy_sse41/Makefile b/lib/mesa/mk/libisl_tiled_memcpy_sse41/Makefile
new file mode 100644
index 000000000..84b770520
--- /dev/null
+++ b/lib/mesa/mk/libisl_tiled_memcpy_sse41/Makefile
@@ -0,0 +1,24 @@
+#	$OpenBSD: Makefile,v 1.1 2020/08/26 06:02:39 jsg Exp $
+
+LIB=	isl_tiled_memcpy_sse41
+
+NOPROFILE=
+
+SRCS=	isl_tiled_memcpy_sse41.c
+
+.include "../Makefile.inc"
+
+CFLAGS+=	${C_VIS_ARGS} ${NO_OVERRIDE_INIT_ARGS} -msse2 ${SSE41_ARGS}
+CPPFLAGS+=	-I${MESA_SRC}/src/intel \
+		-I${MESA_SRC}/src/mesa \
+		-I${MESA_SRC}/src/gallium/include \
+		-I${MESA_SRC}/generated/src/intel
+
+install:
+
+obj: _xenocara_obj
+
+.include <bsd.lib.mk>
+.include <bsd.xorg.mk>
+
+.PATH: ${MESA_SRC}/src/intel/isl
diff --git a/lib/mesa/mk/libllvmpipe/Makefile b/lib/mesa/mk/libllvmpipe/Makefile
new file mode 100644
index 000000000..c66f05387
--- /dev/null
+++ b/lib/mesa/mk/libllvmpipe/Makefile
@@ -0,0 +1,69 @@
+#	$OpenBSD: Makefile,v 1.1 2020/08/26 06:02:40 jsg Exp $
+
+LIB=	llvmpipe
+
+NOPROFILE=
+
+SRCS=	lp_bld_alpha.c \
+	lp_bld_blend.c \
+	lp_bld_blend_aos.c \
+	lp_bld_blend_logicop.c \
+	lp_bld_depth.c \
+	lp_bld_interp.c \
+	lp_clear.c \
+	lp_context.c \
+	lp_cs_tpool.c \
+	lp_draw_arrays.c \
+	lp_fence.c \
+	lp_flush.c \
+	lp_jit.c \
+	lp_memory.c \
+	lp_perf.c \
+	lp_query.c \
+	lp_rast.c \
+	lp_rast_debug.c \
+	lp_rast_tri.c \
+	lp_scene.c \
+	lp_scene_queue.c \
+	lp_screen.c \
+	lp_setup.c \
+	lp_setup_line.c \
+	lp_setup_point.c \
+	lp_setup_tri.c \
+	lp_setup_vbuf.c \
+	lp_state_blend.c \
+	lp_state_clip.c \
+	lp_state_cs.c \
+	lp_state_derived.c \
+	lp_state_fs.c \
+	lp_state_gs.c \
+	lp_state_rasterizer.c \
+	lp_state_sampler.c \
+	lp_state_setup.c \
+	lp_state_so.c \
+	lp_state_surface.c \
+	lp_state_tess.c \
+	lp_state_vertex.c \
+	lp_state_vs.c \
+	lp_surface.c \
+	lp_tex_sample.c \
+	lp_texture.c
+
+.include "../Makefile.inc"
+
+CFLAGS+=	${C_VIS_ARGS}
+CXXFLAGS+=	${CXX_VIS_ARGS}
+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/compiler/nir
+
+install:
+
+obj: _xenocara_obj
+
+.include <bsd.lib.mk>
+.include <bsd.xorg.mk>
+
+.PATH: ${MESA_SRC}/src/gallium/drivers/llvmpipe
diff --git a/lib/mesa/mk/libloader/Makefile b/lib/mesa/mk/libloader/Makefile
new file mode 100644
index 000000000..813f759c1
--- /dev/null
+++ b/lib/mesa/mk/libloader/Makefile
@@ -0,0 +1,26 @@
+#	$OpenBSD: Makefile,v 1.1 2020/08/26 06:02:40 jsg Exp $
+
+LIB=	loader
+
+NOPROFILE=
+
+SRCS=	loader.c \
+	pci_id_driver_map.c
+
+.include "../Makefile.inc"
+
+CFLAGS+=	${C_VIS_ARGS}
+CPPFLAGS+=	-DUSE_DRICONF \
+		-DDEFAULT_DRIVER_DIR=\"${X11BASE}/lib/modules/dri\" \
+		-DPREFER_IRIS \
+		-I${MESA_SRC}/src/loader \
+		-I${MESA_SRC}/generated/src/util
+
+install:
+
+obj: _xenocara_obj
+
+.include <bsd.lib.mk>
+.include <bsd.xorg.mk>
+
+.PATH: ${MESA_SRC}/src/loader
diff --git a/lib/mesa/mk/libloader_dri3_helper/Makefile b/lib/mesa/mk/libloader_dri3_helper/Makefile
new file mode 100644
index 000000000..6c9f258a4
--- /dev/null
+++ b/lib/mesa/mk/libloader_dri3_helper/Makefile
@@ -0,0 +1,27 @@
+#	$OpenBSD: Makefile,v 1.1 2020/08/26 06:02:40 jsg Exp $
+
+.include <bsd.xconf.mk>
+
+LIB=	loader_dri3_helper
+
+NOPROFILE=
+
+.if ${XENOCARA_BUILD_DRI3:L} == "yes"
+SRCS=	loader_dri3_helper.c
+.else
+SRCS=
+.endif
+
+.include "../Makefile.inc"
+
+CFLAGS+=	${C_VIS_ARGS}
+CPPFLAGS+=	-I${MESA_SRC}/src/loader
+
+install:
+
+obj: _xenocara_obj
+
+.include <bsd.lib.mk>
+.include <bsd.xorg.mk>
+
+.PATH: ${MESA_SRC}/src/loader
diff --git a/lib/mesa/mk/libmegadriver_stub/Makefile b/lib/mesa/mk/libmegadriver_stub/Makefile
new file mode 100644
index 000000000..b6dee73bb
--- /dev/null
+++ b/lib/mesa/mk/libmegadriver_stub/Makefile
@@ -0,0 +1,23 @@
+#	$OpenBSD: Makefile,v 1.1 2020/08/26 06:02:40 jsg Exp $
+
+LIB=	megadriver_stub
+
+NOPROFILE=
+
+SRCS=	megadriver_stub.c
+
+.include "../Makefile.inc"
+
+CFLAGS+=	${C_VIS_ARGS}
+CPPFLAGS+=	-I${MESA_SRC}/src/mesa/drivers/dri/common \
+		-I${MESA_SRC}/src/mesa \
+		-I${MESA_SRC}/src/mapi
+
+install:
+
+obj: _xenocara_obj
+
+.include <bsd.lib.mk>
+.include <bsd.xorg.mk>
+
+.PATH:	${MESA_SRC}/src/mesa/drivers/dri/common
diff --git a/lib/mesa/mk/libmesa_classic/Makefile b/lib/mesa/mk/libmesa_classic/Makefile
new file mode 100644
index 000000000..e8258fc33
--- /dev/null
+++ b/lib/mesa/mk/libmesa_classic/Makefile
@@ -0,0 +1,108 @@
+#	$OpenBSD: Makefile,v 1.1 2020/08/26 06:02:40 jsg Exp $
+
+LIB=	mesa_classic
+
+NOPROFILE=
+
+SRCS=	m_xform.c \
+	t_context.c \
+	t_draw.c \
+	t_pipeline.c \
+	t_rebase.c \
+	t_split.c \
+	t_split_copy.c \
+	t_split_inplace.c \
+	t_vb_fog.c \
+	t_vb_light.c \
+	t_vb_normals.c \
+	t_vb_points.c \
+	t_vb_program.c \
+	t_vb_render.c \
+	t_vb_texgen.c \
+	t_vb_texmat.c \
+	t_vb_vertex.c \
+	t_vertex.c \
+	t_vertex_generic.c \
+	t_vertex_sse.c \
+	t_vp_build.c \
+	s_aaline.c \
+	s_aatriangle.c \
+	s_alpha.c \
+	s_atifragshader.c \
+	s_bitmap.c \
+	s_blend.c \
+	s_blit.c \
+	s_clear.c \
+	s_context.c \
+	s_copypix.c \
+	s_depth.c \
+	s_drawpix.c \
+	s_feedback.c \
+	s_fog.c \
+	s_fragprog.c \
+	s_lines.c \
+	s_logic.c \
+	s_masking.c \
+	s_points.c \
+	s_renderbuffer.c \
+	s_span.c \
+	s_stencil.c \
+	s_texcombine.c \
+	s_texfetch.c \
+	s_texfilter.c \
+	s_texrender.c \
+	s_texture.c \
+	s_triangle.c \
+	s_zoom.c \
+	ss_context.c \
+	ss_triangle.c \
+	driverfuncs.c \
+	meta_blit.c \
+	meta_generate_mipmap.c \
+	meta.c \
+	x86_xform.c \
+	3dnow.c \
+	sse.c \
+	x86sse.c \
+	sparc.c \
+	x86-64.c
+
+.include "../Makefile.inc"
+
+CFLAGS+=	${C_VIS_ARGS}
+CXXFLAGS+=	${CXX_VIS_ARGS}
+CPPFLAGS+=	-I${MESA_SRC}/src/mesa \
+		-I${MESA_SRC}/src/mesa/main \
+		-I${MESA_SRC}/src/mesa/math \
+		-I${MESA_SRC}/src/mesa/tnl \
+		-I${MESA_SRC}/src/mesa/swrast \
+		-I${MESA_SRC}/src/mesa/swrast_setup \
+		-I${MESA_SRC}/src/mesa/drivers/common \
+		-I${MESA_SRC}/src/mesa/x86/rtasm \
+		-I${MESA_SRC}/src/mapi \
+		-I${MESA_SRC}/src/gallium/include \
+		-I${MESA_SRC}/generated/src/compiler/nir
+
+DPADD+=		${.CURDIR}/../libmesa_common/${__objdir}/libmesa_common.a \
+		${.CURDIR}/../libglsl/${__objdir}/libglsl.a
+
+.if ${WITH_SSE41} == "yes"
+DPADD+=		${.CURDIR}/../libmesa_sse41/${__objdir}/libmesa_sse41.a
+.endif
+
+install:
+
+obj: _xenocara_obj
+
+.include <bsd.lib.mk>
+.include <bsd.xorg.mk>
+
+.PATH:	${MESA_SRC}/src/mesa/math
+.PATH:	${MESA_SRC}/src/mesa/tnl
+.PATH:	${MESA_SRC}/src/mesa/swrast
+.PATH:	${MESA_SRC}/src/mesa/swrast_setup
+.PATH:	${MESA_SRC}/src/mesa/drivers/common
+.PATH:	${MESA_SRC}/src/mesa/x86
+.PATH:	${MESA_SRC}/src/mesa/x86/rtasm
+.PATH:	${MESA_SRC}/src/mesa/sparc
+.PATH:	${MESA_SRC}/src/mesa/x86-64
diff --git a/lib/mesa/mk/libmesa_common/Makefile b/lib/mesa/mk/libmesa_common/Makefile
new file mode 100644
index 000000000..27eb9d9d5
--- /dev/null
+++ b/lib/mesa/mk/libmesa_common/Makefile
@@ -0,0 +1,245 @@
+#	$OpenBSD: Makefile,v 1.1 2020/08/26 06:02:40 jsg Exp $
+
+LIB=	mesa_common
+
+NOPROFILE=
+
+SRCS=	arbprogparse.c \
+	ir_to_mesa.cpp \
+	prog_cache.c \
+	prog_execute.c \
+	prog_instruction.c \
+	prog_noise.c \
+	prog_opt_constant_fold.c \
+	prog_optimize.c \
+	prog_parameter.c \
+	prog_parameter_layout.c \
+	prog_print.c \
+	program.c \
+	programopt.c \
+	program_parse_extra.c \
+	prog_statevars.c \
+	symbol_table.c \
+	prog_to_nir.c \
+	accum.c \
+	api_arrayelt.c \
+	api_loopback.c \
+	arbprogram.c \
+	arrayobj.c \
+	atifragshader.c \
+	attrib.c \
+	barrier.c \
+	bbox.c \
+	blend.c \
+	blit.c \
+	bufferobj.c \
+	buffers.c \
+	clear.c \
+	clip.c \
+	colortab.c \
+	compute.c \
+	condrender.c \
+	conservativeraster.c \
+	context.c \
+	convolve.c \
+	copyimage.c \
+	cpuinfo.c \
+	debug.c \
+	debug_output.c \
+	depth.c \
+	dlist.c \
+	draw.c \
+	drawpix.c \
+	drawtex.c \
+	draw_validate.c \
+	enable.c \
+	errors.c \
+	eval.c \
+	execmem.c \
+	extensions.c \
+	extensions_table.c \
+	externalobjects.c \
+	fbobject.c \
+	feedback.c \
+	ff_fragment_shader.cpp \
+	ffvertex_prog.c \
+	fog.c \
+	formatquery.c \
+	formats.c \
+	format_utils.c \
+	framebuffer.c \
+	get.c \
+	genmipmap.c \
+	getstring.c \
+	glformats.c \
+	glspirv.c \
+	glthread.c \
+	glthread_bufferobj.c \
+	glthread_shaderobj.c \
+	glthread_varray.c \
+	hash.c \
+	hint.c \
+	histogram.c \
+	image.c \
+	light.c \
+	lines.c \
+	matrix.c \
+	mipmap.c \
+	multisample.c \
+	objectlabel.c \
+	objectpurge.c \
+	pack.c \
+	pbo.c \
+	performance_monitor.c \
+	performance_query.c \
+	pipelineobj.c \
+	pixel.c \
+	pixelstore.c \
+	pixeltransfer.c \
+	points.c \
+	polygon.c \
+	program_binary.c \
+	program_resource.c \
+	querymatrix.c \
+	queryobj.c \
+	rastpos.c \
+	readpix.c \
+	remap.c \
+	renderbuffer.c \
+	robustness.c \
+	samplerobj.c \
+	scissor.c \
+	shaderapi.c \
+	shaderimage.c \
+	shaderobj.c \
+	shader_query.cpp \
+	shared.c \
+	spirv_extensions.c \
+	state.c \
+	stencil.c \
+	syncobj.c \
+	texcompress.c \
+	texcompress_astc.cpp \
+	texcompress_bptc.c \
+	texcompress_cpal.c \
+	texcompress_etc.c \
+	texcompress_fxt1.c \
+	texcompress_rgtc.c \
+	texcompress_s3tc.c \
+	texenv.c \
+	texformat.c \
+	texgen.c \
+	texgetimage.c \
+	teximage.c \
+	texobj.c \
+	texparam.c \
+	texstate.c \
+	texstorage.c \
+	texstore.c \
+	texturebindless.c \
+	textureview.c \
+	transformfeedback.c \
+	uniform_query.cpp \
+	uniforms.c \
+	varray.c \
+	vdpau.c \
+	version.c \
+	viewport.c \
+	vtxfmt.c \
+	es1_conversion.c \
+	m_debug_clip.c \
+	m_debug_norm.c \
+	m_debug_xform.c \
+	m_eval.c \
+	m_matrix.c \
+	m_translate.c \
+	m_vector.c \
+	vbo_context.c \
+	vbo_exec_api.c \
+	vbo_exec.c \
+	vbo_exec_draw.c \
+	vbo_exec_eval.c \
+	vbo_minmax_index.c \
+	vbo_noop.c \
+	vbo_primitive_restart.c \
+	vbo_save_api.c \
+	vbo_save.c \
+	vbo_save_draw.c \
+	vbo_save_loopback.c \
+	common_x86.c
+
+.if ${MACHINE_ARCH} == "i386"
+SRCS+=	common_x86_asm.S \
+	x86_xform2.S \
+	x86_xform3.S \
+	x86_xform4.S \
+	x86_cliptest.S \
+	mmx_blend.S \
+	3dnow_xform1.S \
+	3dnow_xform2.S \
+	3dnow_xform3.S \
+	3dnow_xform4.S \
+	sse_xform1.S \
+	sse_xform2.S \
+	sse_xform3.S \
+	sse_xform4.S \
+	sse_normal.S \
+	read_rgba_span_x86.S
+.elif ${MACHINE_ARCH} == "amd64"
+SRCS+=		xform4.S
+CPPFLAGS+=	-I${MESA_SRC}/src/mesa/x86-64
+.elif ${MACHINE_ARCH} == "sparc64"
+SRCS+=		sparc_clip.S \
+		norm.S \
+		xform.S
+CPPFLAGS+=	-I${MESA_SRC}/src/mesa/sparc
+.endif
+
+SRCS+=	format_pack.c \
+	format_unpack.c
+
+SRCS+=	lex.yy.c \
+	program_parse.tab.c \
+	api_exec.c \
+	enums.c \
+	format_fallback.c
+
+.for INDEX in 0 1 2 3 4 5 6 7
+SRCS+=	marshal_generated${INDEX}.c
+.endfor
+
+.include "../Makefile.inc"
+
+CFLAGS+=	${C_VIS_ARGS}
+CXXFLAGS+=	${CXX_VIS_ARGS}
+CPPFLAGS+=	-I${MESA_SRC}/src/mesa \
+		-I${MESA_SRC}/src/mesa/program \
+		-I${MESA_SRC}/src/mesa/main \
+		-I${MESA_SRC}/src/mesa/math \
+		-I${MESA_SRC}/src/mesa/vbo \
+		-I${MESA_SRC}/src/mesa/x86 \
+		-I${MESA_SRC}/src/mapi \
+		-I${MESA_SRC}/src/gallium/include \
+		-I${MESA_SRC}/generated/src \
+		-I${MESA_SRC}/generated/src/mesa \
+		-I${MESA_SRC}/generated/src/mesa/main \
+		-I${MESA_SRC}/generated/src/compiler \
+		-I${MESA_SRC}/generated/src/compiler/nir
+
+install:
+
+obj: _xenocara_obj
+
+.include <bsd.lib.mk>
+.include <bsd.xorg.mk>
+
+.PATH:	${MESA_SRC}/src/mesa/program
+.PATH:	${MESA_SRC}/src/mesa/main
+.PATH:	${MESA_SRC}/src/mesa/math
+.PATH:	${MESA_SRC}/src/mesa/vbo
+.PATH:	${MESA_SRC}/src/mesa/x86
+.PATH:	${MESA_SRC}/src/mesa/x86-64
+.PATH:	${MESA_SRC}/src/mesa/sparc
+.PATH:	${MESA_SRC}/generated/src/mesa
+.PATH:	${MESA_SRC}/generated/src/mesa/program
+.PATH:	${MESA_SRC}/generated/src/mapi/glapi/gen
diff --git a/lib/mesa/mk/libmesa_dri_drivers/Makefile b/lib/mesa/mk/libmesa_dri_drivers/Makefile
new file mode 100644
index 000000000..ae67cbfc1
--- /dev/null
+++ b/lib/mesa/mk/libmesa_dri_drivers/Makefile
@@ -0,0 +1,144 @@
+#	$OpenBSD: Makefile,v 1.1 2020/08/26 06:02:40 jsg Exp $
+
+.include "../Makefile.inc"
+
+LIB=	mesa_dri_drivers
+
+NOPROFILE=
+
+SRCS=
+
+DRI_DRIVERS=
+
+.if ${WITH_DRI_I915} == "yes"
+DRI_DRIVERS+=	i915
+.endif
+
+.if ${WITH_DRI_I965} == "yes"
+DRI_DRIVERS+=	i965
+.endif
+
+.if ${WITH_DRI_R100} == "yes"
+DRI_DRIVERS+=	r100
+.endif
+
+.if ${WITH_DRI_R200} == "yes"
+DRI_DRIVERS+=	r200
+.endif
+
+CPPFLAGS+=
+
+all:	lib${LIB}.so
+
+.include <bsd.dep.mk>
+
+SLIBS=	libmegadriver_stub \
+	libdricommon \
+	libmesa_classic \
+	libmesa_common \
+	libglsl \
+	libglcpp \
+	libmesa_util \
+	libmesa_format \
+	libnir \
+	libcompiler \
+	libxmlconfig
+
+.if ${WITH_SSE41} == "yes"
+SLIBS+=	libmesa_sse41
+.endif
+
+.if ${WITH_DRI_I915} == "yes"
+SLIBS+=	libi915
+.endif
+
+.if ${WITH_DRI_I965} == "yes"
+SLIBS+= libi965_gen40 \
+	libi965_gen45 \
+	libi965_gen50 \
+	libi965_gen60 \
+	libi965_gen70 \
+	libi965_gen75 \
+	libi965_gen80 \
+	libi965_gen90 \
+	libi965_gen100 \
+	libi965_gen110 \
+	libintel_dev \
+	libisl \
+	libisl_gen40 \
+	libisl_gen50 \
+	libisl_gen60 \
+	libisl_gen70 \
+	libisl_gen75 \
+	libisl_gen80 \
+	libisl_gen90 \
+	libisl_gen100 \
+	libisl_gen110 \
+	libisl_gen120 \
+	libisl_tiled_memcpy \
+	libisl_tiled_memcpy_sse41 \
+	libintel_compiler \
+	libblorp \
+	libintel_perf \
+	libintel_common \
+	libi965
+.endif
+
+.if ${WITH_DRI_R100} == "yes"
+SLIBS+=	libr100
+.endif
+
+.if ${WITH_DRI_R200} == "yes"
+SLIBS+=	libr200
+.endif
+
+LDADD+=		-Wl,--as-needed -Wl,--allow-shlib-undefined -Wl,--start-group
+
+LDADD+=		-Wl,--whole-archive
+.for driver in ${DRI_DRIVERS}
+LDADD+=		${.CURDIR}/../lib${driver}/${__objdir}/lib${driver}.a
+.endfor
+LDADD+=		-Wl,--no-whole-archive
+
+.for slib in ${SLIBS}
+LDADD+=		${.CURDIR}/../${slib}/${__objdir}/${slib}.a
+.endfor
+
+LDADD+=		-L${.CURDIR}/../libglapi/${__objdir} -lglapi
+LDADD+=		-lexpat -lz -lm
+LDADD+=		-L${X11BASE}/lib -ldrm
+
+.if ${WITH_DRI_I915} == "yes" || ${WITH_DRI_I965} == "yes"
+LDADD+=		-ldrm_intel
+.endif
+
+.if ${WITH_DRI_R100} == "yes" || ${WITH_DRI_R200} == "yes"
+LDADD+=		-ldrm_radeon
+.endif
+
+LDADD+=		${BUILD_ID_SHA1} -Wl,-Bsymbolic -Wl,--gc-sections \
+		-Wl,--end-group
+
+lib${LIB}.so: ${DPADD}
+	${CXX} -shared -Wl,-soname,lib${LIB}.so ${PICFLAG} -o ${.TARGET} \
+	    ${LDADD}
+
+install: _SUBDIRUSE
+	${INSTALL} ${INSTALL_COPY} ${INSTALL_STRIP} \
+	    -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \
+	    lib${LIB}.so ${DESTDIR}${X11BASE}/lib/modules/dri
+.for driver in ${DRI_DRIVERS}
+.if "${driver}" == "r100"
+	ln -f ${DESTDIR}${X11BASE}/lib/modules/dri/lib${LIB}.so \
+	    ${DESTDIR}${X11BASE}/lib/modules/dri/radeon_dri.so
+.else
+	ln -f ${DESTDIR}${X11BASE}/lib/modules/dri/lib${LIB}.so \
+	    ${DESTDIR}${X11BASE}/lib/modules/dri/${driver}_dri.so
+.endif
+.endfor
+	rm ${DESTDIR}${X11BASE}/lib/modules/dri/lib${LIB}.so
+
+clean: _SUBDIRUSE
+	rm -f lib${LIB}.so
+
+.include <bsd.xorg.mk>
diff --git a/lib/mesa/mk/libmesa_format/Makefile b/lib/mesa/mk/libmesa_format/Makefile
new file mode 100644
index 000000000..e62877521
--- /dev/null
+++ b/lib/mesa/mk/libmesa_format/Makefile
@@ -0,0 +1,36 @@
+#	$OpenBSD: Makefile,v 1.1 2020/08/26 06:02:40 jsg Exp $
+
+LIB=	mesa_format
+
+NOPROFILE=
+
+SRCS=	u_format.c \
+	u_format_bptc.c \
+	u_format_etc.c \
+	u_format_latc.c \
+	u_format_other.c \
+	u_format_rgtc.c \
+	u_format_s3tc.c \
+	u_format_tests.c \
+	u_format_yuv.c \
+	u_format_zs.c
+
+SRCS+=	u_format_table.c
+
+.include "../Makefile.inc"
+
+CFLAGS+=	${C_VIS_ARGS}
+CPPFLAGS+=	-I${MESA_SRC}/src/util/format \
+		-I${MESA_SRC}/src/gallium/include \
+		-I${MESA_SRC}/src/gallium/auxiliary \
+		-I${MESA_SRC}/src/mesa
+
+install:
+
+obj: _xenocara_obj
+
+.include <bsd.lib.mk>
+.include <bsd.xorg.mk>
+
+.PATH:	${MESA_SRC}/src/util/format
+.PATH:	${MESA_SRC}/generated/src/util/format
diff --git a/lib/mesa/mk/libmesa_gallium/Makefile b/lib/mesa/mk/libmesa_gallium/Makefile
new file mode 100644
index 000000000..7b46b2fb3
--- /dev/null
+++ b/lib/mesa/mk/libmesa_gallium/Makefile
@@ -0,0 +1,114 @@
+#	$OpenBSD: Makefile,v 1.1 2020/08/26 06:02:40 jsg Exp $
+
+LIB=	mesa_gallium
+
+NOPROFILE=
+
+SRCS=	st_atifs_to_tgsi.c \
+	st_atom_array.c \
+	st_atom_atomicbuf.c \
+	st_atom_blend.c \
+	st_atom.c \
+	st_atom_clip.c \
+	st_atom_constbuf.c \
+	st_atom_depth.c \
+	st_atom_framebuffer.c \
+	st_atom_image.c \
+	st_atom_msaa.c \
+	st_atom_pixeltransfer.c \
+	st_atom_rasterizer.c \
+	st_atom_sampler.c \
+	st_atom_scissor.c \
+	st_atom_shader.c \
+	st_atom_stipple.c \
+	st_atom_storagebuf.c \
+	st_atom_tess.c \
+	st_atom_texture.c \
+	st_atom_viewport.c \
+	st_cb_bitmap.c \
+	st_cb_bitmap_shader.c \
+	st_cb_blit.c \
+	st_cb_bufferobjects.c \
+	st_cb_clear.c \
+	st_cb_compute.c \
+	st_cb_condrender.c \
+	st_cb_copyimage.c \
+	st_cb_drawpixels.c \
+	st_cb_drawpixels_shader.c \
+	st_cb_drawtex.c \
+	st_cb_eglimage.c \
+	st_cb_fbo.c \
+	st_cb_feedback.c \
+	st_cb_flush.c \
+	st_cb_memoryobjects.c \
+	st_cb_msaa.c \
+	st_cb_perfmon.c \
+	st_cb_perfquery.c \
+	st_cb_program.c \
+	st_cb_queryobj.c \
+	st_cb_rasterpos.c \
+	st_cb_readpixels.c \
+	st_cb_strings.c \
+	st_cb_semaphoreobjects.c \
+	st_cb_syncobj.c \
+	st_cb_texturebarrier.c \
+	st_cb_texture.c \
+	st_cb_viewport.c \
+	st_cb_xformfb.c \
+	st_context.c \
+	st_copytex.c \
+	st_debug.c \
+	st_draw.c \
+	st_draw_feedback.c \
+	st_extensions.c \
+	st_format.c \
+	st_gen_mipmap.c \
+	st_glsl_to_ir.cpp \
+	st_glsl_to_nir.cpp \
+	st_glsl_to_tgsi.cpp \
+	st_glsl_to_tgsi_array_merge.cpp \
+	st_glsl_to_tgsi_private.cpp \
+	st_glsl_to_tgsi_temprename.cpp \
+	st_manager.c \
+	st_mesa_to_tgsi.c \
+	st_nir_builtins.c \
+	st_nir_lower_builtin.c \
+	st_nir_lower_tex_src_plane.c \
+	st_pbo.c \
+	st_program.c \
+	st_sampler_view.c \
+	st_scissor.c \
+	st_shader_cache.c \
+	st_texture.c \
+	st_tgsi_lower_depth_clamp.c \
+	st_tgsi_lower_yuv.c \
+	st_vdpau.c
+
+.include "../Makefile.inc"
+
+CFLAGS+=	${C_VIS_ARGS}
+CXXFLAGS+=	${CXX_VIS_ARGS}
+CPPFLAGS+=	-I${MESA_SRC}/src/mesa/state_tracker \
+		-I${MESA_SRC}/src/mesa \
+		-I${MESA_SRC}/src/mesa/main \
+		-I${MESA_SRC}/src/mapi \
+		-I${MESA_SRC}/src/gallium/include \
+		-I${MESA_SRC}/src/gallium/auxiliary \
+		-I${MESA_SRC}/generated/src/compiler \
+		-I${MESA_SRC}/generated/src/compiler/nir
+
+DPADD+=		${.CURDIR}/../libmesa_common/${__objdir}/libmesa_common.a \
+		${.CURDIR}/../libglsl/${__objdir}/libglsl.a
+
+.if ${WITH_SSE41} == "yes"
+DPADD+=		${.CURDIR}/../libmesa_sse41/${__objdir}/libmesa_sse41.a
+.endif
+
+install:
+
+obj: _xenocara_obj
+
+.include <bsd.lib.mk>
+.include <bsd.xorg.mk>
+
+.PATH:	${MESA_SRC}/src/mesa/state_tracker
diff --git a/lib/mesa/mk/libmesa_sse41/Makefile b/lib/mesa/mk/libmesa_sse41/Makefile
new file mode 100644
index 000000000..2d99f86f2
--- /dev/null
+++ b/lib/mesa/mk/libmesa_sse41/Makefile
@@ -0,0 +1,27 @@
+#	$OpenBSD: Makefile,v 1.1 2020/08/26 06:02:40 jsg Exp $
+
+LIB=	mesa_sse41
+
+NOPROFILE=
+
+.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "amd64"
+SRCS=		streaming-load-memcpy.c \
+		sse_minmax.c
+CFLAGS+=	${SSE41_ARGS}
+.else
+SRCS=
+.endif
+
+.include "../Makefile.inc"
+
+CFLAGS+=	${C_VIS_ARGS}
+CPPFLAGS+=	-I${MESA_SRC}/src/mesa
+
+install:
+
+obj: _xenocara_obj
+
+.include <bsd.lib.mk>
+.include <bsd.xorg.mk>
+
+.PATH:	${MESA_SRC}/src/mesa/main
diff --git a/lib/mesa/mk/libmesa_util/Makefile b/lib/mesa/mk/libmesa_util/Makefile
new file mode 100644
index 000000000..51539abab
--- /dev/null
+++ b/lib/mesa/mk/libmesa_util/Makefile
@@ -0,0 +1,66 @@
+#	$OpenBSD: Makefile,v 1.1 2020/08/26 06:02:40 jsg Exp $
+
+LIB=	mesa_util
+
+NOPROFILE=
+
+SRCS=	anon_file.c \
+	bitscan.c \
+	blob.c \
+	build_id.c \
+	crc32.c \
+	dag.c \
+	debug.c \
+	disk_cache.c \
+	double.c \
+	fast_idiv_by_const.c \
+	half_float.c \
+	hash_table.c \
+	mesa-sha1.c \
+	os_file.c \
+	os_misc.c \
+	os_socket.c \
+	os_time.c \
+	ralloc.c \
+	rand_xor.c \
+	rb_tree.c \
+	register_allocate.c \
+	rgtc.c \
+	set.c \
+	sha1.c \
+	slab.c \
+	softfloat.c \
+	sparse_array.c \
+	string_buffer.c \
+	strtod.c \
+	u_atomic.c \
+	u_cpu_detect.c \
+	u_debug.c \
+	u_debug_memory.c \
+	u_math.c \
+	u_mm.c \
+	u_process.c \
+	u_queue.c \
+	u_vector.c \
+	vma.c
+
+SRCS+=	format_srgb.c
+
+.include "../Makefile.inc"
+
+CFLAGS+=	${C_VIS_ARGS}
+CPPFLAGS+=	-I${MESA_SRC}/src/util \
+		-I${MESA_SRC}/src/mesa \
+		-I${MESA_SRC}/src/gallium/include \
+		-I${MESA_SRC}/src/gallium/auxiliary
+
+install:
+
+obj: _xenocara_obj
+
+.include <bsd.lib.mk>
+.include <bsd.xorg.mk>
+
+.PATH: ${MESA_SRC}/src/util
+.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
new file mode 100644
index 000000000..319885a26
--- /dev/null
+++ b/lib/mesa/mk/libnir/Makefile
@@ -0,0 +1,174 @@
+#	$OpenBSD: Makefile,v 1.1 2020/08/26 06:02:40 jsg Exp $
+
+LIB=	nir
+
+NOPROFILE=
+
+SRCS=	nir.c \
+	nir_builtin_builder.c \
+	nir_clone.c \
+	nir_control_flow.c \
+	nir_convert_ycbcr.c \
+	nir_deref.c \
+	nir_divergence_analysis.c \
+	nir_dominance.c \
+	nir_from_ssa.c \
+	nir_gather_info.c \
+	nir_gather_ssa_types.c \
+	nir_gather_xfb_info.c \
+	nir_gs_count_vertices.c \
+	nir_inline_functions.c \
+	nir_instr_set.c \
+	nir_linking_helpers.c \
+	nir_liveness.c \
+	nir_loop_analyze.c \
+	nir_lower_alu.c \
+	nir_lower_alu_to_scalar.c \
+	nir_lower_alpha_test.c \
+	nir_lower_amul.c \
+	nir_lower_array_deref_of_vec.c \
+	nir_lower_atomics_to_ssbo.c \
+	nir_lower_bitmap.c \
+	nir_lower_bool_to_bitsize.c \
+	nir_lower_bool_to_float.c \
+	nir_lower_bool_to_int32.c \
+	nir_lower_clamp_color_outputs.c \
+	nir_lower_clip.c \
+	nir_lower_clip_cull_distance_arrays.c \
+	nir_lower_clip_halfz.c \
+	nir_lower_variable_initializers.c \
+	nir_lower_discard_to_demote.c \
+	nir_lower_double_ops.c \
+	nir_lower_drawpixels.c \
+	nir_lower_fb_read.c \
+	nir_lower_flatshade.c \
+	nir_lower_flrp.c \
+	nir_lower_fragcoord_wtrans.c \
+	nir_lower_frexp.c \
+	nir_lower_global_vars_to_local.c \
+	nir_lower_gs_intrinsics.c \
+	nir_lower_load_const_to_scalar.c \
+	nir_lower_locals_to_regs.c \
+	nir_lower_idiv.c \
+	nir_lower_indirect_derefs.c \
+	nir_lower_input_attachments.c \
+	nir_lower_int64.c \
+	nir_lower_interpolation.c \
+	nir_lower_int_to_float.c \
+	nir_lower_io.c \
+	nir_lower_io_arrays_to_elements.c \
+	nir_lower_io_to_temporaries.c \
+	nir_lower_io_to_scalar.c \
+	nir_lower_io_to_vector.c \
+	nir_lower_mediump_outputs.c \
+	nir_lower_non_uniform_access.c \
+	nir_lower_packing.c \
+	nir_lower_passthrough_edgeflags.c \
+	nir_lower_patch_vertices.c \
+	nir_lower_phis_to_scalar.c \
+	nir_lower_point_size.c \
+	nir_lower_point_size_mov.c \
+	nir_lower_regs_to_ssa.c \
+	nir_lower_returns.c \
+	nir_lower_samplers.c \
+	nir_lower_scratch.c \
+	nir_lower_ssbo.c \
+	nir_lower_subgroups.c \
+	nir_lower_system_values.c \
+	nir_lower_tex.c \
+	nir_lower_to_source_mods.c \
+	nir_lower_two_sided_color.c \
+	nir_lower_vars_to_ssa.c \
+	nir_lower_var_copies.c \
+	nir_lower_vec_to_movs.c \
+	nir_lower_viewport_transform.c \
+	nir_lower_wpos_center.c \
+	nir_lower_wpos_ytransform.c \
+	nir_lower_bit_size.c \
+	nir_lower_uniforms_to_ubo.c \
+	nir_metadata.c \
+	nir_move_vec_src_uses_to_dest.c \
+	nir_normalize_cubemap_coords.c \
+	nir_opt_access.c \
+	nir_opt_barriers.c \
+	nir_opt_combine_stores.c \
+	nir_opt_comparison_pre.c \
+	nir_opt_conditional_discard.c \
+	nir_opt_constant_folding.c \
+	nir_opt_copy_prop_vars.c \
+	nir_opt_copy_propagate.c \
+	nir_opt_cse.c \
+	nir_opt_dce.c \
+	nir_opt_dead_cf.c \
+	nir_opt_dead_write_vars.c \
+	nir_opt_find_array_copies.c \
+	nir_opt_gcm.c \
+	nir_opt_idiv_const.c \
+	nir_opt_if.c \
+	nir_opt_intrinsics.c \
+	nir_opt_large_constants.c \
+	nir_opt_load_store_vectorize.c \
+	nir_opt_loop_unroll.c \
+	nir_opt_move.c \
+	nir_opt_peephole_select.c \
+	nir_opt_rematerialize_compares.c \
+	nir_opt_remove_phis.c \
+	nir_opt_shrink_load.c \
+	nir_opt_sink.c \
+	nir_opt_trivial_continues.c \
+	nir_opt_undef.c \
+	nir_opt_vectorize.c \
+	nir_phi_builder.c \
+	nir_print.c \
+	nir_propagate_invariant.c \
+	nir_range_analysis.c \
+	nir_remove_dead_variables.c \
+	nir_repair_ssa.c \
+	nir_schedule.c \
+	nir_search.c \
+	nir_serialize.c \
+	nir_split_per_member_structs.c \
+	nir_split_var_copies.c \
+	nir_split_vars.c \
+	nir_sweep.c \
+	nir_to_lcssa.c \
+	nir_validate.c \
+	nir_worklist.c \
+	gl_spirv.c \
+	spirv_to_nir.c \
+	vtn_alu.c \
+	vtn_amd.c \
+	vtn_cfg.c \
+	vtn_glsl450.c \
+	vtn_opencl.c \
+	vtn_subgroup.c \
+	vtn_variables.c
+
+SRCS+=	spirv_info.c \
+	nir_opt_algebraic.c \
+	nir_opcodes.c \
+	nir_constant_expressions.c \
+	vtn_gather_types.c \
+	nir_intrinsics.c
+
+.include "../Makefile.inc"
+
+CFLAGS+=	${C_VIS_ARGS} ${NO_OVERRIDE_INIT_ARGS}
+CPPFLAGS+=	-I${MESA_SRC}/src/compiler/nir \
+		-I${MESA_SRC}/src/compiler/spirv \
+		-I${MESA_SRC}/src/compiler \
+		-I${MESA_SRC}/src/gallium/include \
+		-I${MESA_SRC}/src/mesa \
+		-I${MESA_SRC}/generated/src/compiler/nir
+
+install:
+
+obj: _xenocara_obj
+
+.include <bsd.lib.mk>
+.include <bsd.xorg.mk>
+
+.PATH:	${MESA_SRC}/src/compiler/nir
+.PATH:	${MESA_SRC}/src/compiler/spirv
+.PATH:	${MESA_SRC}/generated/src/compiler/nir
+.PATH:	${MESA_SRC}/generated/src/compiler/spirv
diff --git a/lib/mesa/mk/libpipe_loader_static/Makefile b/lib/mesa/mk/libpipe_loader_static/Makefile
new file mode 100644
index 000000000..42625fed0
--- /dev/null
+++ b/lib/mesa/mk/libpipe_loader_static/Makefile
@@ -0,0 +1,36 @@
+#	$OpenBSD: Makefile,v 1.1 2020/08/26 06:02:40 jsg Exp $
+
+.include <bsd.xconf.mk>
+
+LIB=	pipe_loader_static
+
+NOPROFILE=
+
+SRCS=	pipe_loader.c \
+	pipe_loader_drm.c \
+	pipe_loader_sw.c
+
+.include "../Makefile.inc"
+
+CFLAGS+=	${C_VIS_ARGS}
+.if ${XENOCARA_BUILD_DRI:L} == "yes"
+CPPFLAGS+=	-DHAVE_PIPE_LOADER_DRI \
+		-DHAVE_PIPE_LOADER_KMS
+.endif
+CPPFLAGS+=	-DDROP_PIPE_LOADER_MISC \
+		-DGALLIUM_STATIC_TARGETS=1 \
+		-I${MESA_SRC}/src/gallium/include \
+		-I${MESA_SRC}/src/gallium/auxiliary \
+		-I${MESA_SRC}/src/gallium/auxiliary/pipe-loader \
+		-I${MESA_SRC}/src/gallium/winsys \
+		-I${MESA_SRC}/src/loader \
+		-I${MESA_SRC}/generated/src/util
+
+install:
+
+obj: _xenocara_obj
+
+.include <bsd.lib.mk>
+.include <bsd.xorg.mk>
+
+.PATH:	${MESA_SRC}/src/gallium/auxiliary/pipe-loader
diff --git a/lib/mesa/mk/libr100/Makefile b/lib/mesa/mk/libr100/Makefile
new file mode 100644
index 000000000..605c2194b
--- /dev/null
+++ b/lib/mesa/mk/libr100/Makefile
@@ -0,0 +1,52 @@
+#	$OpenBSD: Makefile,v 1.1 2020/08/26 06:02:40 jsg Exp $
+
+LIB=	r100
+
+NOPROFILE=
+
+SRCS=	radeon_blit.c \
+	radeon_buffer_objects.c \
+	radeon_common.c \
+	radeon_common_context.c \
+	radeon_context.c \
+	radeon_debug.c \
+	radeon_dma.c \
+	radeon_fbo.c \
+	radeon_fog.c \
+	radeon_ioctl.c \
+	radeon_maos.c \
+	radeon_mipmap_tree.c \
+	radeon_pixel_read.c \
+	radeon_queryobj.c \
+	radeon_sanity.c \
+	radeon_screen.c \
+	radeon_span.c \
+	radeon_state.c \
+	radeon_state_init.c \
+	radeon_swtcl.c \
+	radeon_tcl.c \
+	radeon_tex.c \
+	radeon_tex_copy.c \
+	radeon_texstate.c \
+	radeon_texture.c \
+	radeon_tile.c
+
+.include "../Makefile.inc"
+
+CFLAGS+=	${C_VIS_ARGS}
+CPPFLAGS+=	-DRADEON_R100 \
+		-I${MESA_SRC}/src/mesa/drivers/dri/radeon \
+		-I${MESA_SRC}/src/mesa/drivers/dri/radeon/server \
+		-I${MESA_SRC}/src/mesa/drivers/dri/common \
+		-I${MESA_SRC}/src/mesa \
+		-I${MESA_SRC}/src/mapi \
+		-I${MESA_SRC}/generated/src/util
+
+install:
+
+obj: _xenocara_obj
+
+.include <bsd.lib.mk>
+.include <bsd.xorg.mk>
+
+.PATH: ${MESA_SRC}/src/mesa/drivers/dri/radeon
diff --git a/lib/mesa/mk/libr200/Makefile b/lib/mesa/mk/libr200/Makefile
new file mode 100644
index 000000000..22ea92ff6
--- /dev/null
+++ b/lib/mesa/mk/libr200/Makefile
@@ -0,0 +1,55 @@
+#	$OpenBSD: Makefile,v 1.1 2020/08/26 06:02:40 jsg Exp $
+
+LIB=	r200
+
+NOPROFILE=
+
+SRCS=	radeon_buffer_objects.c \
+	radeon_common.c \
+	radeon_common_context.c \
+	radeon_debug.c \
+	radeon_dma.c \
+	radeon_fbo.c \
+	radeon_fog.c \
+	radeon_mipmap_tree.c \
+	radeon_pixel_read.c \
+	radeon_queryobj.c \
+	radeon_span.c \
+	radeon_tex_copy.c \
+	radeon_texture.c \
+	radeon_tile.c \
+	r200_blit.c \
+	r200_cmdbuf.c \
+	r200_context.c \
+	r200_fragshader.c \
+	r200_ioctl.c \
+	r200_maos.c \
+	r200_sanity.c \
+	r200_state.c \
+	r200_state_init.c \
+	r200_swtcl.c \
+	r200_tcl.c \
+	r200_tex.c \
+	r200_texstate.c \
+	r200_vertprog.c \
+	radeon_screen.c
+
+.include "../Makefile.inc"
+
+CFLAGS+=	${C_VIS_ARGS}
+CPPFLAGS+=	-DRADEON_R200 \
+		-I${MESA_SRC}/src/mesa/drivers/dri/r200 \
+		-I${MESA_SRC}/src/mesa/drivers/dri/r200/server \
+		-I${MESA_SRC}/src/mesa/drivers/dri/common \
+		-I${MESA_SRC}/src/mesa \
+		-I${MESA_SRC}/src/mapi \
+		-I${MESA_SRC}/generated/src/util
+
+install:
+
+obj: _xenocara_obj
+
+.include <bsd.lib.mk>
+.include <bsd.xorg.mk>
+
+.PATH: ${MESA_SRC}/src/mesa/drivers/dri/r200
diff --git a/lib/mesa/mk/libr300/Makefile b/lib/mesa/mk/libr300/Makefile
new file mode 100644
index 000000000..36d13936f
--- /dev/null
+++ b/lib/mesa/mk/libr300/Makefile
@@ -0,0 +1,83 @@
+#	$OpenBSD: Makefile,v 1.1 2020/08/26 06:02:40 jsg Exp $
+
+LIB=	r300
+
+NOPROFILE=
+
+SRCS=	r300_blit.c \
+	r300_chipset.c \
+	r300_context.c \
+	r300_debug.c \
+	r300_emit.c \
+	r300_flush.c \
+	r300_fs.c \
+	r300_hyperz.c \
+	r300_query.c \
+	r300_render.c \
+	r300_render_stencilref.c \
+	r300_render_translate.c \
+	r300_resource.c \
+	r300_screen_buffer.c \
+	r300_screen.c \
+	r300_state.c \
+	r300_state_derived.c \
+	r300_texture.c \
+	r300_texture_desc.c \
+	r300_tgsi_to_rc.c \
+	r300_transfer.c \
+	r300_vs.c \
+	r300_vs_draw.c \
+	memory_pool.c \
+	r300_fragprog.c \
+	r300_fragprog_emit.c \
+	r300_fragprog_swizzle.c \
+	r3xx_fragprog.c \
+	r3xx_vertprog.c \
+	r3xx_vertprog_dump.c \
+	r500_fragprog.c \
+	r500_fragprog_emit.c \
+	radeon_code.c \
+	radeon_compiler.c \
+	radeon_compiler_util.c \
+	radeon_dataflow.c \
+	radeon_dataflow_deadcode.c \
+	radeon_dataflow_swizzles.c \
+	radeon_emulate_branches.c \
+	radeon_emulate_loops.c \
+	radeon_inline_literals.c \
+	radeon_list.c \
+	radeon_opcodes.c \
+	radeon_optimize.c \
+	radeon_pair_dead_sources.c \
+	radeon_pair_regalloc.c \
+	radeon_pair_schedule.c \
+	radeon_pair_translate.c \
+	radeon_program_alu.c \
+	radeon_program.c \
+	radeon_program_pair.c \
+	radeon_program_print.c \
+	radeon_program_tex.c \
+	radeon_remove_constants.c \
+	radeon_rename_regs.c \
+	radeon_variable.c \
+	radeon_vert_fc.c
+
+.include "../Makefile.inc"
+
+CFLAGS+=	${C_VIS_ARGS}
+CPPFLAGS+=	-DGALLIUM_R300 \
+		-I${MESA_SRC}/src/gallium/drivers/r300 \
+		-I${MESA_SRC}/src/gallium/include \
+		-I${MESA_SRC}/src/gallium/auxiliary \
+		-I${MESA_SRC}/src/gallium/drivers \
+		-I${MESA_SRC}/src/mesa
+
+install:
+
+obj: _xenocara_obj
+
+.include <bsd.lib.mk>
+.include <bsd.xorg.mk>
+
+.PATH: ${MESA_SRC}/src/gallium/drivers/r300
+.PATH: ${MESA_SRC}/src/gallium/drivers/r300/compiler
diff --git a/lib/mesa/mk/libr600/Makefile b/lib/mesa/mk/libr600/Makefile
new file mode 100644
index 000000000..98c793b16
--- /dev/null
+++ b/lib/mesa/mk/libr600/Makefile
@@ -0,0 +1,124 @@
+#	$OpenBSD: Makefile,v 1.1 2020/08/26 06:02:40 jsg Exp $
+
+LIB=	r600
+
+NOPROFILE=
+
+SRCS=	compute_memory_pool.c \
+	eg_asm.c \
+	eg_debug.c \
+	evergreen_compute.c \
+	evergreen_hw_context.c \
+	evergreen_state.c \
+	r600_asm.c \
+	r600_blit.c \
+	r600_dump.c \
+	r600_hw_context.c \
+	r600_isa.c \
+	r600_pipe.c \
+	r600_shader.c \
+	r600_state.c \
+	r600_state_common.c \
+	r600_uvd.c \
+	r700_asm.c \
+	cayman_msaa.c \
+	r600_buffer_common.c \
+	r600_gpu_load.c \
+	r600_perfcounter.c \
+	r600_pipe_common.c \
+	r600_query.c \
+	r600_streamout.c \
+	r600_test_dma.c \
+	r600_texture.c \
+	r600_viewport.c \
+	radeon_uvd.c \
+	radeon_vce.c \
+	radeon_video.c \
+	sb_bc_builder.cpp \
+	sb_bc_decoder.cpp \
+	sb_bc_dump.cpp \
+	sb_bc_finalize.cpp \
+	sb_bc_parser.cpp \
+	sb_context.cpp \
+	sb_core.cpp \
+	sb_dce_cleanup.cpp \
+	sb_def_use.cpp \
+	sb_dump.cpp \
+	sb_expr.cpp \
+	sb_gcm.cpp \
+	sb_gvn.cpp \
+	sb_if_conversion.cpp \
+	sb_ir.cpp \
+	sb_liveness.cpp \
+	sb_pass.cpp \
+	sb_peephole.cpp \
+	sb_psi_ops.cpp \
+	sb_ra_checker.cpp \
+	sb_ra_coalesce.cpp \
+	sb_ra_init.cpp \
+	sb_sched.cpp \
+	sb_shader.cpp \
+	sb_ssa_builder.cpp \
+	sb_valtable.cpp \
+	sfn_alu_defines.cpp \
+	sfn_callstack.cpp \
+	sfn_conditionaljumptracker.cpp \
+	sfn_debug.cpp \
+	sfn_emitaluinstruction.cpp \
+	sfn_emitinstruction.cpp \
+	sfn_emitssboinstruction.cpp \
+	sfn_emittexinstruction.cpp \
+	sfn_instruction_alu.cpp \
+	sfn_instruction_base.cpp \
+	sfn_instruction_block.cpp \
+	sfn_instruction_cf.cpp \
+	sfn_instruction_export.cpp \
+	sfn_instruction_fetch.cpp \
+	sfn_instruction_gds.cpp \
+	sfn_instruction_lds.cpp \
+	sfn_instruction_misc.cpp \
+	sfn_instruction_tex.cpp \
+	sfn_ir_to_assembly.cpp \
+	sfn_liverange.cpp \
+	sfn_nir.cpp \
+	sfn_nir_lower_fs_out_to_vector.cpp \
+	sfn_nir_lower_tess_io.cpp \
+	sfn_nir_vectorize_vs_inputs.c \
+	sfn_shader_base.cpp \
+	sfn_shader_compute.cpp \
+	sfn_shader_fragment.cpp \
+	sfn_shader_geometry.cpp \
+	sfn_shader_tcs.cpp \
+	sfn_shader_tess_eval.cpp \
+	sfn_shader_vertex.cpp \
+	sfn_shaderio.cpp \
+	sfn_value.cpp \
+	sfn_value_gpr.cpp \
+	sfn_valuepool.cpp \
+	sfn_vertexstageexport.cpp
+
+.include "../Makefile.inc"
+
+CFLAGS+=	${C_VIS_ARGS}
+CXXFLAGS+=	${CXX_VIS_ARGS}
+CPPFLAGS+=	-DGALLIUM_R600 \
+		-I${MESA_SRC}/src/gallium/drivers/r600 \
+		-I${MESA_SRC}/src/gallium/include \
+		-I${MESA_SRC}/src/gallium/auxiliary \
+		-I${MESA_SRC}/src/gallium/drivers \
+		-I${MESA_SRC}/src/mesa \
+		-I${MESA_SRC}/src/amd/common \
+		-I${MESA_SRC}/src/compiler/nir \
+		-I${MESA_SRC}/generated/src/gallium/drivers/r600 \
+		-I${MESA_SRC}/generated/src/compiler/nir
+
+install:
+
+obj: _xenocara_obj
+
+.include <bsd.lib.mk>
+.include <bsd.xorg.mk>
+
+.PATH: ${MESA_SRC}/src/gallium/drivers/r600
+.PATH: ${MESA_SRC}/src/gallium/drivers/r600/sb
+.PATH: ${MESA_SRC}/src/gallium/drivers/r600/sfn
diff --git a/lib/mesa/mk/libradeonsi/Makefile b/lib/mesa/mk/libradeonsi/Makefile
new file mode 100644
index 000000000..4671d2c42
--- /dev/null
+++ b/lib/mesa/mk/libradeonsi/Makefile
@@ -0,0 +1,87 @@
+#	$OpenBSD: Makefile,v 1.1 2020/08/26 06:02:40 jsg Exp $
+
+LIB=	radeonsi
+
+NOPROFILE=
+
+SRCS=	cik_sdma.c \
+	gfx10_query.c \
+	gfx10_shader_ngg.c \
+	si_blit.c \
+	si_buffer.c \
+	si_clear.c \
+	si_compute.c \
+	si_compute_prim_discard.c \
+	si_compute_blit.c \
+	si_cp_dma.c \
+	si_debug.c \
+	si_descriptors.c \
+	si_dma_cs.c \
+	si_fence.c \
+	si_get.c \
+	si_gfx_cs.c \
+	si_gpu_load.c \
+	si_perfcounter.c \
+	si_pipe.c \
+	si_pm4.c \
+	si_query.c \
+	si_shader.c \
+	si_shader_llvm.c \
+	si_shader_llvm_gs.c \
+	si_shader_llvm_ps.c \
+	si_shader_llvm_resources.c \
+	si_shader_llvm_tess.c \
+	si_shader_llvm_vs.c \
+	si_shader_nir.c \
+	si_shaderlib_tgsi.c \
+	si_state.c \
+	si_state_binning.c \
+	si_state_draw.c \
+	si_state_msaa.c \
+	si_state_shaders.c \
+	si_state_streamout.c \
+	si_state_viewport.c \
+	si_test_dma.c \
+	si_test_dma_perf.c \
+	si_texture.c \
+	si_uvd.c \
+	radeon_uvd.c \
+	radeon_vcn_enc_1_2.c \
+	radeon_vcn_enc_2_0.c \
+	radeon_vcn_enc.c \
+	radeon_vcn_dec_jpeg.c \
+	radeon_vcn_dec.c \
+	radeon_uvd_enc_1_1.c \
+	radeon_uvd_enc.c \
+	radeon_vce_40_2_2.c \
+	radeon_vce_50.c \
+	radeon_vce_52.c \
+	radeon_vce.c \
+	radeon_video.c
+
+.include "../Makefile.inc"
+
+CFLAGS+=	${C_VIS_ARGS}
+CXXFLAGS+=	${CXX_VIS_ARGS}
+CPPFLAGS+=	-DGALLIUM_RADEONSI \
+		-I${MESA_SRC}/src/gallium/drivers/radeonsi \
+		-I${MESA_SRC}/src/gallium/include \
+		-I${MESA_SRC}/src/gallium/auxiliary \
+		-I${MESA_SRC}/src/gallium/drivers \
+		-I${MESA_SRC}/src/mesa \
+		-I${MESA_SRC}/src/amd/common \
+		-I${MESA_SRC}/src/amd/llvm \
+		-I${MESA_SRC}/src/compiler/nir \
+		-I${MESA_SRC}/generated/src/compiler/nir \
+		-I${MESA_SRC}/generated/src/amd/common \
+		-I${MESA_SRC}/generated/src/gallium/drivers/radeonsi
+
+install:
+
+obj: _xenocara_obj
+
+.include <bsd.lib.mk>
+.include <bsd.xorg.mk>
+
+.PATH: ${MESA_SRC}/src/gallium/drivers/radeonsi
+.PATH: ${MESA_SRC}/src/gallium/drivers/radeon
diff --git a/lib/mesa/mk/libradeonwinsys/Makefile b/lib/mesa/mk/libradeonwinsys/Makefile
new file mode 100644
index 000000000..4f39f9fd8
--- /dev/null
+++ b/lib/mesa/mk/libradeonwinsys/Makefile
@@ -0,0 +1,26 @@
+#	$OpenBSD: Makefile,v 1.1 2020/08/26 06:02:40 jsg Exp $
+
+LIB=	radeonwinsys
+
+NOPROFILE=
+
+SRCS=	radeon_drm_bo.c \
+	radeon_drm_cs.c \
+	radeon_drm_surface.c \
+	radeon_drm_winsys.c
+
+.include "../Makefile.inc"
+
+CFLAGS+=	${C_VIS_ARGS}
+CPPFLAGS+=	-I${MESA_SRC}/src/gallium/include \
+		-I${MESA_SRC}/src/gallium/auxiliary \
+		-I${MESA_SRC}/src/gallium/winsys/radeon/drm
+
+install:
+
+obj: _xenocara_obj
+
+.include <bsd.lib.mk>
+.include <bsd.xorg.mk>
+
+.PATH: ${MESA_SRC}/src/gallium/winsys/radeon/drm
diff --git a/lib/mesa/mk/libsoftpipe/Makefile b/lib/mesa/mk/libsoftpipe/Makefile
new file mode 100644
index 000000000..05230beab
--- /dev/null
+++ b/lib/mesa/mk/libsoftpipe/Makefile
@@ -0,0 +1,55 @@
+#	$OpenBSD: Makefile,v 1.1 2020/08/26 06:02:41 jsg Exp $
+
+LIB=	softpipe
+
+NOPROFILE=
+
+SRCS=	sp_buffer.c \
+	sp_clear.c \
+	sp_compute.c \
+	sp_context.c \
+	sp_draw_arrays.c \
+	sp_fence.c \
+	sp_flush.c \
+	sp_fs_exec.c \
+	sp_image.c \
+	sp_prim_vbuf.c \
+	sp_quad_blend.c \
+	sp_quad_depth_test.c \
+	sp_quad_fs.c \
+	sp_quad_pipe.c \
+	sp_quad_stipple.c \
+	sp_query.c \
+	sp_screen.c \
+	sp_setup.c \
+	sp_state_blend.c \
+	sp_state_clip.c \
+	sp_state_derived.c \
+	sp_state_image.c \
+	sp_state_rasterizer.c \
+	sp_state_sampler.c \
+	sp_state_shader.c \
+	sp_state_so.c \
+	sp_state_surface.c \
+	sp_state_vertex.c \
+	sp_surface.c \
+	sp_tex_sample.c \
+	sp_tex_tile_cache.c \
+	sp_texture.c \
+	sp_tile_cache.c
+
+.include "../Makefile.inc"
+
+CFLAGS+=	${C_VIS_ARGS}
+CPPFLAGS+=	-I${MESA_SRC}/src/gallium/include \
+		-I${MESA_SRC}/src/gallium/auxiliary \
+		-I${MESA_SRC}/src/gallium/drivers/softpipe
+
+install:
+
+obj: _xenocara_obj
+
+.include <bsd.lib.mk>
+.include <bsd.xorg.mk>
+
+.PATH: ${MESA_SRC}/src/gallium/drivers/softpipe
diff --git a/lib/mesa/mk/libswdri/Makefile b/lib/mesa/mk/libswdri/Makefile
new file mode 100644
index 000000000..16c227dae
--- /dev/null
+++ b/lib/mesa/mk/libswdri/Makefile
@@ -0,0 +1,22 @@
+#	$OpenBSD: Makefile,v 1.1 2020/08/26 06:02:41 jsg Exp $
+
+LIB=	swdri
+
+NOPROFILE=
+
+SRCS=	dri_sw_winsys.c
+
+.include "../Makefile.inc"
+
+CFLAGS+=	${C_VIS_ARGS}
+CPPFLAGS+=	-I${MESA_SRC}/src/gallium/include \
+		-I${MESA_SRC}/src/gallium/auxiliary
+
+install:
+
+obj: _xenocara_obj
+
+.include <bsd.lib.mk>
+.include <bsd.xorg.mk>
+
+.PATH: ${MESA_SRC}/src/gallium/winsys/sw/dri
diff --git a/lib/mesa/mk/libswkmsdri/Makefile b/lib/mesa/mk/libswkmsdri/Makefile
new file mode 100644
index 000000000..5a1de356e
--- /dev/null
+++ b/lib/mesa/mk/libswkmsdri/Makefile
@@ -0,0 +1,22 @@
+#	$OpenBSD: Makefile,v 1.1 2020/08/26 06:02:41 jsg Exp $
+
+LIB=	swkmsdri
+
+NOPROFILE=
+
+SRCS=	kms_dri_sw_winsys.c
+
+.include "../Makefile.inc"
+
+CFLAGS+=	${C_VIS_ARGS}
+CPPFLAGS+=	-I${MESA_SRC}/src/gallium/include \
+		-I${MESA_SRC}/src/gallium/auxiliary
+
+install:
+
+obj: _xenocara_obj
+
+.include <bsd.lib.mk>
+.include <bsd.xorg.mk>
+
+.PATH: ${MESA_SRC}/src/gallium/winsys/sw/kms-dri
diff --git a/lib/mesa/mk/libvulkan_intel/Makefile b/lib/mesa/mk/libvulkan_intel/Makefile
new file mode 100644
index 000000000..96b84881e
--- /dev/null
+++ b/lib/mesa/mk/libvulkan_intel/Makefile
@@ -0,0 +1,102 @@
+#	$OpenBSD: Makefile,v 1.1 2020/08/26 06:02:41 jsg Exp $
+
+LIB=	vulkan_intel
+
+NOPROFILE=
+
+SRCS=	anv_gem.c
+
+.include "../Makefile.inc"
+
+CFLAGS+=	${C_VIS_ARGS} ${NO_OVERRIDE_INIT_ARGS} ${C_SSE2_ARGS}
+
+CPPFLAGS+=	-I${MESA_SRC}/src/gallium/include \
+		-I${MESA_SRC}/src/vulkan/wsi \
+		-I${MESA_SRC}/src/vulkan/util \
+		-I${MESA_SRC}/src/compiler \
+		-I${MESA_SRC}/src/intel \
+		-I${MESA_SRC}/src/intel/vulkan \
+		-I${MESA_SRC}/src/mesa \
+		-I${MESA_SRC}/src/mapi \
+		-I${MESA_SRC}/generated/src/intel/vulkan \
+		-DVK_USE_PLATFORM_XCB_KHR \
+		-DVK_USE_PLATFORM_XLIB_KHR \
+		-DVK_USE_PLATFORM_DISPLAY_KHR \
+		-DVK_USE_PLATFORM_XLIB_XRANDR_EXT
+
+.if "${MACHINE_ARCH}" == "amd64"
+VKARCH=x86_64
+.else
+VKARCH=${MACHINE_ARCH}
+.endif
+
+install:
+	${INSTALL} ${INSTALL_COPY} ${INSTALL_STRIP} \
+	    -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \
+	    lib${LIB}.so ${DESTDIR}${X11BASE}/lib
+	${INSTALL} ${INSTALL_COPY} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \
+	    ${MESA_SRC}/generated/src/intel/vulkan/intel_icd.json \
+	    ${DESTDIR}${X11BASE}/share/vulkan/icd.d/intel_icd.${VKARCH}.json
+
+obj: _xenocara_obj
+
+.include <bsd.lib.mk>
+.include <bsd.xorg.mk>
+
+SLIBS=	libintel_compiler \
+	libintel_dev \
+	libisl \
+	libisl_gen40 \
+	libisl_gen50 \
+	libisl_gen60 \
+	libisl_gen70 \
+	libisl_gen75 \
+	libisl_gen80 \
+	libisl_gen90 \
+	libisl_gen100 \
+	libisl_gen110 \
+	libisl_gen120 \
+	libisl_tiled_memcpy \
+	libisl_tiled_memcpy_sse41 \
+	libblorp \
+	libvulkan_wsi \
+	libvulkan_util \
+	libxmlconfig \
+	libmesa_util \
+	libmesa_format \
+	libintel_perf \
+	libintel_common \
+	libnir \
+	libcompiler
+
+LDADD+=		-Wl,--as-needed -Wl,--allow-shlib-undefined -Wl,--start-group
+
+LDADD+=		-Wl,--whole-archive
+LDADD+=		${.CURDIR}/../libanv_common/${__objdir}/libanv_common.a
+.for gen in 70 75 80 90 100 110 120
+LDADD+=		${.CURDIR}/../libanv_gen${gen}/${__objdir}/libanv_gen${gen}.a
+.endfor
+LDADD+=		-Wl,--no-whole-archive
+
+.for slib in ${SLIBS}
+LDADD+=		${.CURDIR}/../${slib}/${__objdir}/${slib}.a
+.endfor
+
+LDADD+=		-pthread -lm -lz -lexpat
+LDADD+=		-L${X11BASE}/lib -ldrm \
+		-lxcb-dri3 -lxcb-randr -lXrandr -lxcb -lX11-xcb \
+		-lX11 -lxcb-dri2 -lxcb-present -lxcb-sync -lxshmfence
+
+LDADD+=		${BUILD_ID_SHA1} -Wl,-Bsymbolic -Wl,--gc-sections \
+		-Wl,--end-group
+
+all:	lib${LIB}.so
+
+lib${LIB}.so: ${SOBJS} ${DPADD}
+	${CXX} -shared -Wl,-soname,lib${LIB}.so ${PICFLAG} -o ${.TARGET} \
+	    `echo ${SOBJS} | tr ' ' '\n' | sort -R` ${LDADD}
+
+CLEANFILES+= lib${LIB}.so
+
+.PATH: ${MESA_SRC}/src/intel/vulkan
+.PATH: ${MESA_SRC}/generated/src/intel/vulkan
diff --git a/lib/mesa/mk/libvulkan_radeon/Makefile b/lib/mesa/mk/libvulkan_radeon/Makefile
new file mode 100644
index 000000000..63807edae
--- /dev/null
+++ b/lib/mesa/mk/libvulkan_radeon/Makefile
@@ -0,0 +1,142 @@
+#	$OpenBSD: Makefile,v 1.1 2020/08/26 06:02:41 jsg Exp $
+
+LIB=	vulkan_radeon
+
+NOPROFILE=
+
+SRCS=	radv_sqtt_layer.c \
+	radv_amdgpu_bo.c \
+	radv_amdgpu_cs.c \
+	radv_amdgpu_surface.c \
+	radv_amdgpu_winsys.c \
+	radv_null_bo.c \
+	radv_null_cs.c \
+	radv_null_winsys.c \
+	radv_android.c \
+	radv_cmd_buffer.c \
+	radv_debug.c \
+	radv_device.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 \
+	radv_meta_buffer.c \
+	radv_meta_bufimage.c \
+	radv_meta_clear.c \
+	radv_meta_copy.c \
+	radv_meta_decompress.c \
+	radv_meta_fast_clear.c \
+	radv_meta_fmask_expand.c \
+	radv_meta_resolve.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_rgp.c \
+	radv_shader.c \
+	radv_shader_args.c \
+	radv_shader_info.c \
+	radv_sqtt.c \
+	radv_query.c \
+	radv_util.c \
+	radv_wsi.c \
+	si_cmd_buffer.c \
+
+SRCS+=	radv_entrypoints.c \
+	radv_extensions.c \
+	vk_format_table.c
+
+.include "../Makefile.inc"
+
+CFLAGS+=	${C_VIS_ARGS} ${NO_OVERRIDE_INIT_ARGS}
+CXXFLAGS+=	${CXX_VIS_ARGS}
+
+LLVM_CXXFLAGS!= llvm-config --cxxflags
+CXXFLAGS+=	${LLVM_CXXFLAGS}
+
+CPPFLAGS+=	-I${MESA_SRC}/src/amd/vulkan \
+		-I${MESA_SRC}/src/gallium/include \
+		-I${MESA_SRC}/src/gallium/auxiliary \
+		-I${MESA_SRC}/src/vulkan/util \
+		-I${MESA_SRC}/src/vulkan/wsi \
+		-I${MESA_SRC}/src/amd/common \
+		-I${MESA_SRC}/src/amd/compiler \
+		-I${MESA_SRC}/src/amd/llvm \
+		-I${MESA_SRC}/src/compiler \
+		-I${MESA_SRC}/src/compiler/nir \
+		-I${MESA_SRC}/src/mesa \
+		-I${MESA_SRC}/generated/src \
+		-I${MESA_SRC}/generated/src/util \
+		-I${MESA_SRC}/generated/src/compiler/nir \
+		-I${MESA_SRC}/generated/src/amd/common \
+		-I${MESA_SRC}/generated/src/amd/vulkan \
+		-I${MESA_SRC}/generated/src/vulkan/util \
+		-DVK_USE_PLATFORM_XCB_KHR \
+		-DVK_USE_PLATFORM_XLIB_KHR \
+		-DVK_USE_PLATFORM_DISPLAY_KHR \
+		-DVK_USE_PLATFORM_XLIB_XRANDR_EXT
+
+.if "${MACHINE_ARCH}" == "amd64"
+VKARCH=x86_64
+.else
+VKARCH=${MACHINE_ARCH}
+.endif
+
+install:
+	${INSTALL} ${INSTALL_COPY} ${INSTALL_STRIP} \
+	    -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \
+	    lib${LIB}.so ${DESTDIR}${X11BASE}/lib
+	${INSTALL} ${INSTALL_COPY} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \
+	    ${MESA_SRC}/generated/src/amd/vulkan/radeon_icd.json \
+	    ${DESTDIR}${X11BASE}/share/vulkan/icd.d/radeon_icd.${VKARCH}.json
+
+obj: _xenocara_obj
+
+.include <bsd.lib.mk>
+.include <bsd.xorg.mk>
+
+SLIBS=	libamd_common \
+	libamd_common_llvm \
+	libaddrlib \
+	libvulkan_wsi \
+	libvulkan_util \
+	libxmlconfig \
+	libmesa_util \
+	libmesa_format \
+	libaco \
+	libnir \
+	libcompiler
+
+LDADD+=		-Wl,--as-needed -Wl,--allow-shlib-undefined -Wl,--start-group
+.for slib in ${SLIBS}
+LDADD+=		${.CURDIR}/../${slib}/${__objdir}/${slib}.a
+.endfor
+
+LDADD+=		-lelf -lLLVM -lpthread -lexpat -lz -lm
+LDADD+=		-L${X11BASE}/lib -ldrm -ldrm_amdgpu \
+		-lxcb-dri3 -lxcb-xfixes -lxcb-randr -lXrandr -lxcb -lX11-xcb \
+		-lX11 -lxcb-dri2 -lxcb-present -lxcb-sync \
+		-lxshmfence
+
+LDADD+=		${BUILD_ID_SHA1} -Wl,--gc-sections \
+		-Wl,--end-group
+
+all:	lib${LIB}.so
+
+lib${LIB}.so: ${SOBJS} ${DPADD}
+	${CXX} -shared -Wl,-soname,lib${LIB}.so ${PICFLAG} -o ${.TARGET} \
+	    `echo ${SOBJS} | tr ' ' '\n' | sort -R` ${LDADD}
+
+CLEANFILES+= lib${LIB}.so
+
+.PATH: ${MESA_SRC}/src/amd/vulkan
+.PATH: ${MESA_SRC}/src/amd/vulkan/layers
+.PATH: ${MESA_SRC}/src/amd/vulkan/winsys/amdgpu
+.PATH: ${MESA_SRC}/src/amd/vulkan/winsys/null
+.PATH: ${MESA_SRC}/generated/src/amd/vulkan
diff --git a/lib/mesa/mk/libvulkan_util/Makefile b/lib/mesa/mk/libvulkan_util/Makefile
new file mode 100644
index 000000000..3b7a31505
--- /dev/null
+++ b/lib/mesa/mk/libvulkan_util/Makefile
@@ -0,0 +1,31 @@
+#	$OpenBSD: Makefile,v 1.1 2020/08/26 06:02:41 jsg Exp $
+
+LIB=	vulkan_util
+
+NOPROFILE=
+
+SRCS=	vk_debug_report.c \
+	vk_format.c \
+	vk_util.c
+
+SRCS+=	vk_enum_to_str.c
+
+.include "../Makefile.inc"
+
+CFLAGS+=	${C_VIS_ARGS}
+CPPFLAGS+=	-I${MESA_SRC}/src/vulkan/util \
+		-I${MESA_SRC}/src/gallium/include \
+		-DVK_USE_PLATFORM_XCB_KHR \
+		-DVK_USE_PLATFORM_XLIB_KHR \
+		-DVK_USE_PLATFORM_DISPLAY_KHR \
+		-DVK_USE_PLATFORM_XLIB_XRANDR_EXT
+
+install:
+
+obj: _xenocara_obj
+
+.include <bsd.lib.mk>
+.include <bsd.xorg.mk>
+
+.PATH: ${MESA_SRC}/src/vulkan/util
+.PATH: ${MESA_SRC}/generated/src/vulkan/util
diff --git a/lib/mesa/mk/libvulkan_wsi/Makefile b/lib/mesa/mk/libvulkan_wsi/Makefile
new file mode 100644
index 000000000..d8b0282f9
--- /dev/null
+++ b/lib/mesa/mk/libvulkan_wsi/Makefile
@@ -0,0 +1,28 @@
+#	$OpenBSD: Makefile,v 1.1 2020/08/26 06:02:41 jsg Exp $
+
+LIB=	vulkan_wsi
+
+NOPROFILE=
+
+SRCS=	wsi_common.c \
+	wsi_common_x11.c \
+	wsi_common_display.c
+
+.include "../Makefile.inc"
+
+CFLAGS+=	${C_VIS_ARGS}
+CPPFLAGS+=	-I${MESA_SRC}/src/vulkan/wsi \
+		-I${MESA_SRC}/src/vulkan/util \
+		-DVK_USE_PLATFORM_XCB_KHR \
+		-DVK_USE_PLATFORM_XLIB_KHR \
+		-DVK_USE_PLATFORM_DISPLAY_KHR \
+		-DVK_USE_PLATFORM_XLIB_XRANDR_EXT
+
+install:
+
+obj: _xenocara_obj
+
+.include <bsd.lib.mk>
+.include <bsd.xorg.mk>
+
+.PATH: ${MESA_SRC}/src/vulkan/wsi
diff --git a/lib/mesa/mk/libws_null/Makefile b/lib/mesa/mk/libws_null/Makefile
new file mode 100644
index 000000000..e846ee864
--- /dev/null
+++ b/lib/mesa/mk/libws_null/Makefile
@@ -0,0 +1,22 @@
+#	$OpenBSD: Makefile,v 1.1 2020/08/26 06:02:41 jsg Exp $
+
+LIB=	ws_null
+
+NOPROFILE=
+
+SRCS=	null_sw_winsys.c
+
+.include "../Makefile.inc"
+
+CFLAGS+=	${C_VIS_ARGS}
+CPPFLAGS+=	-I${MESA_SRC}/src/gallium/include \
+		-I${MESA_SRC}/src/gallium/auxiliary
+
+install:
+
+obj: _xenocara_obj
+
+.include <bsd.lib.mk>
+.include <bsd.xorg.mk>
+
+.PATH: ${MESA_SRC}/src/gallium/winsys/sw/null
diff --git a/lib/mesa/mk/libwsw/Makefile b/lib/mesa/mk/libwsw/Makefile
new file mode 100644
index 000000000..1ee974925
--- /dev/null
+++ b/lib/mesa/mk/libwsw/Makefile
@@ -0,0 +1,22 @@
+#	$OpenBSD: Makefile,v 1.1 2020/08/26 06:02:41 jsg Exp $
+
+LIB=	wsw
+
+NOPROFILE=
+
+SRCS=	wrapper_sw_winsys.c
+
+.include "../Makefile.inc"
+
+CFLAGS+=	${C_VIS_ARGS}
+CPPFLAGS+=	-I${MESA_SRC}/src/gallium/include \
+		-I${MESA_SRC}/src/gallium/auxiliary
+
+install:
+
+obj: _xenocara_obj
+
+.include <bsd.lib.mk>
+.include <bsd.xorg.mk>
+
+.PATH: ${MESA_SRC}/src/gallium/winsys/sw/wrapper
diff --git a/lib/mesa/mk/libxmlconfig/Makefile b/lib/mesa/mk/libxmlconfig/Makefile
new file mode 100644
index 000000000..57d937e24
--- /dev/null
+++ b/lib/mesa/mk/libxmlconfig/Makefile
@@ -0,0 +1,21 @@
+#	$OpenBSD: Makefile,v 1.1 2020/08/26 06:02:41 jsg Exp $
+
+LIB=	xmlconfig
+
+NOPROFILE=
+
+SRCS=	xmlconfig.c
+
+.include "../Makefile.inc"
+
+CFLAGS+=	${C_VIS_ARGS}
+CPPFLAGS+=	-I${MESA_SRC}/src/util
+
+install:
+
+obj: _xenocara_obj
+
+.include <bsd.lib.mk>
+.include <bsd.xorg.mk>
+
+.PATH: ${MESA_SRC}/src/util
diff --git a/lib/mesa/mk/pkgconfig/Makefile b/lib/mesa/mk/pkgconfig/Makefile
new file mode 100644
index 000000000..5a583feb4
--- /dev/null
+++ b/lib/mesa/mk/pkgconfig/Makefile
@@ -0,0 +1,40 @@
+#	$OpenBSD: Makefile,v 1.1 2020/08/26 06:02:41 jsg Exp $
+
+PC_FILES= dri.pc egl.pc gbm.pc gl.pc glesv1_cm.pc glesv2.pc osmesa.pc
+CLEANFILES+=${PC_FILES}
+
+all: ${PC_FILES}
+${PC_FILES}:
+
+dri.pc:
+	/bin/sh ${.CURDIR}/gen_dri.sh -c ${.CURDIR} -o ${.OBJDIR}
+
+egl.pc:
+	/bin/sh ${.CURDIR}/gen_egl.sh -c ${.CURDIR} -o ${.OBJDIR}
+
+gbm.pc:
+	/bin/sh ${.CURDIR}/gen_gbm.sh -c ${.CURDIR} -o ${.OBJDIR}
+
+gl.pc:
+	/bin/sh ${.CURDIR}/gen_gl.sh -c ${.CURDIR} -o ${.OBJDIR}
+
+glesv1_cm.pc:
+	/bin/sh ${.CURDIR}/gen_glesv1_cm.sh -c ${.CURDIR} -o ${.OBJDIR}
+
+glesv2.pc:
+	/bin/sh ${.CURDIR}/gen_glesv2.sh -c ${.CURDIR} -o ${.OBJDIR}
+
+osmesa.pc:
+	/bin/sh ${.CURDIR}/gen_osmesa.sh -c ${.CURDIR} -o ${.OBJDIR}
+
+install:
+.for PC in ${PC_FILES}
+	${INSTALL} ${INSTALL_COPY} -o root -g ${SHAREGRP} \
+	    -m ${SHAREMODE} ${.OBJDIR}/${PC} ${DESTDIR}${X11BASE}/lib/pkgconfig/
+.endfor
+
+obj: _xenocara_obj
+	
+.include <bsd.xconf.mk>
+.include <bsd.prog.mk>
+.include <bsd.xorg.mk>
diff --git a/lib/mesa/mk/pkgconfig/gen_dri.sh b/lib/mesa/mk/pkgconfig/gen_dri.sh
new file mode 100644
index 000000000..52aa1acfd
--- /dev/null
+++ b/lib/mesa/mk/pkgconfig/gen_dri.sh
@@ -0,0 +1,68 @@
+#!/bin/sh
+#
+# $OpenBSD: gen_dri.sh,v 1.1 2020/08/26 06:02:41 jsg Exp $
+#
+# Copyright (c) 2010,2011 Jasper Lievisse Adriaanse <jasper@openbsd.org>
+#
+# Permission to use, copy, modify, and distribute this software for any
+# purpose with or without fee is hereby granted, provided that the above
+# copyright notice and this permission notice appear in all copies.
+#
+# THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+# WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+# MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+# ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+# WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+# ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+# OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+#
+# Generate pkg-config file for dri
+
+usage() {
+	echo "usage: ${0##*/} -c current_directory -o obj_directory"
+	exit 1
+}
+
+curdir=
+objdir=
+while getopts "c:o:" flag; do
+	case "$flag" in
+		c)
+			curdir=$OPTARG
+			;;
+		o)
+			objdir=$OPTARG
+			;;
+		*)
+			usage
+			;;
+	esac
+done
+
+[ -n "${curdir}" ] || usage
+if [ ! -d "${curdir}" ]; then
+	echo "${0##*/}: ${curdir}: not found"
+	exit 1
+fi
+[ -n "${objdir}" ] || usage
+if [ ! -w "${objdir}" ]; then
+	echo "${0##*/}: ${objdir}: not found or not writable"
+	exit 1
+fi
+
+lib_version=$(cat ${curdir}/../../VERSION)
+
+pc_file="${objdir}/dri.pc"
+cat > ${pc_file} << __EOF__
+prefix=/usr/X11R6
+libdir=\${prefix}/lib
+includedir=\${prefix}/include
+
+dridriverdir=/usr/X11R6/lib/modules/dri
+
+Name: dri
+Description: Direct Rendering Infrastructure
+Version: ${lib_version}
+Requires.private: libdrm >= 2.4.100
+Cflags: -I\${includedir}
+__EOF__
diff --git a/lib/mesa/mk/pkgconfig/gen_egl.sh b/lib/mesa/mk/pkgconfig/gen_egl.sh
new file mode 100644
index 000000000..d1c23289b
--- /dev/null
+++ b/lib/mesa/mk/pkgconfig/gen_egl.sh
@@ -0,0 +1,68 @@
+#!/bin/sh
+#
+# $OpenBSD: gen_egl.sh,v 1.1 2020/08/26 06:02:41 jsg Exp $
+#
+# Copyright (c) 2010,2011 Jasper Lievisse Adriaanse <jasper@openbsd.org>
+#
+# Permission to use, copy, modify, and distribute this software for any
+# purpose with or without fee is hereby granted, provided that the above
+# copyright notice and this permission notice appear in all copies.
+#
+# THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+# WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+# MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+# ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+# WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+# ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+# OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+#
+# Generate pkg-config file for libEGL
+
+usage() {
+	echo "usage: ${0##*/} -c current_directory -o obj_directory"
+	exit 1
+}
+
+curdir=
+objdir=
+while getopts "c:o:" flag; do
+	case "$flag" in
+		c)
+			curdir=$OPTARG
+			;;
+		o)
+			objdir=$OPTARG
+			;;
+		*)
+			usage
+			;;
+	esac
+done
+
+[ -n "${curdir}" ] || usage
+if [ ! -d "${curdir}" ]; then
+	echo "${0##*/}: ${curdir}: not found"
+	exit 1
+fi
+[ -n "${objdir}" ] || usage
+if [ ! -w "${objdir}" ]; then
+	echo "${0##*/}: ${objdir}: not found or not writable"
+	exit 1
+fi
+
+lib_version=$(cat ${curdir}/../../VERSION)
+
+pc_file="${objdir}/egl.pc"
+cat > ${pc_file} << __EOF__
+prefix=/usr/X11R6
+libdir=\${prefix}/lib
+includedir=\${prefix}/include
+
+Name: egl
+Description: Mesa EGL Library
+Version: ${lib_version}
+Requires.private: x11, xext, xdamage >= 1.1, xfixes, x11-xcb, xcb, xcb-glx >= 1.8.1, xcb-dri2 >= 1.8, xxf86vm, libdrm >= 2.4.75
+Libs: -L\${libdir} -lEGL
+Libs.private: -lpthread -pthread -lm
+Cflags: -I\${includedir}
+__EOF__
diff --git a/lib/mesa/mk/pkgconfig/gen_gbm.sh b/lib/mesa/mk/pkgconfig/gen_gbm.sh
new file mode 100644
index 000000000..d2b6b82a4
--- /dev/null
+++ b/lib/mesa/mk/pkgconfig/gen_gbm.sh
@@ -0,0 +1,66 @@
+#!/bin/sh
+#
+# $OpenBSD: gen_gbm.sh,v 1.1 2020/08/26 06:02:41 jsg Exp $
+#
+# Copyright (c) 2010,2011 Jasper Lievisse Adriaanse <jasper@openbsd.org>
+#
+# Permission to use, copy, modify, and distribute this software for any
+# purpose with or without fee is hereby granted, provided that the above
+# copyright notice and this permission notice appear in all copies.
+#
+# THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+# WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+# MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+# ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+# WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+# ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+# OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+#
+# Generate pkg-config file for libgbm
+
+usage() {
+	echo "usage: ${0##*/} -c current_directory -o obj_directory"
+	exit 1
+}
+
+curdir=
+objdir=
+while getopts "c:o:" flag; do
+	case "$flag" in
+		c)
+			curdir=$OPTARG
+			;;
+		o)
+			objdir=$OPTARG
+			;;
+		*)
+			usage
+			;;
+	esac
+done
+
+[ -n "${curdir}" ] || usage
+if [ ! -d "${curdir}" ]; then
+	echo "${0##*/}: ${curdir}: not found"
+	exit 1
+fi
+[ -n "${objdir}" ] || usage
+if [ ! -w "${objdir}" ]; then
+	echo "${0##*/}: ${objdir}: not found or not writable"
+	exit 1
+fi
+
+lib_version=$(cat ${curdir}/../../VERSION)
+
+pc_file="${objdir}/gbm.pc"
+cat > ${pc_file} << __EOF__
+prefix=/usr/X11R6
+libdir=\${prefix}/lib
+includedir=\${prefix}/include
+
+Name: gbm
+Description: Mesa gbm library
+Version: ${lib_version}
+Libs: -L\${libdir} -lgbm
+Cflags: -I\${includedir}
+__EOF__
diff --git a/lib/mesa/mk/pkgconfig/gen_gl.sh b/lib/mesa/mk/pkgconfig/gen_gl.sh
new file mode 100644
index 000000000..a07562004
--- /dev/null
+++ b/lib/mesa/mk/pkgconfig/gen_gl.sh
@@ -0,0 +1,70 @@
+#!/bin/sh
+#
+# $OpenBSD: gen_gl.sh,v 1.1 2020/08/26 06:02:41 jsg Exp $
+#
+# Copyright (c) 2010,2011 Jasper Lievisse Adriaanse <jasper@openbsd.org>
+#
+# Permission to use, copy, modify, and distribute this software for any
+# purpose with or without fee is hereby granted, provided that the above
+# copyright notice and this permission notice appear in all copies.
+#
+# THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+# WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+# MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+# ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+# WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+# ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+# OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+#
+# Generate pkg-config file for libGL
+
+usage() {
+	echo "usage: ${0##*/} -c current_directory -o obj_directory"
+	exit 1
+}
+
+curdir=
+objdir=
+while getopts "c:o:" flag; do
+	case "$flag" in
+		c)
+			curdir=$OPTARG
+			;;
+		o)
+			objdir=$OPTARG
+			;;
+		*)
+			usage
+			;;
+	esac
+done
+
+[ -n "${curdir}" ] || usage
+if [ ! -d "${curdir}" ]; then
+	echo "${0##*/}: ${curdir}: not found"
+	exit 1
+fi
+[ -n "${objdir}" ] || usage
+if [ ! -w "${objdir}" ]; then
+	echo "${0##*/}: ${objdir}: not found or not writable"
+	exit 1
+fi
+
+lib_version=$(cat ${curdir}/../../VERSION)
+
+pc_file="${objdir}/gl.pc"
+cat > ${pc_file} << __EOF__
+prefix=/usr/X11R6
+libdir=\${prefix}/lib
+includedir=\${prefix}/include
+
+glx_tls=no
+
+Name: gl
+Description: Mesa OpenGL Library
+Version: ${lib_version}
+Requires.private: x11, xext, xdamage >= 1.1, xfixes, x11-xcb, xcb, xcb-glx >= 1.8.1, xcb-dri2 >= 1.8, xxf86vm, libdrm >= 2.4.75
+Libs: -L\${libdir} -lGL
+Libs.private: -lpthread -pthread -lm
+Cflags: -I\${includedir}
+__EOF__
diff --git a/lib/mesa/mk/pkgconfig/gen_glesv1_cm.sh b/lib/mesa/mk/pkgconfig/gen_glesv1_cm.sh
new file mode 100644
index 000000000..476905be3
--- /dev/null
+++ b/lib/mesa/mk/pkgconfig/gen_glesv1_cm.sh
@@ -0,0 +1,67 @@
+#!/bin/sh
+#
+# $OpenBSD: gen_glesv1_cm.sh,v 1.1 2020/08/26 06:02:41 jsg Exp $
+#
+# Copyright (c) 2010,2011 Jasper Lievisse Adriaanse <jasper@openbsd.org>
+#
+# Permission to use, copy, modify, and distribute this software for any
+# purpose with or without fee is hereby granted, provided that the above
+# copyright notice and this permission notice appear in all copies.
+#
+# THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+# WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+# MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+# ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+# WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+# ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+# OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+#
+# Generate pkg-config file for libGLESv1_CM
+
+usage() {
+	echo "usage: ${0##*/} -c current_directory -o obj_directory"
+	exit 1
+}
+
+curdir=
+objdir=
+while getopts "c:o:" flag; do
+	case "$flag" in
+		c)
+			curdir=$OPTARG
+			;;
+		o)
+			objdir=$OPTARG
+			;;
+		*)
+			usage
+			;;
+	esac
+done
+
+[ -n "${curdir}" ] || usage
+if [ ! -d "${curdir}" ]; then
+	echo "${0##*/}: ${curdir}: not found"
+	exit 1
+fi
+[ -n "${objdir}" ] || usage
+if [ ! -w "${objdir}" ]; then
+	echo "${0##*/}: ${objdir}: not found or not writable"
+	exit 1
+fi
+
+lib_version=$(cat ${curdir}/../../VERSION)
+
+pc_file="${objdir}/glesv1_cm.pc"
+cat > ${pc_file} << __EOF__
+prefix=/usr/X11R6
+libdir=\${prefix}/lib
+includedir=\${prefix}/include
+
+Name: glesv1_cm
+Description: Mesa OpenGL ES 1.1 CM library
+Version: ${lib_version}
+Libs: -L\${libdir} -lGLESv1_CM
+Libs.private: -lpthread -pthread -lm
+Cflags: -I\${includedir}
+__EOF__
diff --git a/lib/mesa/mk/pkgconfig/gen_glesv2.sh b/lib/mesa/mk/pkgconfig/gen_glesv2.sh
new file mode 100644
index 000000000..0bc407c2c
--- /dev/null
+++ b/lib/mesa/mk/pkgconfig/gen_glesv2.sh
@@ -0,0 +1,67 @@
+#!/bin/sh
+#
+# $OpenBSD: gen_glesv2.sh,v 1.1 2020/08/26 06:02:41 jsg Exp $
+#
+# Copyright (c) 2010,2011 Jasper Lievisse Adriaanse <jasper@openbsd.org>
+#
+# Permission to use, copy, modify, and distribute this software for any
+# purpose with or without fee is hereby granted, provided that the above
+# copyright notice and this permission notice appear in all copies.
+#
+# THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+# WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+# MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+# ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+# WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+# ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+# OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+#
+# Generate pkg-config file for libGLESv2
+
+usage() {
+	echo "usage: ${0##*/} -c current_directory -o obj_directory"
+	exit 1
+}
+
+curdir=
+objdir=
+while getopts "c:o:" flag; do
+	case "$flag" in
+		c)
+			curdir=$OPTARG
+			;;
+		o)
+			objdir=$OPTARG
+			;;
+		*)
+			usage
+			;;
+	esac
+done
+
+[ -n "${curdir}" ] || usage
+if [ ! -d "${curdir}" ]; then
+	echo "${0##*/}: ${curdir}: not found"
+	exit 1
+fi
+[ -n "${objdir}" ] || usage
+if [ ! -w "${objdir}" ]; then
+	echo "${0##*/}: ${objdir}: not found or not writable"
+	exit 1
+fi
+
+lib_version=$(cat ${curdir}/../../VERSION)
+
+pc_file="${objdir}/glesv2.pc"
+cat > ${pc_file} << __EOF__
+prefix=/usr/X11R6
+libdir=\${prefix}/lib
+includedir=\${prefix}/include
+
+Name: glesv2
+Description: Mesa OpenGL ES 2.0 library
+Version: ${lib_version}
+Libs: -L\${libdir} -lGLESv2
+Libs.private: -lpthread -pthread -lm
+Cflags: -I\${includedir}
+__EOF__
diff --git a/lib/mesa/mk/pkgconfig/gen_osmesa.sh b/lib/mesa/mk/pkgconfig/gen_osmesa.sh
new file mode 100644
index 000000000..9b42ba1b1
--- /dev/null
+++ b/lib/mesa/mk/pkgconfig/gen_osmesa.sh
@@ -0,0 +1,68 @@
+#!/bin/sh
+#
+# $OpenBSD: gen_osmesa.sh,v 1.1 2020/08/26 06:02:41 jsg Exp $
+#
+# Copyright (c) 2010,2011 Jasper Lievisse Adriaanse <jasper@openbsd.org>
+#
+# Permission to use, copy, modify, and distribute this software for any
+# purpose with or without fee is hereby granted, provided that the above
+# copyright notice and this permission notice appear in all copies.
+#
+# THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+# WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+# MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+# ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+# WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+# ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+# OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+#
+# Generate pkg-config file for libOSMesa
+
+usage() {
+	echo "usage: ${0##*/} -c current_directory -o obj_directory"
+	exit 1
+}
+
+curdir=
+objdir=
+while getopts "c:o:" flag; do
+	case "$flag" in
+		c)
+			curdir=$OPTARG
+			;;
+		o)
+			objdir=$OPTARG
+			;;
+		*)
+			usage
+			;;
+	esac
+done
+
+[ -n "${curdir}" ] || usage
+if [ ! -d "${curdir}" ]; then
+	echo "${0##*/}: ${curdir}: not found"
+	exit 1
+fi
+[ -n "${objdir}" ] || usage
+if [ ! -w "${objdir}" ]; then
+	echo "${0##*/}: ${objdir}: not found or not writable"
+	exit 1
+fi
+
+lib_version=$(cat ${curdir}/../../VERSION)
+
+pc_file="${objdir}/osmesa.pc"
+cat > ${pc_file} << __EOF__
+prefix=/usr/X11R6
+libdir=\${prefix}/lib
+includedir=\${prefix}/include
+
+Name: osmesa
+Description: Mesa Off-screen Rendering library
+Version: ${lib_version}
+Requires:
+Libs: -L\${libdir} -lOSMesa
+Libs.private: -lm -lpthread -pthread
+Cflags: -I\${includedir}
+__EOF__