sync with OpenBSD -current

lib/mesa/mk/config.mk

@@ -197,7 +197,7 @@ WITH_GALLIUM_IRIS=no
 WITH_AMD_VK=no
 WITH_INTEL_VK=no
 WITH_SSE41=no
-WITH_VAAPI=no
+WITH_GALLIUM_VA=no
 
 WITH_DRI=yes
 WITH_GALLIUM_DRISW_KMS=yes
@@ -225,14 +225,12 @@ WITH_SSE41=yes
     ${MACHINE} == "sparc64"
 WITH_GALLIUM_R300=yes
 WITH_GALLIUM_R600=yes
-WITH_VAAPI=yes
 CPPFLAGS+=	-DHAVE_R300 -DHAVE_R600
 .endif
 
 .if ${MACHINE} == "amd64" || ${MACHINE} == "arm64" || ${MACHINE} == "i386" || \
     ${MACHINE} == "powerpc64" || ${MACHINE} == "riscv64"
 WITH_GALLIUM_RADEONSI=yes
-WITH_VAAPI=yes
 WITH_AMD_VK=yes
 CPPFLAGS+=	-DHAVE_RADEONSI
 .endif
@@ -245,3 +243,8 @@ WITH_INTEL_VK=yes
 CPPFLAGS+=	-DHAVE_I915 -DHAVE_CROCUS -DHAVE_IRIS \
 		-DSUPPORT_INTEL_INTEGRATED_GPUS
 .endif
+
+.if ${WITH_GALLIUM_R600} == "yes" || ${WITH_GALLIUM_RADEONSI} == "yes"
+WITH_GALLIUM_VA=yes
+CPPFLAGS+=	-DHAVE_VA_SURFACE_ATTRIB_DRM_FORMAT_MODIFIERS
+.endif