sync with OpenBSD -current

This commit is contained in:
purplerain 2024-04-29 00:35:41 +00:00
parent 5d45cd7ee8
commit 155eb8555e
Signed by: purplerain
GPG key ID: F42C07F07E2E35B7
5506 changed files with 1786257 additions and 1416034 deletions

View file

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.13 2023/11/02 04:53:32 jsg Exp $
# $OpenBSD: Makefile,v 1.14 2024/04/02 10:42:14 jsg Exp $
LIB= vulkan_radeon
@ -10,6 +10,7 @@ SRCS= radv_metro_exodus.c \
radv_rra_layer.c \
radv_sqtt_layer.c \
radv_meta.c \
radv_meta_astc_decode.c \
radv_meta_blit.c \
radv_meta_blit2d.c \
radv_meta_buffer.c \
@ -29,9 +30,12 @@ SRCS= radv_metro_exodus.c \
radv_nir_apply_pipeline_layout.c \
radv_nir_export_multiview.c \
radv_nir_lower_abi.c \
radv_nir_lower_cooperative_matrix.c \
radv_nir_lower_fs_barycentric.c \
radv_nir_lower_fs_intrinsics.c \
radv_nir_lower_intrinsics_early.c \
radv_nir_lower_io.c \
radv_nir_lower_poly_line_smooth.c \
radv_nir_lower_primitive_shading_rate.c \
radv_nir_lower_ray_queries.c \
radv_nir_lower_view_index.c \
@ -67,7 +71,7 @@ SRCS= radv_metro_exodus.c \
radv_rt_common.c \
radv_rt_shader.c \
radv_sampler.c \
radv_sdma_copy_image.c \
radv_sdma.c \
radv_shader.c \
radv_shader_args.c \
radv_shader_info.c \
@ -117,6 +121,7 @@ CPPFLAGS+= -I${MESA_SRC}/src/amd/vulkan \
-I${MESA_SRC}/src/mesa \
-I${MESA_SRC}/generated/src \
-I${MESA_SRC}/generated/src/util \
-I${MESA_SRC}/generated/src/compiler \
-I${MESA_SRC}/generated/src/compiler/nir \
-I${MESA_SRC}/generated/src/amd/common \
-I${MESA_SRC}/generated/src/amd/vulkan \
@ -158,15 +163,18 @@ SLIBS= libamd_common \
libmesa_util \
libmesa_format \
libmesa_util_sse41 \
libblake3 \
libmesa_util_c11 \
libaco \
libvulkan_util \
libnir \
libcompiler
libcompiler \
libvtn
LDADD+= -Wl,--as-needed -Wl,--allow-shlib-undefined -Wl,--start-group
LDADD+= -Wl,--whole-archive
LDADD+= ${.CURDIR}/../libvulkan_util/${__objdir}/libvulkan_util.a
LDADD+= ${.CURDIR}/../libvulkan_wsi/${__objdir}/libvulkan_wsi.a
LDADD+= ${.CURDIR}/../libvulkan_runtime/${__objdir}/libvulkan_runtime.a
LDADD+= -Wl,--no-whole-archive
@ -178,7 +186,7 @@ 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-xfixes -lxcb-sync \
-lxcb-randr -lxcb-shm -lxshmfence
-lxcb-randr -lxcb-shm -lxshmfence -lxcb-keysyms
LDADD+= ${BUILD_ID_SHA1} -Wl,--gc-sections \
-Wl,--version-script ${MESA_SRC}/src/vulkan/vulkan.sym \